codeigniter_vender 0.0.1 → 0.0.2
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +1 -0
- data/Gemfile +4 -0
- data/Gemfile.lock +10 -0
- data/README.md +39 -0
- data/Rakefile +4 -2
- data/VERSION +1 -1
- data/bin/ci +5 -0
- data/codeigniter_vender.gemspec +355 -344
- data/lib/codeigniter/commands/app.rb +5 -0
- data/lib/codeigniter/commands/help.rb +7 -0
- data/lib/codeigniter/commands.rb +19 -0
- data/lib/{tasks/app.rake → codeigniter/tasks/ci.rake} +1 -1
- data/lib/codeigniter_vender.rb +26 -1
- data/lib/generators/base.rb +11 -0
- data/{generators → lib/generators/ci}/ci_app/USAGE +0 -0
- data/lib/generators/ci/ci_app/ci_app_generator.rb +10 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/.htaccess +1 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/cache/.htaccess +1 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/application/config → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/cache}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/config/autoload.php +18 -18
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/config/config.php +62 -31
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/config/constants.php +7 -7
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/config/database.php +20 -13
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/config/doctypes.php +1 -1
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/config/foreign_chars.php +64 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/config/hooks.php +1 -1
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/application/controllers → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/config}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/config/mimes.php +5 -5
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/config/profiler.php +17 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/config/routes.php +7 -9
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/config/smileys.php +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/config/user_agents.php +7 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/application/errors → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/controllers}/index.html +0 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/controllers/welcome.php +17 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/application/helpers → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/core}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/errors/error_404.php +1 -1
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/errors/error_db.php +1 -1
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/errors/error_general.php +1 -1
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/errors/error_php.php +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/application/hooks → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/errors}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/application → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/helpers}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/application/language/english → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/hooks}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/application/libraries → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/application/models → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/language/english}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/application/views → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/libraries}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/cache → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/logs}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/codeigniter → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/models}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/database/drivers → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/third_party}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/database/drivers/mssql → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/application/views}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/application/views/welcome_message.php +6 -4
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/index.php +166 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/license.txt +1 -2
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/.htaccess +1 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core}/Benchmark.php +5 -5
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core/CodeIgniter.php +340 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core/Common.php +503 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core}/Config.php +126 -57
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core/Controller.php +67 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core}/Exceptions.php +24 -20
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core}/Hooks.php +14 -15
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core/Input.php +652 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries/Language.php → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core/Lang.php} +33 -16
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core}/Loader.php +374 -364
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core/Model.php +56 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core}/Output.php +140 -93
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core}/Router.php +185 -115
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core}/URI.php +78 -58
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core/Utf8.php +165 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/database/drivers/mysql → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/core}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/DB.php +32 -27
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/DB_active_rec.php +478 -225
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/DB_cache.php +30 -30
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/DB_driver.php +199 -175
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/DB_forge.php +43 -36
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/DB_result.php +115 -52
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/DB_utility.php +69 -44
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/database/drivers/mysqli → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/database/drivers}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/database/drivers/oci8 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/database/drivers/mssql}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/mssql/mssql_driver.php +64 -67
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/mssql/mssql_forge.php +19 -19
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/mssql/mssql_result.php +14 -14
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/mssql/mssql_utility.php +3 -38
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/database/drivers/odbc → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/database/drivers/mysql}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/mysql/mysql_driver.php +155 -63
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/mysql/mysql_forge.php +36 -21
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/mysql/mysql_result.php +14 -14
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/mysql/mysql_utility.php +25 -60
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/database/drivers/postgre → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/database/drivers/mysqli}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/mysqli/mysqli_driver.php +131 -62
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/mysqli/mysqli_forge.php +17 -17
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/mysqli/mysqli_result.php +14 -14
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/mysqli/mysqli_utility.php +4 -40
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/database/drivers/sqlite → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/database/drivers/oci8}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/oci8/oci8_driver.php +55 -58
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/oci8/oci8_forge.php +18 -18
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/oci8/oci8_result.php +17 -17
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/oci8/oci8_utility.php +2 -37
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/database → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/database/drivers/odbc}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/odbc/odbc_driver.php +58 -61
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/odbc/odbc_forge.php +21 -21
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/odbc/odbc_result.php +11 -11
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/odbc/odbc_utility.php +5 -50
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/fonts → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/database/drivers/postgre}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/postgre/postgre_driver.php +61 -61
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/postgre/postgre_forge.php +84 -33
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/postgre/postgre_result.php +11 -11
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/postgre/postgre_utility.php +2 -38
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/helpers → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/database/drivers/sqlite}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/sqlite/sqlite_driver.php +65 -65
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/sqlite/sqlite_forge.php +18 -18
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/sqlite/sqlite_result.php +12 -12
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/database/drivers/sqlite/sqlite_utility.php +3 -48
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/database}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/language/english → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/fonts}/index.html +0 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/fonts/texb.ttf +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/array_helper.php +46 -6
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/helpers/captcha_helper.php +246 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/cookie_helper.php +7 -48
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/date_helper.php +90 -90
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/directory_helper.php +18 -22
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/download_helper.php +8 -8
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/email_helper.php +4 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/file_helper.php +45 -39
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/form_helper.php +59 -35
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/html_helper.php +20 -14
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/language → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/helpers}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/inflector_helper.php +27 -16
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/language_helper.php +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/number_helper.php +15 -14
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/path_helper.php +7 -7
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/security_helper.php +49 -15
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/smiley_helper.php +29 -23
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/string_helper.php +45 -28
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/text_helper.php +195 -124
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/typography_helper.php +32 -9
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/url_helper.php +17 -15
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/helpers/xml_helper.php +21 -12
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system}/index.html +0 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/language/english/calendar_lang.php +51 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/language/english/date_lang.php +1 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/language/english/db_lang.php +2 -1
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/language/english/email_lang.php +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/language/english/form_validation_lang.php +5 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/language/english/ftp_lang.php +1 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/language/english/imglib_lang.php +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/logs → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/language/english}/index.html +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/language/english/number_lang.php +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/language/english/profiler_lang.php +4 -1
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/language/english/unit_test_lang.php +1 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/language/english/upload_lang.php +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/plugins → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/language}/index.html +0 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/libraries/Cache/Cache.php +216 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/libraries/Cache/drivers/Cache_apc.php +151 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/libraries/Cache/drivers/Cache_dummy.php +129 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/libraries/Cache/drivers/Cache_file.php +196 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/libraries/Cache/drivers/Cache_memcached.php +209 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Calendar.php +81 -83
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Cart.php +73 -73
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/libraries/Driver.php +229 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Email.php +209 -188
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Encrypt.php +78 -15
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Form_validation.php +265 -228
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Ftp.php +46 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Image_lib.php +36 -43
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/libraries/Javascript.php +871 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Log.php +29 -32
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Pagination.php +64 -29
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Parser.php +63 -24
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/libraries/Profiler.php +502 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/libraries/Security.php +737 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Session.php +33 -16
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Sha1.php +14 -14
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Table.php +172 -84
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Trackback.php +129 -128
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Typography.php +84 -80
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Unit_test.php +105 -69
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Upload.php +273 -235
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/User_agent.php +150 -115
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Xmlrpc.php +193 -179
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Xmlrpcs.php +91 -83
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/system/libraries/Zip.php +110 -46
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/images → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/libraries}/index.html +0 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/system/libraries/javascript/Jquery.php +1071 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/changelog.html +182 -29
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/active_record.html +48 -48
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/caching.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/call_function.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/configuration.html +14 -5
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/connecting.html +5 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/examples.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/fields.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/forge.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/helpers.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/index.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/queries.html +4 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/results.html +17 -17
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/table_data.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/transactions.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/utilities.html +21 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/doc_style/index.html +4 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/doc_style/template.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/alternative_php.html +4 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/ancillary_classes.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/autoloader.html +3 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/caching.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/common_functions.html +9 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/controllers.html +32 -29
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/core_classes.html +10 -9
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/user_guide/general/creating_drivers.html +100 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/creating_libraries.html +8 -13
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/credits.html +4 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2/user_guide/general/profiling.html → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/user_guide/general/drivers.html} +21 -21
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/errors.html +5 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/helpers.html +4 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/hooks.html +2 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/libraries.html +9 -5
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/managing_apps.html +24 -24
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/models.html +13 -13
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/user_guide/general/profiling.html +176 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/quick_reference.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/requirements.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/reserved_names.html +4 -33
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/routing.html +7 -17
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/security.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/styleguide.html +71 -79
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/urls.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/general/views.html +13 -13
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/array_helper.html +53 -2
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/user_guide/helpers/captcha_helper.html +195 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/user_guide/helpers/cookie_helper.html +107 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/date_helper.html +6 -6
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/directory_helper.html +6 -6
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/download_helper.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/email_helper.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/file_helper.html +5 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/form_helper.html +9 -9
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/html_helper.html +6 -6
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/inflector_helper.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/language_helper.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/number_helper.html +9 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/path_helper.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/security_helper.html +12 -5
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/smiley_helper.html +12 -12
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/string_helper.html +11 -9
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/text_helper.html +21 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/typography_helper.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/url_helper.html +7 -8
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/helpers/xml_helper.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/appflowchart.gif +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/arrow.gif +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/ci_logo.jpg +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/ci_logo_flame.jpg +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/ci_quick_ref.png +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/codeigniter_1.7.1_helper_reference.pdf +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/codeigniter_1.7.1_helper_reference.png +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/codeigniter_1.7.1_library_reference.pdf +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/codeigniter_1.7.1_library_reference.png +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/file.gif +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/folder.gif +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/nav_bg_darker.jpg +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/nav_separator_darker.jpg +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/nav_toggle_darker.jpg +0 -0
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/user_guide/images/reactor-bullet.png +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/smile.gif +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/images/transparent.gif +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/index.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/downloads.html +10 -6
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/index.html +10 -5
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/troubleshooting.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_120.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_130.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_131.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_132.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_133.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_140.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_141.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_150.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_152.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_153.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_154.html +5 -5
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_160.html +6 -6
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_161.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_162.html +5 -5
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_163.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_170.html +5 -5
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_171.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_172.html +7 -3
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/user_guide/installation/upgrade_200.html +131 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrade_b11.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/installation/upgrading.html +3 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/benchmark.html +4 -4
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/user_guide/libraries/caching.html +193 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/calendar.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/cart.html +345 -345
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/config.html +4 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/email.html +4 -4
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/encryption.html +49 -7
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/file_uploading.html +15 -15
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/form_validation.html +22 -25
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/ftp.html +21 -8
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/image_lib.html +4 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/input.html +69 -31
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/user_guide/libraries/javascript.html +246 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/language.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/loader.html +56 -15
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/output.html +19 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/pagination.html +19 -8
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/parser.html +6 -2
- data/lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0/user_guide/libraries/security.html +135 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/sessions.html +18 -7
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/table.html +33 -10
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/trackback.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/typography.html +5 -5
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/unit_testing.html +27 -6
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/uri.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/user_agent.html +27 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/xmlrpc.html +25 -23
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/libraries/zip.html +13 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/license.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/nav/hacks.txt +2 -1
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/nav/moo.fx.js +1 -37
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/nav/nav.js +27 -24
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/nav/prototype.lite.js +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/nav/user_guide_menu.js +0 -0
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/overview/appflow.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/overview/at_a_glance.html +5 -15
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/overview/cheatsheets.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/overview/features.html +3 -5
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/overview/getting_started.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/overview/goals.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/overview/index.html +3 -3
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/overview/mvc.html +2 -2
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/toc.html +14 -15
- data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/userguide.css +9 -0
- data/{generators → lib/generators/ci}/ci_app/templates/README +0 -0
- data/lib/generators/ci/ci_auth/USAGE +8 -0
- data/lib/generators/ci/ci_auth/ci_auth_generator.rb +11 -0
- data/lib/generators/ci/ci_auth/templates/auth.php +133 -0
- data/lib/generators/ci/ci_auth/templates/auth_model.php +52 -0
- data/lib/generators/ci/ci_auth/templates/login_form.php +29 -0
- data/{generators → lib/generators/ci}/ci_controller/USAGE +0 -0
- data/{generators → lib/generators/ci}/ci_controller/ci_controller_generator.rb +0 -0
- data/{generators → lib/generators/ci}/ci_controller/templates/ci_controller.php.erb +0 -0
- data/{generators → lib/generators/ci}/ci_controller/templates/ci_view.php.erb +0 -0
- data/{generators → lib/generators/ci}/ci_layout/USAGE +0 -0
- data/{generators → lib/generators/ci}/ci_layout/ci_layout_generator.rb +0 -0
- data/{generators → lib/generators/ci}/ci_layout/templates/application_layout.php.erb +0 -0
- data/{generators → lib/generators/ci}/ci_model/USAGE +0 -0
- data/{generators → lib/generators/ci}/ci_model/ci_model_generator.rb +0 -0
- data/{generators → lib/generators/ci}/ci_model/templates/ci_model.php.erb +0 -0
- data/{generators → lib/generators/ci}/ci_model/templates/model.rb +0 -0
- data/{generators → lib/generators/ci}/ci_model/templates/model_migration.rb.erb +0 -0
- metadata +358 -347
- data/README +0 -40
- data/generators/ci_app/ci_app_generator.rb +0 -12
- data/generators/ci_app/templates/CodeIgniter_1.7.2/index.php +0 -118
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/application/controllers/welcome.php +0 -17
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/codeigniter/Base4.php +0 -69
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/codeigniter/Base5.php +0 -56
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/codeigniter/CodeIgniter.php +0 -280
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/codeigniter/Common.php +0 -421
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/codeigniter/Compat.php +0 -93
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/fonts/texb.ttf +0 -0
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/helpers/compatibility_helper.php +0 -498
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/language/english/calendar_lang.php +0 -51
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/language/english/scaffolding_lang.php +0 -17
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/language/english/validation_lang.php +0 -24
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries/Controller.php +0 -127
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries/Input.php +0 -1067
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries/Model.php +0 -83
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries/Profiler.php +0 -392
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/libraries/Validation.php +0 -875
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/plugins/captcha_pi.php +0 -356
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/plugins/js_calendar_pi.php +0 -629
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/Scaffolding.php +0 -291
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/images/background.jpg +0 -0
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/images/logo.jpg +0 -0
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/index.html +0 -10
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/views/add.php +0 -32
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/views/delete.php +0 -9
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/views/edit.php +0 -33
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/views/footer.php +0 -10
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/views/header.php +0 -29
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/views/index.html +0 -10
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/views/no_data.php +0 -8
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/views/stylesheet.css +0 -143
- data/generators/ci_app/templates/CodeIgniter_1.7.2/system/scaffolding/views/view.php +0 -27
- data/generators/ci_app/templates/CodeIgniter_1.7.2/user_guide/general/plugins.html +0 -127
- data/generators/ci_app/templates/CodeIgniter_1.7.2/user_guide/general/scaffolding.html +0 -147
- data/generators/ci_app/templates/CodeIgniter_1.7.2/user_guide/helpers/compatibility_helper.html +0 -118
- data/generators/ci_app/templates/CodeIgniter_1.7.2/user_guide/helpers/cookie_helper.html +0 -147
- data/generators/ci_app/templates/CodeIgniter_1.7.2/user_guide/libraries/validation.html +0 -740
- data/generators/ci_app/templates/CodeIgniter_1.7.2/user_guide/nav/moo.fx.pack.js +0 -241
@@ -2,11 +2,11 @@
|
|
2
2
|
/**
|
3
3
|
* CodeIgniter
|
4
4
|
*
|
5
|
-
* An open source application development framework for PHP
|
5
|
+
* An open source application development framework for PHP 5.1.6 or newer
|
6
6
|
*
|
7
7
|
* @package CodeIgniter
|
8
8
|
* @author ExpressionEngine Dev Team
|
9
|
-
* @copyright Copyright (c) 2008 -
|
9
|
+
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
|
10
10
|
* @license http://codeigniter.com/user_guide/license.html
|
11
11
|
* @link http://codeigniter.com
|
12
12
|
* @since Version 1.0
|
@@ -14,7 +14,7 @@
|
|
14
14
|
*/
|
15
15
|
|
16
16
|
if ( ! function_exists('xml_parser_create'))
|
17
|
-
{
|
17
|
+
{
|
18
18
|
show_error('Your PHP installation does not support XML');
|
19
19
|
}
|
20
20
|
|
@@ -32,60 +32,61 @@ if ( ! function_exists('xml_parser_create'))
|
|
32
32
|
*/
|
33
33
|
class CI_Xmlrpc {
|
34
34
|
|
35
|
-
var $debug = FALSE;
|
35
|
+
var $debug = FALSE; // Debugging on or off
|
36
36
|
var $xmlrpcI4 = 'i4';
|
37
37
|
var $xmlrpcInt = 'int';
|
38
38
|
var $xmlrpcBoolean = 'boolean';
|
39
|
-
var $xmlrpcDouble = 'double';
|
39
|
+
var $xmlrpcDouble = 'double';
|
40
40
|
var $xmlrpcString = 'string';
|
41
41
|
var $xmlrpcDateTime = 'dateTime.iso8601';
|
42
42
|
var $xmlrpcBase64 = 'base64';
|
43
43
|
var $xmlrpcArray = 'array';
|
44
44
|
var $xmlrpcStruct = 'struct';
|
45
|
-
|
45
|
+
|
46
46
|
var $xmlrpcTypes = array();
|
47
47
|
var $valid_parents = array();
|
48
48
|
var $xmlrpcerr = array(); // Response numbers
|
49
49
|
var $xmlrpcstr = array(); // Response strings
|
50
|
-
|
50
|
+
|
51
51
|
var $xmlrpc_defencoding = 'UTF-8';
|
52
52
|
var $xmlrpcName = 'XML-RPC for CodeIgniter';
|
53
53
|
var $xmlrpcVersion = '1.1';
|
54
54
|
var $xmlrpcerruser = 800; // Start of user errors
|
55
55
|
var $xmlrpcerrxml = 100; // Start of XML Parse errors
|
56
56
|
var $xmlrpc_backslash = ''; // formulate backslashes for escaping regexp
|
57
|
-
|
57
|
+
|
58
58
|
var $client;
|
59
59
|
var $method;
|
60
60
|
var $data;
|
61
61
|
var $message = '';
|
62
|
-
var $error = '';
|
62
|
+
var $error = ''; // Error string for request
|
63
63
|
var $result;
|
64
64
|
var $response = array(); // Response from remote server
|
65
65
|
|
66
|
+
var $xss_clean = TRUE;
|
66
67
|
|
67
68
|
//-------------------------------------
|
68
69
|
// VALUES THAT MULTIPLE CLASSES NEED
|
69
70
|
//-------------------------------------
|
70
71
|
|
71
|
-
function
|
72
|
+
public function __construct($config = array())
|
72
73
|
{
|
73
|
-
$this->xmlrpcName
|
74
|
+
$this->xmlrpcName = $this->xmlrpcName;
|
74
75
|
$this->xmlrpc_backslash = chr(92).chr(92);
|
75
|
-
|
76
|
+
|
76
77
|
// Types for info sent back and forth
|
77
78
|
$this->xmlrpcTypes = array(
|
78
|
-
$this->xmlrpcI4
|
79
|
-
$this->xmlrpcInt
|
80
|
-
$this->xmlrpcBoolean
|
81
|
-
$this->xmlrpcString
|
82
|
-
$this->xmlrpcDouble
|
83
|
-
$this->xmlrpcDateTime
|
84
|
-
$this->xmlrpcBase64
|
85
|
-
$this->xmlrpcArray
|
86
|
-
$this->xmlrpcStruct
|
79
|
+
$this->xmlrpcI4 => '1',
|
80
|
+
$this->xmlrpcInt => '1',
|
81
|
+
$this->xmlrpcBoolean => '1',
|
82
|
+
$this->xmlrpcString => '1',
|
83
|
+
$this->xmlrpcDouble => '1',
|
84
|
+
$this->xmlrpcDateTime => '1',
|
85
|
+
$this->xmlrpcBase64 => '1',
|
86
|
+
$this->xmlrpcArray => '2',
|
87
|
+
$this->xmlrpcStruct => '3'
|
87
88
|
);
|
88
|
-
|
89
|
+
|
89
90
|
// Array of Valid Parents for Various XML-RPC elements
|
90
91
|
$this->valid_parents = array('BOOLEAN' => array('VALUE'),
|
91
92
|
'I4' => array('VALUE'),
|
@@ -105,13 +106,13 @@ class CI_Xmlrpc {
|
|
105
106
|
'FAULT' => array('METHODRESPONSE'),
|
106
107
|
'VALUE' => array('MEMBER', 'DATA', 'PARAM', 'FAULT')
|
107
108
|
);
|
108
|
-
|
109
|
-
|
109
|
+
|
110
|
+
|
110
111
|
// XML-RPC Responses
|
111
112
|
$this->xmlrpcerr['unknown_method'] = '1';
|
112
113
|
$this->xmlrpcstr['unknown_method'] = 'This is not a known method for this XML-RPC Server';
|
113
114
|
$this->xmlrpcerr['invalid_return'] = '2';
|
114
|
-
$this->xmlrpcstr['invalid_return'] = 'The XML data
|
115
|
+
$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.';
|
115
116
|
$this->xmlrpcerr['incorrect_params'] = '3';
|
116
117
|
$this->xmlrpcstr['incorrect_params'] = 'Incorrect parameters were passed to method';
|
117
118
|
$this->xmlrpcerr['introspect_unknown'] = '4';
|
@@ -120,13 +121,13 @@ class CI_Xmlrpc {
|
|
120
121
|
$this->xmlrpcstr['http_error'] = "Did not receive a '200 OK' response from remote server.";
|
121
122
|
$this->xmlrpcerr['no_data'] = '6';
|
122
123
|
$this->xmlrpcstr['no_data'] ='No data received from server.';
|
123
|
-
|
124
|
+
|
124
125
|
$this->initialize($config);
|
125
|
-
|
126
|
+
|
126
127
|
log_message('debug', "XML-RPC Class Initialized");
|
127
128
|
}
|
128
|
-
|
129
|
-
|
129
|
+
|
130
|
+
|
130
131
|
//-------------------------------------
|
131
132
|
// Initialize Prefs
|
132
133
|
//-------------------------------------
|
@@ -139,13 +140,13 @@ class CI_Xmlrpc {
|
|
139
140
|
{
|
140
141
|
if (isset($this->$key))
|
141
142
|
{
|
142
|
-
$this->$key = $val;
|
143
|
+
$this->$key = $val;
|
143
144
|
}
|
144
145
|
}
|
145
146
|
}
|
146
147
|
}
|
147
148
|
// END
|
148
|
-
|
149
|
+
|
149
150
|
//-------------------------------------
|
150
151
|
// Take URL and parse it
|
151
152
|
//-------------------------------------
|
@@ -156,20 +157,20 @@ class CI_Xmlrpc {
|
|
156
157
|
{
|
157
158
|
$url = "http://".$url;
|
158
159
|
}
|
159
|
-
|
160
|
+
|
160
161
|
$parts = parse_url($url);
|
161
|
-
|
162
|
+
|
162
163
|
$path = ( ! isset($parts['path'])) ? '/' : $parts['path'];
|
163
|
-
|
164
|
+
|
164
165
|
if (isset($parts['query']) && $parts['query'] != '')
|
165
166
|
{
|
166
167
|
$path .= '?'.$parts['query'];
|
167
|
-
}
|
168
|
-
|
168
|
+
}
|
169
|
+
|
169
170
|
$this->client = new XML_RPC_Client($path, $parts['host'], $port);
|
170
171
|
}
|
171
172
|
// END
|
172
|
-
|
173
|
+
|
173
174
|
//-------------------------------------
|
174
175
|
// Set Timeout
|
175
176
|
//-------------------------------------
|
@@ -182,7 +183,7 @@ class CI_Xmlrpc {
|
|
182
183
|
}
|
183
184
|
}
|
184
185
|
// END
|
185
|
-
|
186
|
+
|
186
187
|
//-------------------------------------
|
187
188
|
// Set Methods
|
188
189
|
//-------------------------------------
|
@@ -192,7 +193,7 @@ class CI_Xmlrpc {
|
|
192
193
|
$this->method = $function;
|
193
194
|
}
|
194
195
|
// END
|
195
|
-
|
196
|
+
|
196
197
|
//-------------------------------------
|
197
198
|
// Take Array of Data and Create Objects
|
198
199
|
//-------------------------------------
|
@@ -203,17 +204,17 @@ class CI_Xmlrpc {
|
|
203
204
|
{
|
204
205
|
// Send Error
|
205
206
|
}
|
206
|
-
|
207
|
+
|
207
208
|
$this->data = array();
|
208
|
-
|
209
|
+
|
209
210
|
foreach($incoming as $key => $value)
|
210
211
|
{
|
211
212
|
$this->data[$key] = $this->values_parsing($value);
|
212
213
|
}
|
213
214
|
}
|
214
215
|
// END
|
215
|
-
|
216
|
-
|
216
|
+
|
217
|
+
|
217
218
|
//-------------------------------------
|
218
219
|
// Set Debug
|
219
220
|
//-------------------------------------
|
@@ -222,14 +223,14 @@ class CI_Xmlrpc {
|
|
222
223
|
{
|
223
224
|
$this->debug = ($flag == TRUE) ? TRUE : FALSE;
|
224
225
|
}
|
225
|
-
|
226
|
+
|
226
227
|
//-------------------------------------
|
227
228
|
// Values Parsing
|
228
229
|
//-------------------------------------
|
229
230
|
|
230
231
|
function values_parsing($value, $return = FALSE)
|
231
232
|
{
|
232
|
-
if (is_array($value) &&
|
233
|
+
if (is_array($value) && array_key_exists(0, $value))
|
233
234
|
{
|
234
235
|
if ( ! isset($value['1']) OR (! isset($this->xmlrpcTypes[$value['1']])))
|
235
236
|
{
|
@@ -248,7 +249,7 @@ class CI_Xmlrpc {
|
|
248
249
|
{
|
249
250
|
$value['0'][$k] = $this->values_parsing($value['0'][$k], TRUE);
|
250
251
|
}
|
251
|
-
|
252
|
+
|
252
253
|
$temp = new XML_RPC_Values($value['0'], $value['1']);
|
253
254
|
}
|
254
255
|
else
|
@@ -274,7 +275,7 @@ class CI_Xmlrpc {
|
|
274
275
|
{
|
275
276
|
$this->message = new XML_RPC_Message($this->method,$this->data);
|
276
277
|
$this->message->debug = $this->debug;
|
277
|
-
|
278
|
+
|
278
279
|
if ( ! $this->result = $this->client->send($this->message))
|
279
280
|
{
|
280
281
|
$this->error = $this->result->errstr;
|
@@ -285,13 +286,13 @@ class CI_Xmlrpc {
|
|
285
286
|
$this->error = $this->result->errstr;
|
286
287
|
return FALSE;
|
287
288
|
}
|
288
|
-
|
289
|
+
|
289
290
|
$this->response = $this->result->decode();
|
290
|
-
|
291
|
+
|
291
292
|
return TRUE;
|
292
293
|
}
|
293
294
|
// END
|
294
|
-
|
295
|
+
|
295
296
|
//-------------------------------------
|
296
297
|
// Returns Error
|
297
298
|
//-------------------------------------
|
@@ -301,7 +302,7 @@ class CI_Xmlrpc {
|
|
301
302
|
return $this->error;
|
302
303
|
}
|
303
304
|
// END
|
304
|
-
|
305
|
+
|
305
306
|
//-------------------------------------
|
306
307
|
// Returns Remote Server Response
|
307
308
|
//-------------------------------------
|
@@ -311,37 +312,37 @@ class CI_Xmlrpc {
|
|
311
312
|
return $this->response;
|
312
313
|
}
|
313
314
|
// END
|
314
|
-
|
315
|
+
|
315
316
|
//-------------------------------------
|
316
317
|
// Sends an Error Message for Server Request
|
317
318
|
//-------------------------------------
|
318
|
-
|
319
|
+
|
319
320
|
function send_error_message($number, $message)
|
320
321
|
{
|
321
322
|
return new XML_RPC_Response('0',$number, $message);
|
322
323
|
}
|
323
324
|
// END
|
324
|
-
|
325
|
-
|
325
|
+
|
326
|
+
|
326
327
|
//-------------------------------------
|
327
328
|
// Send Response for Server Request
|
328
329
|
//-------------------------------------
|
329
|
-
|
330
|
+
|
330
331
|
function send_response($response)
|
331
332
|
{
|
332
333
|
// $response should be array of values, which will be parsed
|
333
334
|
// based on their data and type into a valid group of XML-RPC values
|
334
|
-
|
335
|
+
|
335
336
|
$response = $this->values_parsing($response);
|
336
|
-
|
337
|
+
|
337
338
|
return new XML_RPC_Response($response);
|
338
339
|
}
|
339
340
|
// END
|
340
|
-
|
341
|
+
|
341
342
|
} // END XML_RPC Class
|
342
343
|
|
343
|
-
|
344
|
-
|
344
|
+
|
345
|
+
|
345
346
|
/**
|
346
347
|
* XML-RPC Client class
|
347
348
|
*
|
@@ -359,15 +360,15 @@ class XML_RPC_Client extends CI_Xmlrpc
|
|
359
360
|
var $timeout = 5;
|
360
361
|
var $no_multicall = false;
|
361
362
|
|
362
|
-
function
|
363
|
+
public function __construct($path, $server, $port=80)
|
363
364
|
{
|
364
|
-
parent::
|
365
|
-
|
365
|
+
parent::__construct();
|
366
|
+
|
366
367
|
$this->port = $port;
|
367
368
|
$this->server = $server;
|
368
369
|
$this->path = $path;
|
369
370
|
}
|
370
|
-
|
371
|
+
|
371
372
|
function send($msg)
|
372
373
|
{
|
373
374
|
if (is_array($msg))
|
@@ -381,22 +382,22 @@ class XML_RPC_Client extends CI_Xmlrpc
|
|
381
382
|
}
|
382
383
|
|
383
384
|
function sendPayload($msg)
|
384
|
-
{
|
385
|
+
{
|
385
386
|
$fp = @fsockopen($this->server, $this->port,$this->errno, $this->errstr, $this->timeout);
|
386
|
-
|
387
|
+
|
387
388
|
if ( ! is_resource($fp))
|
388
389
|
{
|
389
390
|
error_log($this->xmlrpcstr['http_error']);
|
390
391
|
$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'],$this->xmlrpcstr['http_error']);
|
391
392
|
return $r;
|
392
393
|
}
|
393
|
-
|
394
|
+
|
394
395
|
if(empty($msg->payload))
|
395
396
|
{
|
396
397
|
// $msg = XML_RPC_Messages
|
397
398
|
$msg->createPayload();
|
398
399
|
}
|
399
|
-
|
400
|
+
|
400
401
|
$r = "\r\n";
|
401
402
|
$op = "POST {$this->path} HTTP/1.0$r";
|
402
403
|
$op .= "Host: {$this->server}$r";
|
@@ -404,7 +405,7 @@ class XML_RPC_Client extends CI_Xmlrpc
|
|
404
405
|
$op .= "User-Agent: {$this->xmlrpcName}$r";
|
405
406
|
$op .= "Content-Length: ".strlen($msg->payload). "$r$r";
|
406
407
|
$op .= $msg->payload;
|
407
|
-
|
408
|
+
|
408
409
|
|
409
410
|
if ( ! fputs($fp, $op, strlen($op)))
|
410
411
|
{
|
@@ -433,9 +434,10 @@ class XML_RPC_Response
|
|
433
434
|
var $errno = 0;
|
434
435
|
var $errstr = '';
|
435
436
|
var $headers = array();
|
437
|
+
var $xss_clean = TRUE;
|
436
438
|
|
437
|
-
function
|
438
|
-
{
|
439
|
+
public function __construct($val, $code = 0, $fstr = '')
|
440
|
+
{
|
439
441
|
if ($code != 0)
|
440
442
|
{
|
441
443
|
// error
|
@@ -468,7 +470,7 @@ class XML_RPC_Response
|
|
468
470
|
{
|
469
471
|
return $this->val;
|
470
472
|
}
|
471
|
-
|
473
|
+
|
472
474
|
function prepare_response()
|
473
475
|
{
|
474
476
|
$result = "<methodResponse>\n";
|
@@ -498,11 +500,16 @@ class XML_RPC_Response
|
|
498
500
|
$result .= "\n</methodResponse>";
|
499
501
|
return $result;
|
500
502
|
}
|
501
|
-
|
503
|
+
|
502
504
|
function decode($array=FALSE)
|
503
505
|
{
|
504
506
|
$CI =& get_instance();
|
505
507
|
|
508
|
+
if ($this->xss_clean && ! isset($CI->security))
|
509
|
+
{
|
510
|
+
$CI->load->library('security');
|
511
|
+
}
|
512
|
+
|
506
513
|
if ($array !== FALSE && is_array($array))
|
507
514
|
{
|
508
515
|
while (list($key) = each($array))
|
@@ -513,31 +520,31 @@ class XML_RPC_Response
|
|
513
520
|
}
|
514
521
|
else
|
515
522
|
{
|
516
|
-
$array[$key] = $CI->
|
523
|
+
$array[$key] = ($this->xss_clean) ? $CI->security->xss_clean($array[$key]) : $array[$key];
|
517
524
|
}
|
518
525
|
}
|
519
|
-
|
526
|
+
|
520
527
|
$result = $array;
|
521
528
|
}
|
522
529
|
else
|
523
530
|
{
|
524
531
|
$result = $this->xmlrpc_decoder($this->val);
|
525
|
-
|
532
|
+
|
526
533
|
if (is_array($result))
|
527
534
|
{
|
528
535
|
$result = $this->decode($result);
|
529
536
|
}
|
530
537
|
else
|
531
538
|
{
|
532
|
-
$result = $CI->
|
539
|
+
$result = ($this->xss_clean) ? $CI->security->xss_clean($result) : $result;
|
533
540
|
}
|
534
541
|
}
|
535
|
-
|
542
|
+
|
536
543
|
return $result;
|
537
544
|
}
|
538
545
|
|
539
|
-
|
540
|
-
|
546
|
+
|
547
|
+
|
541
548
|
//-------------------------------------
|
542
549
|
// XML-RPC Object to PHP Types
|
543
550
|
//-------------------------------------
|
@@ -555,7 +562,7 @@ class XML_RPC_Response
|
|
555
562
|
reset($xmlrpc_val->me);
|
556
563
|
list($a,$b) = each($xmlrpc_val->me);
|
557
564
|
$size = count($b);
|
558
|
-
|
565
|
+
|
559
566
|
$arr = array();
|
560
567
|
|
561
568
|
for($i = 0; $i < $size; $i++)
|
@@ -576,8 +583,8 @@ class XML_RPC_Response
|
|
576
583
|
return $arr;
|
577
584
|
}
|
578
585
|
}
|
579
|
-
|
580
|
-
|
586
|
+
|
587
|
+
|
581
588
|
//-------------------------------------
|
582
589
|
// ISO-8601 time to server or UTC time
|
583
590
|
//-------------------------------------
|
@@ -595,7 +602,7 @@ class XML_RPC_Response
|
|
595
602
|
}
|
596
603
|
return $t;
|
597
604
|
}
|
598
|
-
|
605
|
+
|
599
606
|
} // End Response Class
|
600
607
|
|
601
608
|
|
@@ -612,12 +619,12 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
612
619
|
var $payload;
|
613
620
|
var $method_name;
|
614
621
|
var $params = array();
|
615
|
-
var $xh
|
622
|
+
var $xh = array();
|
616
623
|
|
617
|
-
function
|
624
|
+
public function __construct($method, $pars=0)
|
618
625
|
{
|
619
|
-
parent::
|
620
|
-
|
626
|
+
parent::__construct();
|
627
|
+
|
621
628
|
$this->method_name = $method;
|
622
629
|
if (is_array($pars) && count($pars) > 0)
|
623
630
|
{
|
@@ -628,51 +635,51 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
628
635
|
}
|
629
636
|
}
|
630
637
|
}
|
631
|
-
|
638
|
+
|
632
639
|
//-------------------------------------
|
633
640
|
// Create Payload to Send
|
634
641
|
//-------------------------------------
|
635
|
-
|
642
|
+
|
636
643
|
function createPayload()
|
637
644
|
{
|
638
645
|
$this->payload = "<?xml version=\"1.0\"?".">\r\n<methodCall>\r\n";
|
639
646
|
$this->payload .= '<methodName>' . $this->method_name . "</methodName>\r\n";
|
640
647
|
$this->payload .= "<params>\r\n";
|
641
|
-
|
648
|
+
|
642
649
|
for($i=0; $i<count($this->params); $i++)
|
643
650
|
{
|
644
651
|
// $p = XML_RPC_Values
|
645
652
|
$p = $this->params[$i];
|
646
653
|
$this->payload .= "<param>\r\n".$p->serialize_class()."</param>\r\n";
|
647
654
|
}
|
648
|
-
|
655
|
+
|
649
656
|
$this->payload .= "</params>\r\n</methodCall>\r\n";
|
650
657
|
}
|
651
|
-
|
658
|
+
|
652
659
|
//-------------------------------------
|
653
660
|
// Parse External XML-RPC Server's Response
|
654
661
|
//-------------------------------------
|
655
|
-
|
662
|
+
|
656
663
|
function parseResponse($fp)
|
657
664
|
{
|
658
665
|
$data = '';
|
659
|
-
|
666
|
+
|
660
667
|
while($datum = fread($fp, 4096))
|
661
668
|
{
|
662
669
|
$data .= $datum;
|
663
670
|
}
|
664
|
-
|
671
|
+
|
665
672
|
//-------------------------------------
|
666
673
|
// DISPLAY HTTP CONTENT for DEBUGGING
|
667
674
|
//-------------------------------------
|
668
|
-
|
675
|
+
|
669
676
|
if ($this->debug === TRUE)
|
670
677
|
{
|
671
678
|
echo "<pre>";
|
672
679
|
echo "---DATA---\n" . htmlspecialchars($data) . "\n---END DATA---\n\n";
|
673
680
|
echo "</pre>";
|
674
681
|
}
|
675
|
-
|
682
|
+
|
676
683
|
//-------------------------------------
|
677
684
|
// Check for data
|
678
685
|
//-------------------------------------
|
@@ -683,32 +690,32 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
683
690
|
$r = new XML_RPC_Response(0, $this->xmlrpcerr['no_data'], $this->xmlrpcstr['no_data']);
|
684
691
|
return $r;
|
685
692
|
}
|
686
|
-
|
687
|
-
|
693
|
+
|
694
|
+
|
688
695
|
//-------------------------------------
|
689
696
|
// Check for HTTP 200 Response
|
690
697
|
//-------------------------------------
|
691
|
-
|
698
|
+
|
692
699
|
if (strncmp($data, 'HTTP', 4) == 0 && ! preg_match('/^HTTP\/[0-9\.]+ 200 /', $data))
|
693
700
|
{
|
694
701
|
$errstr= substr($data, 0, strpos($data, "\n")-1);
|
695
702
|
$r = new XML_RPC_Response(0, $this->xmlrpcerr['http_error'], $this->xmlrpcstr['http_error']. ' (' . $errstr . ')');
|
696
703
|
return $r;
|
697
704
|
}
|
698
|
-
|
705
|
+
|
699
706
|
//-------------------------------------
|
700
707
|
// Create and Set Up XML Parser
|
701
708
|
//-------------------------------------
|
702
|
-
|
709
|
+
|
703
710
|
$parser = xml_parser_create($this->xmlrpc_defencoding);
|
704
711
|
|
705
|
-
$this->xh[$parser]
|
706
|
-
$this->xh[$parser]['isf']
|
707
|
-
$this->xh[$parser]['ac']
|
708
|
-
$this->xh[$parser]['headers']
|
709
|
-
$this->xh[$parser]['stack']
|
710
|
-
$this->xh[$parser]['valuestack']
|
711
|
-
$this->xh[$parser]['isf_reason']
|
712
|
+
$this->xh[$parser] = array();
|
713
|
+
$this->xh[$parser]['isf'] = 0;
|
714
|
+
$this->xh[$parser]['ac'] = '';
|
715
|
+
$this->xh[$parser]['headers'] = array();
|
716
|
+
$this->xh[$parser]['stack'] = array();
|
717
|
+
$this->xh[$parser]['valuestack'] = array();
|
718
|
+
$this->xh[$parser]['isf_reason'] = 0;
|
712
719
|
|
713
720
|
xml_set_object($parser, $this);
|
714
721
|
xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
|
@@ -720,7 +727,7 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
720
727
|
//-------------------------------------
|
721
728
|
// GET HEADERS
|
722
729
|
//-------------------------------------
|
723
|
-
|
730
|
+
|
724
731
|
$lines = explode("\r\n", $data);
|
725
732
|
while (($line = array_shift($lines)))
|
726
733
|
{
|
@@ -731,11 +738,11 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
731
738
|
$this->xh[$parser]['headers'][] = $line;
|
732
739
|
}
|
733
740
|
$data = implode("\r\n", $lines);
|
734
|
-
|
735
|
-
|
741
|
+
|
742
|
+
|
736
743
|
//-------------------------------------
|
737
744
|
// PARSE XML DATA
|
738
|
-
//-------------------------------------
|
745
|
+
//-------------------------------------
|
739
746
|
|
740
747
|
if ( ! xml_parse($parser, $data, count($data)))
|
741
748
|
{
|
@@ -748,11 +755,11 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
748
755
|
return $r;
|
749
756
|
}
|
750
757
|
xml_parser_free($parser);
|
751
|
-
|
758
|
+
|
752
759
|
// ---------------------------------------
|
753
760
|
// Got Ourselves Some Badness, It Seems
|
754
761
|
// ---------------------------------------
|
755
|
-
|
762
|
+
|
756
763
|
if ($this->xh[$parser]['isf'] > 1)
|
757
764
|
{
|
758
765
|
if ($this->debug === TRUE)
|
@@ -761,7 +768,7 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
761
768
|
echo $this->xh[$parser]['isf_reason'];
|
762
769
|
echo "---Invalid Return---\n\n";
|
763
770
|
}
|
764
|
-
|
771
|
+
|
765
772
|
$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
|
766
773
|
return $r;
|
767
774
|
}
|
@@ -770,15 +777,15 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
770
777
|
$r = new XML_RPC_Response(0, $this->xmlrpcerr['invalid_return'],$this->xmlrpcstr['invalid_return'].' '.$this->xh[$parser]['isf_reason']);
|
771
778
|
return $r;
|
772
779
|
}
|
773
|
-
|
780
|
+
|
774
781
|
//-------------------------------------
|
775
782
|
// DISPLAY XML CONTENT for DEBUGGING
|
776
|
-
//-------------------------------------
|
777
|
-
|
783
|
+
//-------------------------------------
|
784
|
+
|
778
785
|
if ($this->debug === TRUE)
|
779
786
|
{
|
780
787
|
echo "<pre>";
|
781
|
-
|
788
|
+
|
782
789
|
if (count($this->xh[$parser]['headers'] > 0))
|
783
790
|
{
|
784
791
|
echo "---HEADERS---\n";
|
@@ -788,20 +795,20 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
788
795
|
}
|
789
796
|
echo "---END HEADERS---\n\n";
|
790
797
|
}
|
791
|
-
|
798
|
+
|
792
799
|
echo "---DATA---\n" . htmlspecialchars($data) . "\n---END DATA---\n\n";
|
793
|
-
|
800
|
+
|
794
801
|
echo "---PARSED---\n" ;
|
795
802
|
var_dump($this->xh[$parser]['value']);
|
796
803
|
echo "\n---END PARSED---</pre>";
|
797
804
|
}
|
798
|
-
|
805
|
+
|
799
806
|
//-------------------------------------
|
800
807
|
// SEND RESPONSE
|
801
808
|
//-------------------------------------
|
802
|
-
|
809
|
+
|
803
810
|
$v = $this->xh[$parser]['value'];
|
804
|
-
|
811
|
+
|
805
812
|
if ($this->xh[$parser]['isf'])
|
806
813
|
{
|
807
814
|
$errno_v = $v->me['struct']['faultCode'];
|
@@ -824,11 +831,11 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
824
831
|
$r->headers = $this->xh[$parser]['headers'];
|
825
832
|
return $r;
|
826
833
|
}
|
827
|
-
|
834
|
+
|
828
835
|
// ------------------------------------
|
829
836
|
// Begin Return Message Parsing section
|
830
837
|
// ------------------------------------
|
831
|
-
|
838
|
+
|
832
839
|
// quick explanation of components:
|
833
840
|
// ac - used to accumulate values
|
834
841
|
// isf - used to indicate a fault
|
@@ -847,9 +854,9 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
847
854
|
{
|
848
855
|
// If invalid nesting, then return
|
849
856
|
if ($this->xh[$the_parser]['isf'] > 1) return;
|
850
|
-
|
857
|
+
|
851
858
|
// Evaluate and check for correct nesting of XML elements
|
852
|
-
|
859
|
+
|
853
860
|
if (count($this->xh[$the_parser]['stack']) == 0)
|
854
861
|
{
|
855
862
|
if ($name != 'METHODRESPONSE' && $name != 'METHODCALL')
|
@@ -869,16 +876,16 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
869
876
|
return;
|
870
877
|
}
|
871
878
|
}
|
872
|
-
|
879
|
+
|
873
880
|
switch($name)
|
874
881
|
{
|
875
882
|
case 'STRUCT':
|
876
883
|
case 'ARRAY':
|
877
884
|
// Creates array for child elements
|
878
|
-
|
885
|
+
|
879
886
|
$cur_val = array('value' => array(),
|
880
887
|
'type' => $name);
|
881
|
-
|
888
|
+
|
882
889
|
array_unshift($this->xh[$the_parser]['valuestack'], $cur_val);
|
883
890
|
break;
|
884
891
|
case 'METHODNAME':
|
@@ -910,13 +917,13 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
910
917
|
$this->xh[$the_parser]['isf_reason'] = "'Twas a $name element following a ".$this->xh[$the_parser]['vt']." element inside a single value";
|
911
918
|
return;
|
912
919
|
}
|
913
|
-
|
920
|
+
|
914
921
|
$this->xh[$the_parser]['ac'] = '';
|
915
922
|
break;
|
916
923
|
case 'MEMBER':
|
917
924
|
// Set name of <member> to nothing to prevent errors later if no <name> is found
|
918
925
|
$this->xh[$the_parser]['valuestack'][0]['name'] = '';
|
919
|
-
|
926
|
+
|
920
927
|
// Set NULL value to check to see if value passed for this param/member
|
921
928
|
$this->xh[$the_parser]['value'] = null;
|
922
929
|
break;
|
@@ -932,7 +939,7 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
932
939
|
$this->xh[$the_parser]['isf_reason'] = "Invalid XML-RPC element found: $name";
|
933
940
|
break;
|
934
941
|
}
|
935
|
-
|
942
|
+
|
936
943
|
// Add current element name to stack, to allow validation of nesting
|
937
944
|
array_unshift($this->xh[$the_parser]['stack'], $name);
|
938
945
|
|
@@ -948,14 +955,14 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
948
955
|
function closing_tag($the_parser, $name)
|
949
956
|
{
|
950
957
|
if ($this->xh[$the_parser]['isf'] > 1) return;
|
951
|
-
|
958
|
+
|
952
959
|
// Remove current element from stack and set variable
|
953
960
|
// NOTE: If the XML validates, then we do not have to worry about
|
954
961
|
// the opening and closing of elements. Nesting is checked on the opening
|
955
962
|
// tag so we be safe there as well.
|
956
|
-
|
963
|
+
|
957
964
|
$curr_elem = array_shift($this->xh[$the_parser]['stack']);
|
958
|
-
|
965
|
+
|
959
966
|
switch($name)
|
960
967
|
{
|
961
968
|
case 'STRUCT':
|
@@ -975,7 +982,7 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
975
982
|
case 'DATETIME.ISO8601':
|
976
983
|
case 'BASE64':
|
977
984
|
$this->xh[$the_parser]['vt'] = strtolower($name);
|
978
|
-
|
985
|
+
|
979
986
|
if ($name == 'STRING')
|
980
987
|
{
|
981
988
|
$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
|
@@ -1037,10 +1044,10 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
1037
1044
|
$this->xh[$the_parser]['value'] = $this->xh[$the_parser]['ac'];
|
1038
1045
|
$this->xh[$the_parser]['vt'] = $this->xmlrpcString;
|
1039
1046
|
}
|
1040
|
-
|
1047
|
+
|
1041
1048
|
// build the XML-RPC value out of the data received, and substitute it
|
1042
1049
|
$temp = new XML_RPC_Values($this->xh[$the_parser]['value'], $this->xh[$the_parser]['vt']);
|
1043
|
-
|
1050
|
+
|
1044
1051
|
if (count($this->xh[$the_parser]['valuestack']) && $this->xh[$the_parser]['valuestack'][0]['type'] == 'ARRAY')
|
1045
1052
|
{
|
1046
1053
|
// Array
|
@@ -1054,7 +1061,7 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
1054
1061
|
break;
|
1055
1062
|
case 'MEMBER':
|
1056
1063
|
$this->xh[$the_parser]['ac']='';
|
1057
|
-
|
1064
|
+
|
1058
1065
|
// If value add to array in the stack for the last element built
|
1059
1066
|
if ($this->xh[$the_parser]['value'])
|
1060
1067
|
{
|
@@ -1092,7 +1099,7 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
1092
1099
|
function character_data($the_parser, $data)
|
1093
1100
|
{
|
1094
1101
|
if ($this->xh[$the_parser]['isf'] > 1) return; // XML Fault found already
|
1095
|
-
|
1102
|
+
|
1096
1103
|
// If a value has not been found
|
1097
1104
|
if ($this->xh[$the_parser]['lv'] != 3)
|
1098
1105
|
{
|
@@ -1100,22 +1107,27 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
1100
1107
|
{
|
1101
1108
|
$this->xh[$the_parser]['lv'] = 2; // Found a value
|
1102
1109
|
}
|
1103
|
-
|
1110
|
+
|
1104
1111
|
if( ! @isset($this->xh[$the_parser]['ac']))
|
1105
1112
|
{
|
1106
1113
|
$this->xh[$the_parser]['ac'] = '';
|
1107
1114
|
}
|
1108
|
-
|
1115
|
+
|
1109
1116
|
$this->xh[$the_parser]['ac'] .= $data;
|
1110
1117
|
}
|
1111
1118
|
}
|
1112
|
-
|
1113
|
-
|
1119
|
+
|
1120
|
+
|
1114
1121
|
function addParam($par) { $this->params[]=$par; }
|
1115
|
-
|
1122
|
+
|
1116
1123
|
function output_parameters($array=FALSE)
|
1117
1124
|
{
|
1118
|
-
$CI =& get_instance();
|
1125
|
+
$CI =& get_instance();
|
1126
|
+
|
1127
|
+
if ($this->xss_clean && ! isset($CI->security))
|
1128
|
+
{
|
1129
|
+
$CI->load->library('security');
|
1130
|
+
}
|
1119
1131
|
|
1120
1132
|
if ($array !== FALSE && is_array($array))
|
1121
1133
|
{
|
@@ -1127,35 +1139,37 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
1127
1139
|
}
|
1128
1140
|
else
|
1129
1141
|
{
|
1130
|
-
|
1142
|
+
// 'bits' is for the MetaWeblog API image bits
|
1143
|
+
// @todo - this needs to be made more general purpose
|
1144
|
+
$array[$key] = ($key == 'bits' OR $this->xss_clean == FALSE) ? $array[$key] : $CI->security->xss_clean($array[$key]);
|
1131
1145
|
}
|
1132
1146
|
}
|
1133
|
-
|
1147
|
+
|
1134
1148
|
$parameters = $array;
|
1135
1149
|
}
|
1136
1150
|
else
|
1137
1151
|
{
|
1138
1152
|
$parameters = array();
|
1139
|
-
|
1153
|
+
|
1140
1154
|
for ($i = 0; $i < count($this->params); $i++)
|
1141
1155
|
{
|
1142
1156
|
$a_param = $this->decode_message($this->params[$i]);
|
1143
|
-
|
1157
|
+
|
1144
1158
|
if (is_array($a_param))
|
1145
1159
|
{
|
1146
1160
|
$parameters[] = $this->output_parameters($a_param);
|
1147
1161
|
}
|
1148
1162
|
else
|
1149
1163
|
{
|
1150
|
-
$parameters[] = $CI->
|
1164
|
+
$parameters[] = ($this->xss_clean) ? $CI->security->xss_clean($a_param) : $a_param;
|
1151
1165
|
}
|
1152
|
-
}
|
1166
|
+
}
|
1153
1167
|
}
|
1154
|
-
|
1168
|
+
|
1155
1169
|
return $parameters;
|
1156
1170
|
}
|
1157
|
-
|
1158
|
-
|
1171
|
+
|
1172
|
+
|
1159
1173
|
function decode_message($param)
|
1160
1174
|
{
|
1161
1175
|
$kind = $param->kindOf();
|
@@ -1168,31 +1182,31 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
1168
1182
|
{
|
1169
1183
|
reset($param->me);
|
1170
1184
|
list($a,$b) = each($param->me);
|
1171
|
-
|
1185
|
+
|
1172
1186
|
$arr = array();
|
1173
1187
|
|
1174
1188
|
for($i = 0; $i < count($b); $i++)
|
1175
1189
|
{
|
1176
1190
|
$arr[] = $this->decode_message($param->me['array'][$i]);
|
1177
1191
|
}
|
1178
|
-
|
1192
|
+
|
1179
1193
|
return $arr;
|
1180
1194
|
}
|
1181
1195
|
elseif($kind == 'struct')
|
1182
1196
|
{
|
1183
1197
|
reset($param->me['struct']);
|
1184
|
-
|
1198
|
+
|
1185
1199
|
$arr = array();
|
1186
1200
|
|
1187
1201
|
while(list($key,$value) = each($param->me['struct']))
|
1188
1202
|
{
|
1189
1203
|
$arr[$key] = $this->decode_message($value);
|
1190
1204
|
}
|
1191
|
-
|
1205
|
+
|
1192
1206
|
return $arr;
|
1193
1207
|
}
|
1194
1208
|
}
|
1195
|
-
|
1209
|
+
|
1196
1210
|
} // End XML_RPC_Messages class
|
1197
1211
|
|
1198
1212
|
|
@@ -1206,17 +1220,17 @@ class XML_RPC_Message extends CI_Xmlrpc
|
|
1206
1220
|
*/
|
1207
1221
|
class XML_RPC_Values extends CI_Xmlrpc
|
1208
1222
|
{
|
1209
|
-
var $me
|
1223
|
+
var $me = array();
|
1210
1224
|
var $mytype = 0;
|
1211
1225
|
|
1212
|
-
function
|
1213
|
-
{
|
1214
|
-
parent::
|
1215
|
-
|
1226
|
+
public function __construct($val=-1, $type='')
|
1227
|
+
{
|
1228
|
+
parent::__construct();
|
1229
|
+
|
1216
1230
|
if ($val != -1 OR $type != '')
|
1217
1231
|
{
|
1218
1232
|
$type = $type == '' ? 'string' : $type;
|
1219
|
-
|
1233
|
+
|
1220
1234
|
if ($this->xmlrpcTypes[$type] == 1)
|
1221
1235
|
{
|
1222
1236
|
$this->addScalar($val,$type);
|
@@ -1235,13 +1249,13 @@ class XML_RPC_Values extends CI_Xmlrpc
|
|
1235
1249
|
function addScalar($val, $type='string')
|
1236
1250
|
{
|
1237
1251
|
$typeof = $this->xmlrpcTypes[$type];
|
1238
|
-
|
1252
|
+
|
1239
1253
|
if ($this->mytype==1)
|
1240
1254
|
{
|
1241
1255
|
echo '<strong>XML_RPC_Values</strong>: scalar can have only one value<br />';
|
1242
1256
|
return 0;
|
1243
1257
|
}
|
1244
|
-
|
1258
|
+
|
1245
1259
|
if ($typeof != 1)
|
1246
1260
|
{
|
1247
1261
|
echo '<strong>XML_RPC_Values</strong>: not a scalar type (${typeof})<br />';
|
@@ -1322,7 +1336,7 @@ class XML_RPC_Values extends CI_Xmlrpc
|
|
1322
1336
|
function serializedata($typ, $val)
|
1323
1337
|
{
|
1324
1338
|
$rs = '';
|
1325
|
-
|
1339
|
+
|
1326
1340
|
switch($this->xmlrpcTypes[$typ])
|
1327
1341
|
{
|
1328
1342
|
case 3:
|
@@ -1378,12 +1392,12 @@ class XML_RPC_Values extends CI_Xmlrpc
|
|
1378
1392
|
{
|
1379
1393
|
$ar = $o->me;
|
1380
1394
|
reset($ar);
|
1381
|
-
|
1395
|
+
|
1382
1396
|
list($typ, $val) = each($ar);
|
1383
1397
|
$rs = "<value>\n".$this->serializedata($typ, $val)."</value>\n";
|
1384
1398
|
return $rs;
|
1385
1399
|
}
|
1386
|
-
|
1400
|
+
|
1387
1401
|
function scalarval()
|
1388
1402
|
{
|
1389
1403
|
reset($this->me);
|
@@ -1395,11 +1409,11 @@ class XML_RPC_Values extends CI_Xmlrpc
|
|
1395
1409
|
//-------------------------------------
|
1396
1410
|
// Encode time in ISO-8601 form.
|
1397
1411
|
//-------------------------------------
|
1398
|
-
|
1412
|
+
|
1399
1413
|
// Useful for sending time in XML-RPC
|
1400
1414
|
|
1401
1415
|
function iso8601_encode($time, $utc=0)
|
1402
|
-
{
|
1416
|
+
{
|
1403
1417
|
if ($utc == 1)
|
1404
1418
|
{
|
1405
1419
|
$t = strftime("%Y%m%dT%H:%M:%S", $time);
|
@@ -1413,7 +1427,7 @@ class XML_RPC_Values extends CI_Xmlrpc
|
|
1413
1427
|
}
|
1414
1428
|
return $t;
|
1415
1429
|
}
|
1416
|
-
|
1430
|
+
|
1417
1431
|
}
|
1418
1432
|
// END XML_RPC_Values Class
|
1419
1433
|
|