Commit graph

4789 commits

Author SHA1 Message Date
ADmad
c9e047ce37 Adding 'orderYear' option for FormHelper::year to allow control over ordering of select options 2010-01-28 01:48:53 +05:30
Juan Basso
57997e770c Refactory of DboSource::name() to improve performance. Added more tests to it.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-27 12:24:06 -05:00
Mark Story
4f67f84ff8 Merge branch '1.2' into 1.3-merger
Conflicts:
	app/config/acl.ini.php
	app/config/bootstrap.php
	app/config/core.php
	app/config/database.php.default
	app/config/inflections.php
	app/config/routes.php
	app/config/schema/db_acl.php
	app/config/schema/i18n.php
	app/config/schema/sessions.php
	app/config/sql/db_acl.sql
	app/config/sql/i18n.sql
	app/index.php
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	app/webroot/index.php
	app/webroot/js/vendors.php
	app/webroot/test.php
	cake/LICENSE.txt
	cake/basics.php
	cake/bootstrap.php
	cake/config/config.php
	cake/config/paths.php
	cake/config/unicode/casefolding/0080_00ff.php
	cake/config/unicode/casefolding/0100_017f.php
	cake/config/unicode/casefolding/0180_024F.php
	cake/config/unicode/casefolding/0250_02af.php
	cake/config/unicode/casefolding/0370_03ff.php
	cake/config/unicode/casefolding/0400_04ff.php
	cake/config/unicode/casefolding/0500_052f.php
	cake/config/unicode/casefolding/0530_058f.php
	cake/config/unicode/casefolding/1e00_1eff.php
	cake/config/unicode/casefolding/1f00_1fff.php
	cake/config/unicode/casefolding/2100_214f.php
	cake/config/unicode/casefolding/2150_218f.php
	cake/config/unicode/casefolding/2460_24ff.php
	cake/config/unicode/casefolding/2c00_2c5f.php
	cake/config/unicode/casefolding/2c60_2c7f.php
	cake/config/unicode/casefolding/2c80_2cff.php
	cake/config/unicode/casefolding/ff00_ffef.php
	cake/console/cake
	cake/console/cake.bat
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/api.php
	cake/console/libs/bake.php
	cake/console/libs/console.php
	cake/console/libs/i18n.php
	cake/console/libs/schema.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/tasks/test.php
	cake/console/libs/tasks/view.php
	cake/console/libs/templates/skel/config/bootstrap.php
	cake/console/libs/templates/skel/config/inflections.php
	cake/console/libs/templates/skel/config/sql/sessions.sql
	cake/console/libs/templates/skel/index.php
	cake/console/libs/templates/skel/views/elements/email/html/default.ctp
	cake/console/libs/templates/skel/views/elements/email/text/default.ctp
	cake/console/libs/templates/skel/views/layouts/ajax.ctp
	cake/console/libs/templates/skel/views/layouts/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
	cake/console/libs/templates/skel/webroot/js/vendors.php
	cake/console/libs/templates/skel/webroot/test.php
	cake/console/libs/templates/views/form.ctp
	cake/console/libs/templates/views/index.ctp
	cake/console/libs/testsuite.php
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/app_controller.php
	cake/console/templates/skel/app_helper.php
	cake/console/templates/skel/app_model.php
	cake/console/templates/skel/config/acl.ini.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/config/routes.php
	cake/console/templates/skel/config/schema/db_acl.php
	cake/console/templates/skel/config/schema/db_acl.sql
	cake/console/templates/skel/config/schema/i18n.php
	cake/console/templates/skel/config/schema/i18n.sql
	cake/console/templates/skel/config/schema/sessions.php
	cake/console/templates/skel/config/schema/sessions.sql
	cake/console/templates/skel/controllers/pages_controller.php
	cake/console/templates/skel/views/layouts/flash.ctp
	cake/console/templates/skel/webroot/css.php
	cake/console/templates/skel/webroot/css/cake.generic.css
	cake/console/templates/skel/webroot/index.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cache/apc.php
	cake/libs/cache/file.php
	cake/libs/cache/memcache.php
	cake/libs/cache/xcache.php
	cake/libs/cake_log.php
	cake/libs/cake_session.php
	cake/libs/cake_socket.php
	cake/libs/class_registry.php
	cake/libs/configure.php
	cake/libs/controller/app_controller.php
	cake/libs/controller/component.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/cookie.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/controller/controller.php
	cake/libs/controller/pages_controller.php
	cake/libs/controller/scaffold.php
	cake/libs/debugger.php
	cake/libs/error.php
	cake/libs/file.php
	cake/libs/flay.php
	cake/libs/folder.php
	cake/libs/http_socket.php
	cake/libs/i18n.php
	cake/libs/inflector.php
	cake/libs/l10n.php
	cake/libs/magic_db.php
	cake/libs/model/app_model.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/translate.php
	cake/libs/model/behaviors/tree.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/datasource.php
	cake/libs/model/datasources/dbo/dbo_adodb.php
	cake/libs/model/datasources/dbo/dbo_db2.php
	cake/libs/model/datasources/dbo/dbo_firebird.php
	cake/libs/model/datasources/dbo/dbo_mssql.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/datasources/dbo/dbo_odbc.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/datasources/dbo/dbo_postgres.php
	cake/libs/model/datasources/dbo/dbo_sqlite.php
	cake/libs/model/datasources/dbo/dbo_sybase.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/db_acl.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/multibyte.php
	cake/libs/object.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/sanitize.php
	cake/libs/security.php
	cake/libs/set.php
	cake/libs/string.php
	cake/libs/validation.php
	cake/libs/view/elements/dump.ctp
	cake/libs/view/elements/email/html/default.ctp
	cake/libs/view/elements/email/text/default.ctp
	cake/libs/view/errors/error404.ctp
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helper.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/app_helper.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/number.php
	cake/libs/view/helpers/paginator.php
	cake/libs/view/helpers/rss.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/text.php
	cake/libs/view/helpers/time.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/layouts/ajax.ctp
	cake/libs/view/layouts/default.ctp
	cake/libs/view/layouts/email/html/default.ctp
	cake/libs/view/layouts/email/text/default.ctp
	cake/libs/view/layouts/flash.ctp
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/theme.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cache/file.test.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/cache/xcache.test.php
	cake/tests/cases/libs/cake_log.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_socket.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/class_registry.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/controller_merge_vars.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/file.test.php
	cake/tests/cases/libs/flay.test.php
	cake/tests/cases/libs/folder.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/l10n.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
	cake/tests/cases/libs/model/behaviors/containable.test.php
	cake/tests/cases/libs/model/behaviors/translate.test.php
	cake/tests/cases/libs/model/behaviors/tree.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/db_acl.test.php
	cake/tests/cases/libs/model/model.test.php
	cake/tests/cases/libs/model/model_behavior.test.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/model/model_integration.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/model/model_validation.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/multibyte.test.php
	cake/tests/cases/libs/object.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/sanitize.test.php
	cake/tests/cases/libs/security.test.php
	cake/tests/cases/libs/set.test.php
	cake/tests/cases/libs/string.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helper.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/number.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/cases/libs/view/helpers/rss.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
	cake/tests/cases/libs/view/helpers/time.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/account_fixture.php
	cake/tests/fixtures/aco_action_fixture.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/aco_two_fixture.php
	cake/tests/fixtures/advertisement_fixture.php
	cake/tests/fixtures/another_article_fixture.php
	cake/tests/fixtures/apple_fixture.php
	cake/tests/fixtures/aro_fixture.php
	cake/tests/fixtures/aro_two_fixture.php
	cake/tests/fixtures/aros_aco_fixture.php
	cake/tests/fixtures/aros_aco_two_fixture.php
	cake/tests/fixtures/article_featured_fixture.php
	cake/tests/fixtures/article_featureds_tags_fixture.php
	cake/tests/fixtures/article_fixture.php
	cake/tests/fixtures/articles_tag_fixture.php
	cake/tests/fixtures/attachment_fixture.php
	cake/tests/fixtures/auth_user_custom_field_fixture.php
	cake/tests/fixtures/auth_user_fixture.php
	cake/tests/fixtures/author_fixture.php
	cake/tests/fixtures/basket_fixture.php
	cake/tests/fixtures/bid_fixture.php
	cake/tests/fixtures/binary_test_fixture.php
	cake/tests/fixtures/book_fixture.php
	cake/tests/fixtures/cache_test_model_fixture.php
	cake/tests/fixtures/callback_fixture.php
	cake/tests/fixtures/category_fixture.php
	cake/tests/fixtures/category_thread_fixture.php
	cake/tests/fixtures/cd_fixture.php
	cake/tests/fixtures/comment_fixture.php
	cake/tests/fixtures/content_account_fixture.php
	cake/tests/fixtures/content_fixture.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
	cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/data_test_fixture.php
	cake/tests/fixtures/datatype_fixture.php
	cake/tests/fixtures/dependency_fixture.php
	cake/tests/fixtures/device_fixture.php
	cake/tests/fixtures/device_type_category_fixture.php
	cake/tests/fixtures/device_type_fixture.php
	cake/tests/fixtures/document_directory_fixture.php
	cake/tests/fixtures/document_fixture.php
	cake/tests/fixtures/exterior_type_category_fixture.php
	cake/tests/fixtures/feature_set_fixture.php
	cake/tests/fixtures/featured_fixture.php
	cake/tests/fixtures/film_file_fixture.php
	cake/tests/fixtures/flag_tree_fixture.php
	cake/tests/fixtures/fruit_fixture.php
	cake/tests/fixtures/fruits_uuid_tag_fixture.php
	cake/tests/fixtures/home_fixture.php
	cake/tests/fixtures/image_fixture.php
	cake/tests/fixtures/item_fixture.php
	cake/tests/fixtures/items_portfolio_fixture.php
	cake/tests/fixtures/join_a_b_fixture.php
	cake/tests/fixtures/join_a_c_fixture.php
	cake/tests/fixtures/join_a_fixture.php
	cake/tests/fixtures/join_b_fixture.php
	cake/tests/fixtures/join_c_fixture.php
	cake/tests/fixtures/join_thing_fixture.php
	cake/tests/fixtures/message_fixture.php
	cake/tests/fixtures/my_categories_my_products_fixture.php
	cake/tests/fixtures/my_categories_my_users_fixture.php
	cake/tests/fixtures/my_category_fixture.php
	cake/tests/fixtures/my_product_fixture.php
	cake/tests/fixtures/my_user_fixture.php
	cake/tests/fixtures/node_fixture.php
	cake/tests/fixtures/number_tree_fixture.php
	cake/tests/fixtures/number_tree_two_fixture.php
	cake/tests/fixtures/numeric_article_fixture.php
	cake/tests/fixtures/overall_favorite_fixture.php
	cake/tests/fixtures/person_fixture.php
	cake/tests/fixtures/portfolio_fixture.php
	cake/tests/fixtures/post_fixture.php
	cake/tests/fixtures/posts_tag_fixture.php
	cake/tests/fixtures/primary_model_fixture.php
	cake/tests/fixtures/product_fixture.php
	cake/tests/fixtures/project_fixture.php
	cake/tests/fixtures/sample_fixture.php
	cake/tests/fixtures/secondary_model_fixture.php
	cake/tests/fixtures/session_fixture.php
	cake/tests/fixtures/something_else_fixture.php
	cake/tests/fixtures/something_fixture.php
	cake/tests/fixtures/stories_tag_fixture.php
	cake/tests/fixtures/story_fixture.php
	cake/tests/fixtures/syfile_fixture.php
	cake/tests/fixtures/tag_fixture.php
	cake/tests/fixtures/test_plugin_article_fixture.php
	cake/tests/fixtures/test_plugin_comment_fixture.php
	cake/tests/fixtures/the_paper_monkies_fixture.php
	cake/tests/fixtures/thread_fixture.php
	cake/tests/fixtures/translate_article_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/fixtures/translate_table_fixture.php
	cake/tests/fixtures/translated_article_fixture.php
	cake/tests/fixtures/translated_item_fixture.php
	cake/tests/fixtures/unconventional_tree_fixture.php
	cake/tests/fixtures/underscore_field_fixture.php
	cake/tests/fixtures/user_fixture.php
	cake/tests/fixtures/uuid_fixture.php
	cake/tests/fixtures/uuid_tag_fixture.php
	cake/tests/fixtures/uuid_tree_fixture.php
	cake/tests/fixtures/uuiditem_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
	cake/tests/fixtures/uuidportfolio_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_reporter.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_fixture.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/cli_reporter.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/templates/footer.php
	cake/tests/lib/templates/header.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/lib/xdebug.php
	cake/tests/test_app/config/acl.ini.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/controllers/tests_apps_posts_controller.php
	cake/tests/test_app/models/behaviors/persister_one_behavior.php
	cake/tests/test_app/models/behaviors/persister_two_behavior.php
	cake/tests/test_app/models/comment.php
	cake/tests/test_app/models/persister_one.php
	cake/tests/test_app/models/persister_two.php
	cake/tests/test_app/models/post.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/html/default.ctp
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/elements/email/text/wide.ctp
	cake/tests/test_app/views/layouts/ajax.ctp
	cake/tests/test_app/views/layouts/ajax2.ctp
	cake/tests/test_app/views/layouts/cache_layout.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/layouts/email/html/default.ctp
	cake/tests/test_app/views/layouts/email/html/thin.ctp
	cake/tests/test_app/views/layouts/email/text/default.ctp
	cake/tests/test_app/views/layouts/flash.ctp
	cake/tests/test_app/views/layouts/multi_cache.ctp
	cake/tests/test_app/views/posts/sequencial_nocache.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	index.php
2010-01-26 17:54:34 -05:00
Mark Story
66a8910810 Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
Mark Story
cdd87849cc Fixing @link tags to ease merging. 2010-01-26 17:03:03 -05:00
Mark Story
527eec1a54 Fixing doc tags to make merge easier. 2010-01-26 16:51:53 -05:00
Mark Story
3a1b0924c4 Additional doc tag fixes for Router. 2010-01-26 14:10:58 -05:00
Mark Story
fc304056a3 Removing Session deletion of nonce token on blackhole. Fixes possible CSRF risk from multiple submissions of the same invalid data. Refs #214 2010-01-26 13:59:26 -05:00
Mark Story
c195d654b3 Fixing TranslateBehavior test to run in php4. 2010-01-26 11:00:37 -05:00
Mark Story
9cbb9d193a Fixing php4 compatibility and errors from array to string conversion. 2010-01-26 10:55:11 -05:00
Robust Solution
16eaa990df optimization in AuthComponent class startup method
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-26 10:13:09 -05:00
Mark Story
b1a0eb1097 Fixing double DS when requiring cache engines. Fixes #254 2010-01-26 10:10:22 -05:00
Mark Story
c2e7e5642e Updating doc blocks for View and Theme View. 2010-01-25 18:14:16 -05:00
Mark Story
a77a064164 Updating doc blocks for the helpers. Unifying formatting and adding missing @access tags and fixing various formatting differences. 2010-01-25 17:59:05 -05:00
Mark Story
134ce68dce Updating and correct doc blocks for lib classes.
Removing unused private property in Router.
2010-01-25 15:37:55 -05:00
Mark Story
38eac37bb1 Removing optional group flag for routed parameters. Fixes issues with trailing empty route parameters. Tests added for correct parsing of these routes. Fixes #252 2010-01-25 12:49:12 -05:00
Mark Story
f6d12dbde6 Adding support for CURRENT_TIMESTAMP to all dbo's. 2010-01-25 12:25:14 -05:00
Mark Story
59319b098b Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
Conflicts:
	cake/libs/folder.php
2010-01-25 11:20:05 -05:00
Mark Story
98749a5a2b Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
Conflicts:
	cake/libs/folder.php
2010-01-25 11:18:44 -05:00
Mark Story
7459da2aff Updating doc blocks for HttpSocket and File. 2010-01-25 11:18:44 -05:00
Mark Story
b33fdba6d9 Updating doc blocks on Folder class and implementing a few small refactors to make code simpler. 2010-01-25 11:18:33 -05:00
José Lorenzo Rodríguez
9c24c72db3 Fixing regression introduced in commit c2d19c2011, closes #258 2010-01-25 09:06:06 -04:30
José Lorenzo Rodríguez
03200440ed Fixing TranslateBehavior and $tablePrefix. Closes #168 2010-01-24 18:27:08 -04:30
Phally
3c265283e7 Added support for Message-ID headers. 2010-01-24 23:29:53 +01:00
José Lorenzo Rodríguez
c2d19c2011 Various Optimizations, thanks jrbasso. Closes #232 2010-01-23 22:33:53 -04:30
Mark Story
23a62b488b Updating and expanding documentation blocks in Dispatcher and CakeLog. 2010-01-22 18:11:49 -05:00
Mark Story
1877281cd8 Expanding doc blocks for Cache. 2010-01-22 17:54:28 -05:00
Juan Basso
ad496cea18 Optimized Security::cipher(). Fixes #176
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-22 15:34:02 -05:00
Mark Story
5d35fd8d38 Fixing issues in DboSource::defaultConditions() and DboSource::conditions() where doubly deleting a record from the beforeDelete and delete() could create incorrect conditions that would delete all records in a table. Fixes #250 2010-01-22 10:30:22 -05:00
Mark Story
1cfd273052 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-21 15:44:53 -05:00
Mark Story
f4e837d985 Removing all methods currently issuing warnings about being deprecated. 2010-01-21 15:14:23 -05:00
José Lorenzo Rodríguez
e77ed92646 Merge branch '1.3-cache' into 1.3
* 1.3-cache:
  Removing repeated checks, as they've been refactored into Cache::increment() and Cache::decrement().
  Removing php5 visibility keywords.
  Fixing various errors related to Cache::increment() and Cache::decrement().
  Removing test ignore
  Adding atomic increment and decrement methods to cache engines, closes #234
2010-01-21 14:57:07 -04:30
Mark Story
513db9a72a Removing repeated checks, as they've been refactored into Cache::increment() and Cache::decrement().
Adding skipIf()'s to ApcEngineTest in case apc_inc, and apc_dec are not available.
2010-01-21 14:14:26 -05:00
Mark Story
47c7387548 Fixing various errors related to Cache::increment() and Cache::decrement().
Removing php5 only keywords from test cases.
Updating memcache tests, to correctly skip multiple server test when multiple memcached servers cannot be found.
2010-01-21 13:57:42 -05:00
Mark Story
2d3cde1abb Updating doc block for ConnectionManager and including note about possible PHP4 issues. 2010-01-21 13:18:00 -05:00
Juan Basso
b21538c426 Getting a list of connections in the constructor of ConnectionManager
class. Fixes issues where using ConnectionManager::create() before the
standard connections are enumerated will result in the standard
connections never being enumerated.  Fixes #206

Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-21 12:59:00 -05:00
Mark Story
2915493049 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-21 12:00:04 -05:00
Mark Story
c5a5d1dfe6 Making Session.model the required setting and not Session.table. Session.table can still be used to set the table name used when configuring sessions, but the default value is cake_session as before. Fixes #223 2010-01-21 11:59:49 -05:00
José Lorenzo Rodríguez
dff7e17fa2 Adding atomic increment and decrement methods to cache engines, closes #234 2010-01-21 12:11:44 -04:30
ADmad
a8040506b0 Fixing spacing between button tag attributes. Fixes #241 2010-01-21 22:03:03 +05:30
Mark Story
913450daef Additional tests for virtualFields and fixing issues with index 0 being removed. Fixes #208 2010-01-21 10:35:20 -05:00
Phally
984dc50f37 Merge commit 'upstream/1.3' into 1.3-email_component 2010-01-21 00:05:03 +01:00
Mark Story
ae4a31f070 Making DEFAULT_LANGUAGE also set $language var which sets Config.language to a correct value. Fixes #228 2010-01-20 14:33:37 -05:00
Juan Basso
c4afeb3fe6 Minor optimization on datasource and Mysql[i]. 2010-01-20 01:44:59 -04:30
Juan Basso
e328043586 Minor optimization in helper. No need cast, always is array. 2010-01-20 01:41:43 -04:30
Juan Basso
8d5acf0706 Infector::_cache is a protected method and no need be singleton. 2010-01-20 01:39:36 -04:30
Juan Basso
d2d19eeda4 Fixing import in CakeSession. 2010-01-20 01:06:34 -04:30
José Lorenzo Rodríguez
96fd0bf100 Fixing error introduced in previous commit due to bad merge 2010-01-19 16:44:43 -04:30
ADmad
22073e3376 Renaming Configure var 'Security.cipher_seed' to 'Security.cipherSeed'. Also added a srand() call at end of Security::cipher function to reset seed. Closes #73 , #183 , #218 2010-01-20 01:23:20 +05:30
renan.saddam
39dd15d3f6 Removing the with key from otherFields array, also fixing the page title. Tests added. 2010-01-19 14:05:29 -02:00
Mark Story
e1b0c41254 Making Model::isVirtualField() and Model::getVirtualField() work with both Model.field as field. This fixes a number of issues in conditions, and fields arrays when model aliases are used. Fixes #208 and #220 2010-01-19 09:22:13 -05:00
Mark Story
9b3a2fd658 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-18 21:57:46 -05:00
Mark Story
080e34718d Minor refactor, and adding tests from previous commit. Fixes #208 2010-01-18 21:57:03 -05:00
AD7six
7943f3d168 allowing vritual fields to work whether specified with a model alias or
not. by concequence allows find('list', array('fields' => array('id',
'virtual'))) to work
2010-01-18 21:54:15 -05:00
José Lorenzo Rodríguez
cb4a1f07e5 Fixing issue with persistModels and plugin models, closes #192 and #198 2010-01-18 13:13:10 -04:30
Mark Story
06ba7ac828 Adding omitted default route, and test cases to test its functionality. Fixes #212 2010-01-18 10:05:23 -05:00
Juan Basso
473e07a674 Putting __() in strings that missing internationalization.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 01:06:25 -05:00
Juan Basso
0ac99eddb5 Replacing "echo sprintf" by "printf" where possible. Fixes #209.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-18 00:56:22 -05:00
predominant
ab666f8ea7 Revert "Adjusting EmailComponent Boundary creation to occur for all generated email. Fixes #14."
This reverts commit b50b5922fd.
2010-01-17 14:50:09 +11:00
Mark Story
92ff9ccae0 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-16 20:15:13 -05:00
predominant
b50b5922fd Adjusting EmailComponent Boundary creation to occur for all generated email. Fixes #14. 2010-01-17 11:38:45 +11:00
Mark Story
8cae1e850a Fixing spacing. 2010-01-16 18:50:04 -05:00
Mark Story
826dbc466f Fixing failing test caused by merge with 1.2 2010-01-16 18:26:06 -05:00
José Lorenzo Rodríguez
3bd4cc07a6 Fixes to make TimeHelper and test cases more compatible with PHP 4 2010-01-15 17:48:41 -04:30
ADmad
2441849fa0 Replacing constant CIPHER_SEED with Configure class variable 'Security.cipher_seed' and renaming Security class method 'checkSessionKey' to 'checkSecurityKeys' 2010-01-16 03:26:26 +05:30
Mark Story
09ad7418f5 Merge remote branch 'origin/1.2' into merger
Conflicts:
	cake/console/templates/skel/config/inflections.php
	cake/libs/model/cake_schema.php
	cake/libs/model/model.php
2010-01-15 11:51:58 -05:00
Mark Story
7088afbb88 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-15 00:11:33 -05:00
Mark Story
f1a0690415 Fixing issues in JsHelper with PHP4 compatibility. Seems passing arrays by reference doesn't work very well. 2010-01-15 00:02:24 -05:00
Mark Story
b97ac84a34 Fixing method_exists use in Validation for php4 compatibility. 2010-01-14 23:41:35 -05:00
Mark Story
741f507c23 Fixing reference errors in php4. 2010-01-14 23:38:39 -05:00
Mark Story
3a38e0869f Fixing php4 issues in ErrorHandler and ErrorHandler testcase. 2010-01-14 23:17:24 -05:00
Mark Story
547aa76c92 Fixing method_exists() use for php4, as method_exists cannot be used with class/method names in php4. 2010-01-14 23:07:48 -05:00
Mark Story
d4d9ed7bfe Fixing test cases and php4 compatibility in Debugger. 2010-01-14 23:06:48 -05:00
Mark Story
f2dc2078c2 Making PagesController include SessionHelper. 2010-01-14 22:56:34 -05:00
Mark Story
96c56d7446 Fixing failing tests in php4 caused by missing & operators. 2010-01-14 22:54:17 -05:00
Mark Story
2093f05ce7 Fixing php4 compatibility issues in CakeLog. 2010-01-14 22:33:14 -05:00
Mark Story
af4e9ba76e Fixing php4 reference issues in CakeSchema. 2010-01-14 22:18:26 -05:00
Mark Story
f2cc41bb3a Fixing php4 issues for AclShell test case. 2010-01-14 22:15:14 -05:00
Mark Story
8f2a4a1e0e Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-01-14 20:28:00 -05:00
Mark Story
5c47d8dd7a Trimming trailing whitespace from files. Refs #201 2010-01-14 20:15:54 -05:00
Joël Perras
259b59cae1 Adding optional $reset parameter to Inflector::rules(). Fixes #91.
Inflector::rules() now has an optional 3rd parameter, $reset, which can
be set to true if you desire to remove the default inflections defined
in Inflector.

Note that the reset will only affect those inflection types which you
have explicitly re-defined in the $rules parameter.
2010-01-14 18:18:55 -05:00
Joël Perras
eb7e10db50 Updating Inflector::slug() handling of $map argument. Fixes #18.
When passing a $map to Inflector::slug(), the $map values will now
overwrite any default mappings that Inflector::slug defines.

Modified pre-existing test-case for Inflector::slug() when using a $map.
2010-01-14 17:51:14 -05:00
Joël Perras
adb0c809a0 Refactoring Model::exists() to be independent of Model::$useTable. Fixes #199.
Model::exists() now makes no check whatsoever on the value of
Model::$useTable. This means that, as with a database-backed dbo,
Model::exists() will call Model::find('count') (which in turn calls
DataSource::read()) to determine if the record identified by Model::$id
already exists in the datasource.
2010-01-14 16:47:08 -05:00
Joël Perras
199a14f3be Updating Model::exists() to be more side-effect free.
Model::exists() no longer monkeys with the internal state of
Model::$__exists. The optional $reset parameter has also been removed,
as it is no longer needed.
2010-01-14 16:47:08 -05:00
Joël Perras
137704e397 Optimization to Model::save(). 2010-01-14 16:47:08 -05:00
José Lorenzo Rodríguez
c196c2cbdf More whitespace fixes 2010-01-14 15:57:58 -04:30
José Lorenzo Rodríguez
5395397c95 Updating doc blocks 2010-01-14 15:50:27 -04:30
José Lorenzo Rodríguez
543f40c91e Simplifying returns 2010-01-14 15:42:30 -04:30
José Lorenzo Rodríguez
09b466f8aa Fixing whitespace and removig calls to Helper::output() introduced by error 2010-01-14 15:38:48 -04:30
José Lorenzo Rodríguez
0b3758dc91 Bug fix in I18n
Changing calls from date to strftime in TimeHelper
Implementing TimeHelper::converSpecifiers() to conver format strings to be windows safe and I18n friendly
Implementing TimeHelper::i18nFormat() to format dates with preferred locale date format
Changing TimeHelper::format() to handle inversion of first two parameters, while being backwards compatible. If called with the first parameter as a time string it will call TimeHelper::i18nFormat()
2010-01-14 14:11:57 -04:30
José Lorenzo Rodríguez
a980f72364 Refactoring I18n::translate() to return time format string or arrays when category is LC_TIME
Tests added
2010-01-14 09:54:45 -04:30
José Lorenzo Rodríguez
589972d581 Merge branch '1.3' into github-i18n
* 1.3: (137 commits)
  Updating tests to reflect SessionHelper's loss of magic inclusion.
  Removing SessionHelper's magical inclusion into the helpers array.  Use of SessionHelper must now be explicitly done. Tests updated.
  Fixing merge var test case for non magic session component.
  Fixing Pagescontroller test and removal of pageTitle from controller.
  Fixing component and controller test cases to work with less magical session component.
  Removing the magical addition of SessionComponent to components array.  This makes components more declarative, and removes magic that cannot be undone by the end developer.
  Fixing failing tests due to deleted assets.
  Removing use of subclass method 'fullTableName()' in Datasource superclass. Fixes #100.
  Updating CakeTestSuiteDispatcher parsing of .
  Adding missing </p> to Html test reporter template.
  Updating css file in skel dir.
  Fixing alignment issues in tables.
  Removing orphaned method.
  Adding 'id' attribute to hidden field generated for multiple select and multiple checkboxes. Fixes issue where invalid markup was generated in case to multiple checkboxes
  Adding php5 check to avoid errors when using __get() or __isset() methods in models
  Fixing include in test of CodeCoverageManager. Fixes #196
  Fixing var name when not have SimpleTest or XDebug installed.
  Moving skel/config/sql to skel/config/schema
  Fixing output of 'Actions' in bake templates.  Now outputs a __() call.
  Updating scaffolds to match new bake design.
  ...
2010-01-14 08:34:03 -04:30
Mark Story
a56bc5585c Removing SessionHelper's magical inclusion into the helpers array. Use of SessionHelper must now be explicitly done. Tests updated. 2010-01-13 23:55:09 -05:00
Mark Story
ebf99de965 Removing the magical addition of SessionComponent to components array. This makes components more declarative, and removes magic that cannot be undone by the end developer. 2010-01-13 23:49:10 -05:00
Joël Perras
15b8a3ec71 Updating copyright date on all files. 2010-01-13 23:47:14 -05:00
Joël Perras
4d1f6b82e8 Removing use of subclass method 'fullTableName()' in Datasource superclass. Fixes #100. 2010-01-13 23:19:10 -05:00
Mark Story
e60243c464 Merge branch '1.3' into scaffold-design 2010-01-13 22:16:47 -05:00
ADmad
848dc518ab Adding 'id' attribute to hidden field generated for multiple select and multiple checkboxes. Fixes issue where invalid markup was generated in case to multiple checkboxes 2010-01-14 04:13:39 +05:30
José Lorenzo Rodríguez
8496055059 Adding php5 check to avoid errors when using __get() or __isset() methods in models 2010-01-13 12:57:41 -04:30
José Lorenzo Rodríguez
4e3aedecde Fixing persitModel and plugin Behaviors. Closes #192 2010-01-13 09:53:00 -04:30
Mark Story
2de9639091 Updating scaffolds to match new bake design. 2010-01-13 00:12:45 -05:00
Mark Story
84840c7b04 Fixing issues with magic input() type detection and adding/updating tests. 2010-01-12 23:27:17 -05:00
Mark Story
d8e7aa929c Merge branch '1.3-misc' into 1.3 2010-01-12 17:18:14 -05:00
Mark Story
a0c3c4b803 Updating AuthComponent::startup() so that being redirected to loginAction with no Auth.redirect value in the session and a non empty loginRedirect defined, the Auth.redirect value is not overwritten. This prevents redirection to already accessible pages. Test cases updated.
Fixes #173
2010-01-11 23:54:06 -05:00
José Lorenzo Rodríguez
50f58da60d Continuing work on locale definition file parser 2010-01-11 15:12:24 -04:30
José Lorenzo Rodríguez
8bc4f0336e Beginings of a parser of locale definition file 2010-01-11 15:09:42 -04:30
José Lorenzo Rodríguez
aa9258cbd1 Adding test for DboSource::group() and virtual fields
Closes #184
2010-01-11 12:22:59 -04:30
José Lorenzo Rodríguez
3fe4b46614 Fixing DboSource::group() to test for virtual fields when first parameter is not an array 2010-01-11 12:06:27 -04:30
José Lorenzo Rodríguez
cecfd72f28 Fixing parse error in php 4 2010-01-11 11:51:55 -04:30
Phally
bbb105fc8c Added virtual field support for GROUP BY. 2010-01-11 11:46:59 -04:30
Mark Story
dda2414b5b Fixing compatibility in ConnectionManager with php4. Fixes #187 2010-01-11 09:48:53 -05:00
Mark Story
4ada5b7eea Fixing notice errors caused by incorrect datatyping in php4. 2010-01-11 09:44:51 -05:00
Mark Story
896414e632 Fixing parse error in PHP4 caused by optional arguments with default
values being passed by reference. Fixes #180
2010-01-11 09:40:56 -05:00
dogmatic
4ffacfad2d last commit broke schema, this works better with the help of markstory
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-08 18:21:58 -05:00
Mark Story
b47b858355 Updating and reformatting docs for Sanitize. 2010-01-07 21:47:23 -05:00
tPl0ch
61079f6317 Fixes #42. Updated Sanitize::clean() with 'remove_html' option. Updated Sanitize::html() to accept new options. Updated test cases.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-07 19:04:49 -05:00
Joël Perras
730153b151 Adding isset() checks for CakeSchema::compare() when diff'ing db indexes.
Allows for slightly better interoperability between schemas generated with CakePHP 1.2 and with 1.3
2010-01-07 17:49:57 -05:00
tPl0ch
5ae0164574 Added Validation::uuid(). Updated test cases.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-06 21:29:55 -05:00
Mark Story
dd2cbc2cb5 Updating file header. 2010-01-06 21:27:56 -05:00
Mark Story
8110aed1b1 Updating doc blocks for App and Configure. 2010-01-06 21:27:14 -05:00
dogmatic
467ae1f4fd Removing check that prevents bootstrapping paths that do not contain the
type of object contained.  Example plugins would not be found in the
following path /var/www/common/  as it does not contain 'plugins'

Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-06 21:17:38 -05:00
Mark Story
683be26bcb Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-06 21:14:25 -05:00
predominant
e2a2770d9f Fixing validation errors for wrong case checking on Validation::ip.
Adding IPv6 validation for Validation::url().
Added tests for ports in urls.
Fixed port length allowance on Validation.
2010-01-07 11:02:05 +11:00
Mark Story
be7ce6e923 Fixing issues where chained jQuery engine requests wouldn't eval() script elements, making ajax pagination much harder. 2010-01-06 11:59:15 -05:00
predominant
485570de24 Remote getInstance() from validation protected methods. 2010-01-06 09:34:07 +11:00
predominant
1302fba632 Fix validation of IPv6 on IPv4 checks.
Separate IPv4 and IPv6 validation to allow strict checking.
2010-01-06 00:53:48 +11:00
predominant
804fba1a22 Adding block comments for Postgres Datasource quotes. 2010-01-05 23:23:23 +11:00
predominant
2d85ffe05f Fixing inflector caching, adding new _cache() method to handle common caching. 2010-01-05 22:05:02 +11:00
ADmad
9d5015882f Updating deep email validation to check and use 'getmxrr' or 'checkdnsrr' if either function exists 2010-01-05 03:04:46 +05:30
Mark Story
5046382e7d Merge branch '1.3-misc' of github.com:cakephp/cakephp1x into 1.3-misc 2010-01-02 00:07:51 -05:00
Mark Story
7dcf66dd95 Removing dynamic calling of setTablePrefix(). tableprefix should be with the tablePrefix property, and any other custom construction behavior should be done in an overridden Model::__construct. 2010-01-02 00:07:31 -05:00
Mark Story
eab706e772 Correcting and improving doc block for Model::__construct. 2010-01-01 23:59:36 -05:00
Mark Story
026eeb645b Correcting and improving doc block for Model::__construct. 2010-01-01 23:58:07 -05:00
ADmad
5f987a4996 Controller data is now set to an array instead of Xml object if request content type is 'application/xml' 2009-12-31 17:36:58 +05:30
Mark Story
41e6fdf346 Merge remote branch 'fahad/1.3-l10n' into 1.3-misc 2009-12-29 23:39:08 -05:00
Mark Story
49e9550482 Merge branch '1.3' into 1.3-misc 2009-12-29 22:07:23 -05:00
Mark Story
32683d3d64 Fixing issues in PrototypeEngineHelper where parameters would end up wrapped in a function() {} when marked as a dataExpression. This prevented the sending of form data.
Tests added.
Fixes #142
2009-12-29 21:52:59 -05:00
Ali Farhadi
0e8f83e103 Adding direction var and __l10nCatalog key to L10n class, fixes #4 2009-12-30 00:23:35 +03:30
Mark Story
93ced3be46 Casting return of Validation::ip to always be a boolean when filter_var is used. It used to return the input string which could cause issue with identity checks. 2009-12-29 11:04:58 -05:00
Mark Story
a9e1d0d7ff Optimizing Sanitize::html() to use str_replace instead of preg_replace. 2009-12-28 22:56:21 -05:00
Mark Story
b68d2a32bf Merge branch '1.3' into 1.3-misc 2009-12-28 22:15:52 -05:00
Mark Story
3ad4dd63bf Removing unused variables from CacheHelper::cache()
Removing non-existant variable output from generated cache files.
2009-12-28 22:15:07 -05:00
Mark Story
2db479dc90 Making CacheHelper create $this->Html style helper references. 2009-12-28 21:58:56 -05:00
Mark Story
6749e1166b Making cacheAction array settings use action names instead of url paths. This removes the ability to set different durations for specific passed arguments. However, makes passed args, named params, and querystring params all behave the same in regard to cacheAction. Test cases updated. 2009-12-28 21:26:51 -05:00
Mark Story
b89280a916 Fixing test failures caused by changes in Cache::__loadEngine().
Adding tests for Cache::config().
2009-12-28 13:52:50 -05:00
Mark Story
45a3eb250f Starting refactoring of cachehelper to use Router::reverse to generate check/match strings. Removing dead code as well. 2009-12-28 13:38:36 -05:00
Mark Story
df8914b2e4 Router::reverse now removes models and paging keys that controllers can insert into params arrays. 2009-12-28 13:34:05 -05:00
Mark Story
5b78a662e8 Adding tests for querystring reversal. 2009-12-27 23:10:29 -05:00
Mark Story
886cd9e719 Adding Router::reverse and basic test case. 2009-12-27 23:09:26 -05:00
tPl0ch
1eff024e7e Removed unnessecary connect keys from all Dbo's _baseConfig. Updated connect methods where needed. Fixes #132
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-27 12:47:52 -05:00
Mark Story
8b93235847 Fixing auto merge issues. 2009-12-27 12:45:34 -05:00
Mark Story
7a620b62b0 Merge branch '1.3-misc' into mergers
Conflicts:
	cake/libs/model/datasources/dbo_source.php
	cake/libs/view/helpers/js.php
2009-12-27 12:45:12 -05:00
Mark Story
6b2154d961 Merge branch '1.2' into mergers
Conflicts:
	cake/libs/inflector.php
	cake/tests/cases/libs/model/model_validation.test.php
2009-12-27 12:34:27 -05:00
predominant
19924501d1 Updating Inflector to employ internal caching.
Refs #23
2009-12-25 18:53:38 +11:00
Joël Perras
173b4e7b5d Merge branch '1.3-misc' of github.com:cakephp/cakephp1x into 1.3-misc 2009-12-22 23:53:01 -05:00
Joël Perras
8eb9f9e8fd Implenting IPv6 validation using filter_var(), with a regex-based fallback if the aforementioned function does not exist (PHP < 5.2). Fixes #38. 2009-12-22 23:52:06 -05:00
Mark Story
20c02e39d6 Adding doc block for options on NumberHelper::currency() 2009-12-22 19:17:23 -05:00
Mark Story
0b558c6eb0 Adding code to make tests from previous commit pass. 2009-12-22 19:12:11 -05:00
Mark Story
1a387e6b8a Fixing url parameters set with options() or beforeRender not being merged on next() / prev().
Tests added. Fixes #129
This reverses the change made in efa36abdf0 which broke this behavior.
2009-12-22 19:05:06 -05:00
Mark Story
425dcf2df5 Applying patch from 'tPl0ch', connect key is set to 'mysql_connect' when not using persistent connections. Fixes #132 2009-12-22 13:23:55 -05:00
Mark Story
c00cebb0c3 Removing doc for param that no longer exists. 2009-12-21 09:54:35 -05:00
ceeram
6d8fa76bed edit of docblock
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-21 09:52:33 -05:00
Mark Story
5274dce9f1 Making set vars with Js->set go to the top of the buffered scripts array. Tests added.
Updating doc blocks for JsHelper and JsBaseEngineHelper.
Fixes #131
2009-12-21 09:41:36 -05:00
Mark Story
42fa6ff04a Fixing JsHelper::writeBuffer when inline is set to false. Scripts are now enclosed in a script tag. Fixes #130 2009-12-21 09:29:28 -05:00
Mark Story
850b95900b Adding fix for Cache causing App to do an directory scan when importing a core cache engine. Since these operations occurred before the core configurations had be set, a directory scan was done on every request. This change also makes in not possible to override the core cache engines with app versions. 2009-12-20 18:11:18 -05:00
Mark Story
2e96bfe833 Merge branch '1.3-misc' of git@github.com:cakephp/cakephp1x into 1.3-misc 2009-12-20 16:50:48 -05:00
Mark Story
34410de7c8 Adding property definition for Model::$virtualFields 2009-12-20 16:26:12 -05:00
ADmad
01c31596c8 Cleaning up commented code 2009-12-21 02:50:39 +05:30
ADmad
d561405daa Renaming RequestHandler::getReferrer to RequestHandler::getReferer for (mis)spelling consistency and deprecating the former 2009-12-20 23:06:28 +05:30
ADmad
f36e5eff5f Merge branch '1.3-misc' of github.com:cakephp/cakephp1x into 1.3-misc 2009-12-20 13:22:43 +05:30
Mark Story
c669f8c998 Fixing failing tests in AuthComponent because of required parameter. 2009-12-19 19:58:55 -05:00
Mark Story
4ac0a55aff Merge branch 'virtual-fields' into 1.3-misc
Conflicts:
	cake/tests/cases/libs/controller/controller.test.php
2009-12-19 19:40:12 -05:00
ADmad
cea102c357 Updating doc block to reflect that url can be string or array and removing 'escapeTitle' param. Use key 'escape' in options instead 2009-12-20 00:46:47 +05:30
Mark Story
071c6f0e8b Merge branch 'sql-dump' into 1.3-misc 2009-12-19 13:32:01 -05:00
Mark Story
42e13edd85 Adding file header to sql dump element. 2009-12-19 13:24:00 -05:00
Mark Story
13ffcbc0ba Updating doc blocks in Datasource. Adding missing reference operators. 2009-12-19 13:23:46 -05:00
Mark Story
7387cfdf6b Adding @access tags and expanding doc blocks. 2009-12-19 13:06:32 -05:00
Mark Story
7fd9b5ae3b Removing auto dump of sql log. 2009-12-19 12:40:32 -05:00
Mark Story
6efe61d9b2 Removing controller dump and debug = 3 support from View. Controller dumps often cause memory overflow errors, and are generally not useful. 2009-12-19 12:30:31 -05:00
Mark Story
a89fcba243 Updating DboSource::getLog() and showLog() to use a View element.
Updating tests to reflect changes in getLog()
2009-12-19 12:09:01 -05:00
Mark Story
cbb29dcc5d Extracting sql dump generation into a view element.
Changing the behavior of DboSource::getLog().
Adding sql dump element to layout.
2009-12-19 12:09:01 -05:00
Mark Story
3eaff3e021 Correcting FormHelper::minute() to fix issues with extracting values from array formatted data. Fixes #107 2009-12-19 11:55:35 -05:00
Mark Story
959befb6e1 Merge commit 'josezap/virtual-fields' into virtual-fields 2009-12-18 19:11:50 -05:00
Mark Story
6356c6ed87 Fixing issue where forms generated with requestAction would be missing the _Token fields that Security component creates. Test cases added to ensure that token key does not change when requestAction is used.
Fixes #68
2009-12-18 19:05:33 -05:00
José Lorenzo Rodríguez
8f29f59c1a Enclosing virtual fields in parentheses to avoid SQL errors
Added new tests to improve  code coverage on virtual fields
2009-12-17 14:42:46 -04:30
Mark Story
264cdb78c0 Removing unnecessary key. 2009-12-17 10:13:05 -05:00
Mark Story
b190e462b8 Fixing whitespacing. 2009-12-17 00:15:42 -05:00
Mark Story
e8f0ea951a Updating tests and doc blocks for JsHelper::writeBuffer() to return null if no scripts have been buffered. Fixes #108 2009-12-16 23:48:29 -05:00
kleingeist
2d9b13fe88 Prevent JsHelper::writeBuffer() to return empty lines (or empty onDomReady events)
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-16 23:36:40 -05:00
Mark Story
0bc1126114 Merge branch 'component-settings' into 1.3-misc 2009-12-16 23:08:16 -05:00
Mark Story
8960a01649 Merge branch '1.3-misc' of git@github.com:cakephp/cakephp1x into 1.3-misc 2009-12-16 23:08:00 -05:00
Mark Story
ff74a599c6 Adding ability to set configuration from initialize() for RequestHandler.
Tests added.
2009-12-16 23:06:16 -05:00
Mark Story
e45fcf4337 Adding ability set component configuration from component settings for SecurityComponent. 2009-12-16 23:06:16 -05:00
Mark Story
dffff314e1 Implementing setting of auth configuration through component settings arrays.
Adding test case from Ceeram.
2009-12-16 23:06:16 -05:00
Mark Story
bbc72c3703 Updating use of deprecated split() to use preg_split(). 2009-12-16 21:08:15 -05:00
Mark Story
c8297ff283 Minor optimization on Inflector::variable 2009-12-16 19:23:29 -05:00
real34
bdfb50e6bb Fixed a bug in Set::extract. Wrong key returned when two arrays are at the extraction level.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-16 18:33:23 -05:00
Phally
671cdbf422 Corrected docblock. 2009-12-16 21:52:14 +01:00
Phally
e5836ff4e9 Implemented rendered e-mail retrieval. 2009-12-16 21:47:12 +01:00
Mark Story
7ceb50b696 Removing controller key as a default when Routes are connected. Was causing issues when using regex qualifiers on controller keys.
Tests added.
2009-12-16 15:04:59 -05:00
Mark Story
09966a7f63 Adding support for .ttf, .otf, .eot to MediaView. These are common font assets used with @font-face techniques. 2009-12-16 12:48:34 -05:00
Mark Story
4ac29963a8 Refactoring Model::__validateWithModels. Should be slightly faster as loops are smaller. 2009-12-15 22:55:34 -05:00
Mark Story
a490e249fa Adding test for validation of with models canceling a save.
Adding initial implementation of Model::__validateWithModel().

Correcting error in previous commit.  Adding tests for saveAll and validating habtm with models.
2009-12-15 22:55:22 -05:00
ADmad
33038c75ac Removing redundant 'isset' check from DboMysql::connect 2009-12-15 20:41:44 +05:30
ceeram
64045e1e18 Apply new Helper syntax to remaining files
Signed-off-by: Mark Story <mark@mark-story.com>
2009-12-14 18:52:13 -05:00
Mark Story
ecc38f0aed Adding additional tests for CakeRoute::persistParams(). Ensures that url params can overwrite persisted values.
Tests added.
2009-12-14 18:43:29 -05:00
Joël Perras
86cba7dc50 Fixing wrong header message text for ErrorHandler::error500() header sent. Refs #70."" 2009-12-14 16:21:30 -05:00
Mark Story
4f985e465b Applying patch from 'kleingeist'. JsHelper::set() now generates a variable that is assigned to window.$var instead of creating a local variable by default.
Tests updated.
Fixes #96
2009-12-13 23:53:20 -05:00
predominant
aaddd0d394 Moving certain datasources to the Datasources Plugin (http://github.com/cakephp/datasources) 2009-12-13 23:53:20 -05:00
predominant
d550a5e82c Code formatting cleanup. Fixes #92. 2009-12-13 23:53:20 -05:00
renan.saddam
b273981915 Checking for french error on dbo_mssql. Fixes #77. 2009-12-13 23:53:19 -05:00
Joël Perras
7b1ccfff57 Changing error handler to send a HTTP/1.1 500 error when missingTable, missingDatabase or missingConnection is encountered. Increased test coverage of libs/error.php to 100%. Fixes #70. 2009-12-13 23:53:19 -05:00
Joël Perras
96c245c6a7 Moving list of http codes out of Controller::redirect() and into a new method, Controller::httpCodes() for better reusability. See doc blocks for usage details. 2009-12-13 18:04:55 -05:00
Mark Story
02330b2d9c Making DboSource::fields() accept an expression object. Fixes issues with sql parsing over quoting special SQL syntax.
Tests added
Fixes #66
2009-12-13 15:52:07 -05:00
Mark Story
904b9f5f1c Adding test and fix to ensure the debug = 0, log = false leaves error_reporting set to 0.
Fixes #89
2009-12-11 00:46:13 -05:00
Mark Story
f26d5efd0c Applying patch from 'kleingeist'. JsHelper::set() now generates a variable that is assigned to window.$var instead of creating a local variable by default.
Tests updated.
Fixes #96
2009-12-10 23:37:55 -05:00
José Lorenzo Rodríguez
c65e2f3f18 Quoting virtual fields in automatically
Updating test cases
2009-12-10 20:46:55 -04:30
José Lorenzo Rodríguez
8c4cad86c2 Fixing erroris due to bad rebase 2009-12-10 20:35:24 -04:30
José Lorenzo Rodríguez
4b9e03c9f7 Creating accesor methods for virtual fields and replacing direct access from DboSource with new methods 2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
7a7d0de988 Adding support for virtual fields in DboSourse::calculate 2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
d06ff5d10a Adding support for virtual fields in conditions array 2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
cf359a38b3 Re-adding ability to order by virtual fields in DboSource::order
Adding support for paginating virtual model fields in controller
2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
051d352eab Reimplementing DboSource::order() to avoid recursion so it can be more easily manipulated to add virtual fields (and hopefully to make it a little bit faster) 2009-12-10 20:08:14 -04:30
José Lorenzo Rodríguez
5a58813031 Making DboSource order by virtual fields 2009-12-10 20:08:13 -04:30
José Lorenzo Rodríguez
7efafc685e Fixing virtual fields fetching for Model::field() calls
Adding doc blocks
2009-12-10 20:08:13 -04:30
José Lorenzo Rodríguez
22e36cb057 Fixing bug where sometimes key($data[0]) returned empty string instead of first key in array 2009-12-10 20:08:12 -04:30
José Lorenzo Rodríguez
a81edb6080 Extending virtual fields implementation to work on queries with field list 2009-12-10 20:07:46 -04:30
José Lorenzo Rodríguez
53765312df Initial implementation of model virtual fields 2009-12-10 20:07:07 -04:30
José Lorenzo Rodríguez
285329e7a4 Fake commit 2009-12-10 20:05:11 -04:30
José Lorenzo Rodríguez
2503632327 Working on virtual fields on order clause. 2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
0ab2078284 Changing Model::hasField() api to accept second parameter for checking existance of virtual field 2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
ec672e99e8 Fixing virtual fields fetching for Model::field() calls
Adding doc blocks
2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
4685daf299 Fixing bug where sometimes key($data[0]) returned empty string instead of first key in array 2009-12-10 20:05:10 -04:30
José Lorenzo Rodríguez
f7a113d2b0 Convertig old-style find call to new api 2009-12-10 20:01:58 -04:30
José Lorenzo Rodríguez
00c0bb4d62 Extending virtual fields implementation to work on queries with field list 2009-12-10 20:01:58 -04:30
José Lorenzo Rodríguez
19c91f1f70 Initial implementation of model virtual fields 2009-12-10 20:01:58 -04:30
predominant
df151395c5 Moving certain datasources to the Datasources Plugin (http://github.com/cakephp/datasources) 2009-12-11 01:07:23 +11:00
predominant
8df7e34965 Code formatting cleanup. Fixes #92. 2009-12-10 13:04:11 +11:00
renan.saddam
c3bf6bc0e8 Checking for french error on dbo_mssql. Fixes #77. 2009-12-09 21:20:55 -02:00
renan.saddam
931606f7f5 Checking for french error on dbo_mssql. Fixes #77. 2009-12-09 21:10:37 -02:00
Mark Story
ecea49f823 Updating AuthComponent's mapped actions features to use Router::prefixes()
Adding tests for prefix interactions.
Adding tests for AuthComponent::logout, increasing code coverage.
2009-12-09 00:25:21 -05:00
Mark Story
6b657d9a9d Fixing failing tests due to incorrect merging. 2009-12-08 23:07:43 -05:00
Mark Story
de7658e78b Modifying FormHelper::create() and FormHelper::secure() to use hidden divs instead of hidden fieldsets. This improves the semantics of FormHelper and allows generated html to more easily pass HTML4.0 validation.
Test cases updated.
2009-12-08 22:58:08 -05:00
Mark Story
17777af3d3 Adding test case, and removing unreachable code. 2009-12-08 21:43:29 -05:00
Mark Story
4421fe6dc3 Fixing issues in router where plugin => null would not always exit a plugin route. Test cases added. 2009-12-08 21:36:25 -05:00
Mark Story
efa36abdf0 Fixing double merging of url options in paginator helper. This was causing duplicate passed url parameters in next()/prev().
Test cases added.
Fixes #391
2009-12-08 10:01:33 -05:00
predominant
13ffd76178 Removing "Long description for file" from /cake/libs tree. 2009-12-08 20:19:02 +11:00
mark_story
24b636cc71 Merge branch 'mergers' into 1.2-merger
Conflicts:
	cake/libs/view/helpers/text.php
	cake/tests/cases/libs/view/helpers/text.test.php
2009-12-06 22:03:17 -05:00
mark_story
1f5c6eac2e Fixing issues in tests caused by overwritten columns.
Fixing issue where mysqli had errors using getCharsetName, moving DboMysqlBase::getCharset down to DboMysql.
2009-12-06 21:46:05 -05:00
mark_story
7259a1b920 Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/helpers/text.php
	cake/libs/view/theme.php
2009-12-06 21:43:53 -05:00
mark_story
360810a1cf Merge branch '1.3-router' into mergers 2009-12-06 21:11:47 -05:00
mark_story
bbb61b28f7 Merge branch '1.3-misc' into mergers 2009-12-06 21:11:26 -05:00
mark_story
4cefb5fbd0 Applying patch from kleingeist to fix Js->value incorrectly calling Helper::value() 2009-12-06 20:45:12 -05:00
mark_story
626f2e86de Adding trigger_error for incorrect class use. 2009-12-03 21:29:02 -05:00
mark_story
0047ac8f34 Renaming RouterRoute to CakeRoute 2009-12-03 21:20:08 -05:00
mark_story
8c4d389760 Implementing the ability to use custom Route classes when connecting routes. Tests added. 2009-12-03 20:50:13 -05:00
mark_story
218af686d7 Renaming parameters. 2009-12-03 20:32:28 -05:00
mark_story
aff7d61277 Merge branch '1.3-misc' into 1.3-router 2009-12-03 19:13:28 -05:00
AD7six
9cd7888991 removing reference to unused variable __bare 2009-12-03 21:33:56 +01:00
mark_story
3b74c93582 Changing how helpers are extracted, fixes issues with view variables not overwriting local helper variables. Fixes #381 2009-12-03 09:55:49 -05:00
mark_story
be64f26f9f Updating doc blocks for model::validates. 2009-12-03 00:53:31 -05:00
mark_story
0806545f35 Adding passthrough to localized Validation class for Validation::ssn. Tests added. Fixes #378 2009-12-02 20:57:14 -05:00
mark_story
16f6d4d408 Making the various SecurityComponent::requireXX methods accept a single array or a list of strings as their arguments. Unifies the use of these functions with AuthComponent. Fixes #354 2009-12-02 17:56:52 -05:00
mark_story
cc1ba32f50 Removing call to RouterRoute::compile() 2009-12-02 01:10:50 -05:00
mark_story
61b70f1b44 Removing parameters from RouterRoute::_writeRoute(). 2009-12-02 00:26:43 -05:00
mark_story
494875cca2 Renaming RouterRouter::$params to $options. 2009-12-02 00:20:51 -05:00
mark_story
728613a34d Removing use of Set::filter() as its slowish. 2009-12-01 23:05:04 -05:00
mark_story
67ccac1f57 Adding omitted reference operator. 2009-12-01 22:31:18 -05:00
mark_story
63cd1a3326 Renaming method and removing Set::filter() call. 2009-12-01 22:21:33 -05:00
mark_story
78773020d1 Moving route failure handling to a separate method. 2009-12-01 21:56:03 -05:00
mark_story
4c175cc0bc Removing code. 2009-12-01 21:43:36 -05:00
mark_story
02ed766874 All tests passing in RouterTest. 2009-12-01 21:37:39 -05:00
mark_story
e741e0e4cb Adding test for previously broken reverse routing feature, where parameters that only partially passed the pattern would be accepted. 2009-12-01 15:04:53 -05:00
mark_story
e36631091d Fixing a failing test. 2009-12-01 14:58:36 -05:00
mark_story
21dd7fd4ca Fixing connection of plugin routes, the were being connected in the wrong spot.
Moving admin route + plugin tests to correct place.
Fixing order of methods in tests. parse() should only be called after routes are connected otherwise the default routes will precede the custom routes.
2009-12-01 14:39:23 -05:00
mark_story
a8f79f9fe5 Removing defaults that are also keys this makes the actions with the default index key work much better. Also things can't be both a variable and a constant routing parameter. 2009-12-01 13:37:03 -05:00
mark_story
6046528744 Moving XmlNode::__killParent() to a protected method so Xml can access it. Adding _killParent(true) call to Xml::__destruct. Forces destruction of circular references held in child objects when an xml object is garbage collected. Fixes #369 2009-12-01 10:01:36 -05:00
mark_story
547ed839d9 Correcting constructor of MediaView to fix issues with viewVars not being set.
Correcting use of MediaView in Dispatcher.  Fixes #366
2009-12-01 09:50:27 -05:00
mark_story
393038816c More tests passing in RouterTest now. 2009-11-30 10:15:39 -05:00
mark_story
cd46f4db2e Fixing function signature of ThemeView constructor. Fixes issues where ThemeView would always be registered causing issues with EmailComponent and themed views. Fixes #370 2009-11-30 09:19:25 -05:00
mark_story
fccfe14e8d Expanding doc block for ClassRegistry. 2009-11-30 09:18:24 -05:00
mark_story
11dd7898c4 Fixing tests + adding tests for passed args order preservation when passed args are part of default route parameters. 2009-11-30 00:23:41 -05:00
mark_story
e41c408378 Adding parameter pattern matching back into RouterRoute::match(), fixes failing tests in RouterRoute test case. 2009-11-29 23:46:02 -05:00
mark_story
5999264f10 Most of RouterRoute::match() working now. Failing tests for params with patterns included. 2009-11-29 22:57:10 -05:00
mark_story
de0b90db4a Moving addition of plugin and controller keys to Router instead of RouterRoute. 2009-11-29 16:21:33 -05:00
mark_story
9e9559b350 Working on RouterRoute::match(). Adding tests for RouterRoute::match() and removing defaults from routes that don't need defaults. 2009-11-29 16:09:45 -05:00
mark_story
0834cb47ab Removing code from RouterRoute::__mapRoute. All tests passing. 2009-11-29 12:10:09 -05:00
mark_story
b242dc9531 Moving parameter persist to RouterRoute.
Tests updated.
2009-11-29 10:59:38 -05:00
mark_story
f59b8daf2e Expanding tests for passed arguments in route defaults working correctly. Refactoring passed arguments in route default handling. 2009-11-29 09:49:19 -05:00
mark_story
889e367510 Expanding and correcting doc block for router::connect. 2009-11-28 23:37:40 -05:00
mark_story
7216925394 Updating doc blocks. 2009-11-28 23:12:44 -05:00
mark_story
a86e414adc Removing Router::stripEscape() and all uses of it.
Router::stripEscape() removed escape patterns supported in DboSource.  Since those escape patterns no longer exist, neither does the need for the escaping of those patterns.
2009-11-28 23:08:52 -05:00
mark_story
d70689ecda Merge branch '1.3-misc' into write-route 2009-11-28 23:04:22 -05:00
mark_story
02f9275e20 Removing automagic -! sql no-escape string handling. Removing use of Router::stripEscape() from Dispatcher, as this method removed -! from url + post data. 2009-11-28 23:02:59 -05:00
mark_story
5cbe3dbd39 Removing unused variables. Making loop easier to read. 2009-11-28 21:58:02 -05:00
mark_story
5b4d15dc3b Removing support for mid route * elements. Mid-route lazy * behaved in a sometimes erratic fashion making routes employing mid-route lazy * hard to depend on. 2009-11-28 21:54:33 -05:00
mark_story
33c67f7c47 More tests passing and more code moved from Router to RouterRoute. Switching RouterRoute to used named capture groups. This simplifies the route processing internals as there are fewer loops used to merge array sets together. 2009-11-28 09:40:15 -05:00
mark_story
4cb055ff0a Removing tests for features no longer supported. Path elements containing only regular expressions are no longer supported. They did not effectively reverse route. And they provided an inconsistent behavior when combined with the full gamut of regular expressions and routing parameters. 2009-11-27 17:12:35 -05:00
mark_story
26aa3731e0 Fixing _name_ elements being inserted into serialized xml from Xml lib. Test case added. Fixes #367 2009-11-27 14:27:32 -05:00
mark_story
49c6cd3f9f Fixing issues with optional parameters. Allows route params to be made optional by setting a pattern definition. 2009-11-27 09:58:51 -05:00
phpnut
7b78e475ca Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-27 00:55:45 -06:00
phpnut
43fdde2dad Removing unneeded code in Dispatcher::cached();
Fixing path search for themes
2009-11-27 00:49:20 -06:00
mark_story
fd98bc5d76 Expanding tests on Router and RouterRoute. 2009-11-26 23:46:42 -05:00
mark_story
89d0ed8f3b Route compilation tests passing again. 2009-11-26 21:42:33 -05:00
mark_story
8315b48e77 Removing String::getInstance() as it was causing fatal errors when eAccelerator was enabled, and is a deprecated method. 2009-11-26 18:24:14 -05:00
mark_story
18e0537869 Adding variable initialization 2009-11-26 17:50:33 -05:00
phpnut
903a1fd95a Adding new Configure::$App['www_root']
Helper::webroot(); will now check for theme assets in APP/webroot/theme/<theme_name>/
Adding ico key to Media::$mimeType;
Fixed bug in previous commits that would not use views/themed/<theme_name>/layouts/ from a plugin
Adding test cases for Helper::webroot();
Adding more tests for ThemeView.
2009-11-26 14:52:38 -06:00
ADmad
ad20e43730 Removing unneeded code for minor optimization
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-26 09:54:25 -05:00
mark_story
c4ceeabcf5 More tests and more passing tests for Route compilation.
Basic route compiling complete.
2009-11-26 09:41:05 -05:00
mark_story
6661c2fa70 Starting to refactor RouterRoute::_writeRoute 2009-11-26 00:17:43 -05:00
phpnut
f83a024a10 Increasing code coverage for View and ThemeView 2009-11-25 23:17:15 -06:00
phpnut
948f6b21e5 Refactored last commit changes are:
To override plugin views with a themed version of the view you would create:
<app_name>/views/themed/<theme_name>/plugins/<plugin_name>/<controller_name>/*.ctp

To override plugin views at the app view level you would create:
<app_name>/views/plugins/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:58:02 -06:00
mark_story
3885466e9a Changing $_this to the easier to type $self. 2009-11-25 23:40:52 -05:00
mark_story
1d7881b16f Renaming connectDefaults to defaults().
Updating tests.
2009-11-25 23:39:07 -05:00
phpnut
21eb001a96 Refactoring themes/views to use a centralized location instead of allowing plugins to have themes.
The plugin should include all required views/assets, to override these at the application level using themes you would create:
<app_name>/views/themed/<theme_name>/<plugin_name>/<controller_name>/*.ctp

if you are not using themes you can override them at the app view level:
<app_name>/views/<plugin_name>/<controller_name>/*.ctp
2009-11-25 22:29:54 -06:00
mark_story
636d944e70 Adding Router::connectDefaults(). Allows the developer to disable Router's automatic generation of routes. 2009-11-25 23:21:10 -05:00
mark_story
52264cb61c Fixing persistent param route exiting.
Adding test for exiting persist param routes.
2009-11-25 23:12:48 -05:00
mark_story
35fac165b3 Merge branch '1.3-misc' into 1.3-router
Conflicts:
	cake/libs/router.php
2009-11-25 22:57:42 -05:00
mark_story
e345b2f788 Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-25 22:23:38 -05:00
phpnut
d685c18720 Adding checks for directory traversal attempts related to recent changes allowing plugins and themes to include their own webroot/* assets 2009-11-25 12:41:19 -06:00
phpnut
0977029c89 Removing limit of image, js and css in plugins 2009-11-25 09:47:23 -06:00
phpnut
c942fa7038 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-25 08:40:14 -06:00
phpnut
2254bfe5c9 Adding ability for plugins to have there own webroot.
plugins/<PLUGINNAME>/webroot/*

Themes can also be self contained with a webroot directory.
app/views/themed/<THEMENAME>/webroot/*

vendors directory for assets is deprecated and no longer supported
2009-11-25 01:51:25 -06:00
mark_story
64dffb7663 Moving shared method from DboMysqli and DboMysql up to DboMysqlBase. Fixes #358 2009-11-24 22:49:40 -05:00
mark_story
3b1256cefb Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-24 22:10:11 -05:00
mark_story
69b72083be Adding docblock and removing a call to array_slice() 2009-11-24 22:06:55 -05:00
dogmatic
53bfc8cca2 a new take on toList and more tests for passing a different separator 2009-11-24 22:00:33 -05:00
dogmatic
398113f828 fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:27:56 -05:00
dogmatic
51d0805ce0 fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:23:23 -05:00
mark_story
58446e0785 Adding documentation note about $options['q'] Refs #357 2009-11-24 11:57:56 -05:00
mark_story
72c0e2ca5a Applying minor optimization from 'robustsolution' to Router::connectNamed().
Fixes #312
2009-11-24 09:27:13 -05:00
mark_story
5aba143620 Applying optimization to Controller::postConditions from 'robustsolution' Fixes #287 2009-11-23 12:52:38 -05:00
mark_story
8cdee90b4f Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/libs/view/helpers/html.php
2009-11-22 21:28:14 -05:00
mark_story
6fdaa82969 Merge branch '1.3' into 1.3-merger 2009-11-22 21:26:39 -05:00
mark_story
f28b3c6efd Fixing failing tests on ModelIntegrationTest related to with keys with bound fields set not retaining the fields set. 2009-11-22 21:26:25 -05:00
mark_story
4d37e75f18 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/controller/components/cookie.php
	cake/libs/debugger.php
	cake/libs/flay.php
	cake/libs/http_socket.php
	cake/libs/inflector.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
mark_story
2e0acbf505 Making habtm join conditions used by __saveMulti when finding link records to remove. It should be noted that having conditions on non-joinTable tables, and not having a model on the joinTable can cause SQL issues. Fixes #304 2009-11-22 17:56:46 -05:00
AD7six
4f3852618f correcting $this -> $self
removing debug code
2009-11-22 19:58:10 +01:00
Juan Basso
c6c7474502 Fix test of the size of lines in MagicDb (included test for it).
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 12:27:57 -05:00
mark_story
7e889d8495 Changing require_once to require for custom session handlers. If you are using a class to do your custom session handling you must include checks to prevent duplicate class errors. Fixes #324 2009-11-22 12:25:53 -05:00
mark_story
6b3b2a629b Removing CakeSession::__validateKeys() its no longer needed due to CakeSession using Set to manipulate the session values. Adding test case for exploit shown in https://trac.cakephp.org/ticket/2041 2009-11-21 20:44:35 -05:00
mark_story
63b047eb57 Replacing extract with classicExtract. 2009-11-21 20:25:45 -05:00
mark_story
4ea2a3f37d Minor optimization on importing of Cache engines. 2009-11-21 20:05:19 -05:00
mark_story
fa0d0addf8 Making it so Cache::__loadEngine is only called once per classname. 2009-11-21 20:01:33 -05:00
mark_story
46b965edba Refactoring Configure::read/Configure::write so keys with <= 2 keys read/write faster. 2009-11-21 19:57:04 -05:00
mark_story
a729fc4d62 Merge branch '1.3-cache' into 1.3-misc 2009-11-21 17:16:38 -05:00
mark_story
c11509483c Removing use of Helper::output from core helpers.
Removing duplicated test caused by merge in form helper test.
2009-11-21 16:43:54 -05:00
mark_story
d37dd4c49f Updating doc block for FileEngine.
Fixing Cache::set() so strtotime compatible durations are handled properly.
Restoring previous change in Xcache test case.
2009-11-21 16:09:06 -05:00
mark_story
fb7d99e6b3 Making XcacheTest use refactored Cache API. 2009-11-21 15:44:03 -05:00
mark_story
e3e02bfcee Fixing drop() 2009-11-21 15:26:16 -05:00
mark_story
95f8ed5b55 Additional refactoring and code removal. 2009-11-21 15:26:16 -05:00
mark_story
0ba622bb0e Removing debug changes.
Updating isInitialized() to its new use.
Refactoring Cache engines to no longer be singletons with heavy settings manipulation. Instead each config() is a separate instance.
2009-11-21 15:26:16 -05:00
mark_story
3404f1ed39 Adding documentation to Cache::config().
Adding tests for default configuration manipulation of config().
2009-11-21 15:26:16 -05:00
mark_story
d1066bfeaf Updating FileLog to include File if it does not already exist, fixes possible fatal errors if log was written to during the bootstrap process. 2009-11-21 15:21:19 -05:00
mark_story
b1c89496c5 Fixing typo in Cache doc block.
Updating formatting in Xcache doc block.
Fixing Xcache test case so it passes when username and password are not user & password.
2009-11-21 15:19:11 -05:00
mark_story
a96c157d94 Applying optimizations to use of count() from 'jrbasso' 2009-11-21 15:14:21 -05:00
Juan Basso
71df8dbbba Replace function sizeof (alias) by count.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:50:57 -05:00
Juan Basso
52fcabc96a Little optimization in redirect of controller.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:47:42 -05:00
Juan Basso
1cef0ac981 Little optimization in postConditions of controller.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:46:49 -05:00
Juan Basso
911a99bf23 Replace function preg_split by explode when possible.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:52 -05:00
Juan Basso
df9e1e0bd1 Replace function join (alias) by implode.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
Juan Basso
1acc60b04c Replace function die (alias) by exit.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:38:11 -05:00
Juan Basso
9b6b258fed Replace function is_integer (alias) by is_int.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:36:10 -05:00
renan.saddam
4a8808eb21 Removing the argument passed to mssql_get_last_message(), it does not accept any argument. 2009-11-19 16:35:29 -02:00
renan.saddam
a33bd1d144 Removing the argument passed to mssql_get_last_message(), it does not accept any argument. 2009-11-19 16:28:11 -02:00
predominant
97239f0259 Adding newline. 2009-11-18 22:28:03 +11:00
burzum
67cea6d21c Fixing a problem with setting Paginator::sort() defaults directon to desc 2009-11-17 02:11:23 +01:00
mark_story
9eb1950646 Removing duplicate condition check. Fixes #314 2009-11-16 20:10:08 -05:00
mark_story
925fda7ba6 Updating core layout, and skel layout to reflect changes in session->flash().
Updating skel layout to use $this->Helper.
2009-11-16 20:01:55 -05:00
Jippi
e6801c22e1 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-16 23:19:11 +00:00
Jippi
f078b0aeda Fixed Router::url() not being able to leave an URL with persist parameters 2009-11-16 23:16:49 +00:00
Jippi
2cb0c3acb3 Changed SessionHelper::flash to return message instead of echoing it 2009-11-16 23:15:24 +00:00
phpnut
cc11230925 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-16 10:14:35 -06:00
phpnut
7211541821 Removing 1024 char limit when using fgets() 2009-11-16 10:14:03 -06:00
predominant
a91108a81a Adding version check to getCharsetName() for MySQL Datasource. 2009-11-16 13:49:52 +11:00
mark_story
acd2c15690 Merge branch '1.3-misc' into 1.3-merger
Conflicts:
	cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
mark_story
58383d3cb9 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/model.php
2009-11-15 20:05:55 -05:00
mark_story
0783176238 Replacing duplicated code with pluginSplit().
Updating test case.
2009-11-15 19:55:20 -05:00
mark_story
28d3488cb2 Adding file headers to config files in test app.
Updating doc blocks.
Updating formatting.
2009-11-15 18:09:04 -05:00
ceeram
7a4793a20c refactoring Configure::load() to load config files from plugins, tests and config files added
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-15 17:56:49 -05:00
mark_story
63ab96d751 Setting $primary = false inside DboSource::queryAssociation. Fixed #208 2009-11-15 17:48:41 -05:00
predominant
0049c9ad81 Renaming Helper::__name to Helper::_name for proper access level for extension overloading and callback. 2009-11-15 21:18:46 +11:00
mark_story
fa14f9cebc Merge branch '1.3-validation' into 1.3-misc 2009-11-14 20:46:48 -05:00
mark_story
be9f0ec4c7 Renaming method so they match those in Cache.
Removing method that was missed during previous refactor.
Updating tests.
2009-11-14 20:42:57 -05:00
mark_story
b7e7eff738 Fixing doc blocks. 2009-11-14 20:24:18 -05:00
mark_story
70820e2e96 Renaming unconfig to drop. 2009-11-14 20:18:58 -05:00
mark_story
caedbdf98a Adding Cache::configured() and Cache::unconfig(). configured() allows introspection on the currently configured settings. unconfig() allows for the removal of cache configs.
Tests added.
2009-11-14 20:10:40 -05:00
mark_story
59a7cee89d Removing deprecated $config parameter handling. $config must be a string that is the name of an existing cache config. 2009-11-14 20:10:40 -05:00
mark_story
b6978ab25f Adding the ability to load cache engine classes from plugins and app libs.
Also enabled the ability for App cache classes to override core ones.
Test cases added.
Removed unnecessary subclassing of Object.
2009-11-14 20:10:40 -05:00
mark_story
3c349dd15c Removing unnecessary inheritance from Object. 2009-11-14 20:10:40 -05:00
mark_story
2740fd6714 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-14 19:42:24 -05:00
mark_story
17e377de7e Updating doc block for MemcacheEngine 2009-11-14 19:40:30 -05:00
ADmad
862ff82ad4 Updating Configure::store to fix escaping issues
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-14 19:38:53 -05:00
mark_story
06d4e5e553 Reformatting code in memcache.
Adding unset() to test case to remove unnecessary keys that can cause test failure.
2009-11-14 18:50:23 -05:00
mark_story
3712072531 Applying optimization to Router::connect() from 'robustsolution' Fixes #302 2009-11-14 16:32:18 -05:00
mark_story
8b1a2b1f72 Applying optimization in Router::__parseExtension from 'robustsolution'. Fixes #301 2009-11-14 16:29:33 -05:00
predominant
0977b3fe15 Standardising docblock endings throughout. 2009-11-14 23:19:25 +11:00
mark_story
9376826aa4 Fixing HttpSocket::buildUri when host key is empty.
Tests added
Fixes #271
2009-11-13 14:42:40 -05:00
mark_story
d93c94f702 Fixing failing test, picked in from 1.2. 2009-11-13 09:53:31 -05:00
ceeram
a67a97722a refs #291
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-13 09:25:47 -05:00
mark_story
2c5fa171e0 Updating CakeSchema to pass a Model object into DboSource::fullTableName(); Fixes schema's not correctly reading tablePrefixes.
Fixes #290
2009-11-13 00:43:40 -05:00
nate
1c8a2f232b Changes Model::find() to allow modification of DataSource connection during callbacks. 2009-11-12 14:48:03 -05:00
mark_story
47e6f332d7 Reformatting doc blocks. 2009-11-10 23:35:45 -05:00
mark_story
63ee8f0fcd Starting pass through validation handling.
Implemented phone, and postal pass throughs.
Adding tests.
2009-11-10 21:20:39 -05:00
mark_story
c5a41913c3 Merge branch '1.3' into 1.3-misc 2009-11-10 20:22:42 -05:00
mark_story
f0628d100b Fixing issues with getting values from habtm data after form posting and validation has failed.
Tests added.
Refs #279
2009-11-09 21:00:19 -05:00
mark_story
f5cfab7b4f Merge branch '1.3' into 1.3-misc 2009-11-09 20:10:56 -05:00
predominant
26e19caad5 Removing unnecessary getInstance() calls. 2009-11-10 10:30:13 +11:00
mark_story
fa1b7f617f Fixing issues caused by merge with 1.2. 2009-11-09 14:07:19 -05:00
mark_story
6b5c247162 Merge commit 'origin/1.2' into mergers
Conflicts:
	cake/bootstrap.php
	cake/console/cake.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
mark_story
7981b44db4 Merge branch '1.3-misc' into mergers 2009-11-08 21:39:55 -05:00
mark_story
a7a6dc8c43 Fixing issue where SecurityComponent::_validatePost could generate notices if elements were removed from _Token array.
Tests Added
Fixed #228
2009-11-08 14:12:18 -05:00
mark_story
6b79c8d375 Adding checks for parent classname when converting error method names. Fixes #273 2009-11-08 14:07:25 -05:00
mark_story
82a2b1a019 Changing import of Dispatcher to direct require.
Modifying order of operations in Configure::__loadBootstrap()
moving inclusion of app/config/bootstrap.php after the creation of core cache configs.  This allows App::import() to be used in the bootstrap file with cached paths.
2009-11-07 17:53:14 -05:00
mark_story
6db91b0f49 Fixing issues in ContainableBehavior that could leave models unbound when 'fields' was used as part of containment conditions. Fixes #253 2009-11-07 17:43:18 -05:00
mark_story
30dc0cfe56 Removing unused $view property from CacheHelper.
Fixes #272
2009-11-07 10:44:14 -05:00
mark_story
4a08bd120d Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-07 10:41:12 -05:00
mark_story
4704a8cd00 Removing unused $view property from CacheHelper.
Fixes #272
2009-11-07 10:40:48 -05:00
ADmad
002a01a9d8 passedArgs from current request are auto merged with url options of paginator helper
Signed-off-by: Florian Krmer <florian.kraemer@cakedc.com>
2009-11-06 18:31:42 +01:00
mark_story
4deaf27cc0 Removing deprecated code in Html::css()
Minor refactoring in HtmlHelper methods.
Fixes #268
2009-11-06 09:31:57 -05:00
mark_story
ab76cb1217 Merge branch '1.3' into 1.3-misc 2009-11-06 09:25:11 -05:00
mark_story
e7c2fe2b7e Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-06 09:24:55 -05:00
SkieDr
ce15cc61d9 Fix order of keys in l10n catalog list 2009-11-06 15:46:54 +03:00
predominant
62810fb4f4 Updating more Copyright dates. 2009-11-06 18:04:38 +11:00
predominant
1185681549 Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0 Update license lines throughout. 2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed Fixing links throughout 2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8 Removing excess whitespace 2009-11-06 17:08:23 +11:00
predominant
6782cb019c Update CakePHP Project link. 2009-11-06 17:00:11 +11:00
predominant
5dfe1777af Removing Subversion file headers. 2009-11-06 16:51:09 +11:00
mark_story
4bbfcbff7e Fixing limit:0 and controller::paginate. Removes possibilty to generate sql errors by inputting invalid limit options. Tests updated. Refs #264 2009-11-06 00:44:21 -05:00
predominant
ceee56013c Remove Subversion $Date$ lines. 2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe Remove Subversion $LastChangedBy$ lines. 2009-11-06 16:11:16 +11:00
predominant
42f3f16d60 Remove subversion $Revision$ lines. 2009-11-06 16:08:02 +11:00
predominant
531eaaad4e Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc 2009-11-06 15:54:01 +11:00
predominant
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
mark_story
e776cf1ad2 Adding tests and fixing inline parameter being converted to an attribute.
Fixes #265
2009-11-05 23:32:39 -05:00
mark_story
83845c6b1b Removing blank line. 2009-11-05 23:27:58 -05:00
mark_story
0c22175042 Updating doc blocks for CakeLog. 2009-11-05 23:25:08 -05:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
mark_story
5506af8fcc Updating file headers.
Removing Object::$_log.  CakeLog is now called statically.  Saving an instance is not longer necessary or desired.
2009-11-05 23:21:40 -05:00
mark_story
c238d4d11b Adding return and test case for CakeLog::write() 2009-11-05 23:20:40 -05:00
mark_story
f414378bc7 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-05 22:03:38 -05:00
predominant
490e76460f Changing quotes and adding spaces. Standarization cleanup. 2009-11-06 13:46:49 +11:00
mark_story
6b2f7f67a6 Removing whitespace. 2009-11-05 20:16:25 -05:00
mark_story
84c8cc3f36 Adding tests for importing loggers from app/libs and plugin/libs.
Adding tests for failed configs.
2009-11-05 20:13:15 -05:00
mark_story
b6ed3a9999 Updating doc block. 2009-11-05 19:45:04 -05:00
mark_story
01bb9e5957 Refactoring FileLog
Adding test case for FileLog
2009-11-05 19:41:43 -05:00
mark_story
d23f2f4604 Implementing CakeLog::config() adding simple tests for config(). 2009-11-05 19:16:46 -05:00
mark_story
98f0e370a1 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-logging 2009-11-05 18:40:01 -05:00
mark_story
88ef00d2d0 Removing trailing whitespace. 2009-11-04 23:05:25 -05:00
mark_story
4cb88ab1bb Expanding tests for RouterRoute route compilation. 2009-11-04 23:03:08 -05:00
mark_story
8ebd3ed410 Removing params that are not part of $url. 2009-11-04 23:03:08 -05:00
mark_story
aeb61f3750 Continuing to refactor Router methods into RouterRoute.
Fixed issues with some routes having trailing / and others not.
All existing router tests are passing.
2009-11-04 23:03:08 -05:00
mark_story
cc5c5a5ac9 RouterRoute now being used instead or route arrays.
Still some failing tests, mostly due to trailing /
2009-11-04 23:03:08 -05:00
mark_story
6da1ab9c30 Moving matching and parsing methods into RouterRoute. 2009-11-04 23:03:08 -05:00
mark_story
fec83abd90 Starting refactoring of Route methods into a separate class. Tests added. 2009-11-04 23:03:08 -05:00
predominant
2669b6179f Fix committed merge conflict for home page. 2009-11-05 14:30:56 +11:00
mark_story
6523fb1d47 Adding initial implementation of Logging streams. 2009-11-04 18:19:22 -05:00
mark_story
380b49a446 Fixing Helper::value() and extraction of habtm data. Refs #256 2009-11-04 14:05:12 -05:00
mark_story
e609875754 Updating Model::invalidFields, so returning false from beforeValidate() will abort both the validation and saving() of the record.
Tests added to check beforeSave, beforeValidate, and beforeDelete return values.
Fixes #257
2009-11-04 12:36:17 -05:00
mark_story
dc07a05fca Merge branch '1.3' into 1.3-misc 2009-11-04 09:20:21 -05:00
tPl0ch
f5ca3ace1f Modified Model::find() to make Model::findQueryType available in Model callbacks. Fixes https://trac.cakephp.org/ticket/5847. Tests added
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-04 09:16:04 -05:00
predominant
59c62426c9 Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc 2009-11-04 16:11:35 +11:00
predominant
cf42c8dd7f Updating default views and baking templates to use $this->Helper syntax for helpers. 2009-11-04 15:52:56 +11:00
mark_story
12c7203c71 Merge branch '1.3-alpha' into 1.3
Conflicts:
	cake/libs/view/pages/home.ctp
2009-11-03 23:19:01 -05:00
mark_story
5da3becc18 Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3 2009-11-03 23:16:40 -05:00
phpnut
2bf630f209 Merge branch '1.3' of code.cakephp.org:cakephp into 1.3 2009-11-03 22:03:09 -06:00
phpnut
a1ce9e662c Fixing real issue for Ticket #137
Reverted changes replacing [ and ] with .
2009-11-03 22:02:26 -06:00
mark_story
1d22adbc1a Merge branch '1.3-misc' into 1.3 2009-11-03 22:50:11 -05:00
mark_story
adb4dcf1c4 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-03 22:47:22 -05:00
predominant
7383e97115 Adding datasources array to Configure. 2009-11-04 14:45:44 +11:00
mark_story
0aecb9de2d Applying patch from 'dogmatic' to update home.ctp to use helper methods, and i18n. 2009-11-03 22:40:36 -05:00
mark_story
bc8d920c0f Updating changelog link on home.ctp 2009-11-03 19:53:59 -05:00
mark_story
d17c526dc3 Fixing String::insert() when $data is an empty array. Which was happening in the dbo source tests. 2009-11-03 18:21:01 -05:00
mark_story
d63218c0a0 Fixing error in previous commit. 2009-11-03 09:52:59 -05:00
mark_story
6b043c6c57 Updating doc blocks for paginator helper. 2009-11-02 21:37:20 -05:00
renan.saddam
91b9e1d50b Updating docblock for FormHelper::dateTime method. 2009-11-02 13:57:05 -02:00
renan.saddam
034b5c435c Allowing FormHelper::month() to use a $monthNames array as values. 2009-11-02 13:51:16 -02:00
ceeram
988ab2d29f fixes Ticket #6300
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-02 00:19:44 -05:00
mark_story
9d2628f699 Removing tab 2009-11-02 00:07:16 -05:00
mark_story
a87d31cc7f Fixing $cacheAction requiring the inclusion of the controller name for view cache files to be generated. This behavior makes the cache helper behave as documented.
Test cases added.  Fixes #232
2009-11-02 00:07:02 -05:00
mark_story
a3bb77c4f3 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/acl.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/model.php
	cake/console/libs/templates/skel/views/layouts/xml/default.ctp
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/validation.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/no_database.group.php
2009-11-01 12:11:49 -05:00
mark_story
44d7742b85 Minor refactoring and removal of duplicate test. 2009-10-31 16:28:43 -04:00
tPl0ch
2331cfde60 Added 'before' and 'after' options to FormHelper::submit(). Test cases updated.
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-31 16:21:53 -04:00
mark_story
a855a6aa41 Renaming variable. 2009-10-31 16:16:58 -04:00
mark_story
cab64b780c Refactoring switch in Scaffold. 2009-10-31 16:16:25 -04:00
mark_story
3a59bf5ed6 Updating Scaffold to work with any single prefix. You can set $scaffold = to any prefix defined in Routing.prefixes.
Tests added.
2009-10-31 16:06:20 -04:00
mark_story
873760aae4 Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2 2009-10-31 15:05:51 -04:00
mark_story
0637272bd2 Updating doc block on Controller to include more information about $uses. 2009-10-31 14:25:33 -04:00
mark_story
403bd15cca Removing Validation::file() It was never implemented, and file validation can be a lengthy and complicated process. This is better implemented at the application level. 2009-10-31 14:17:24 -04:00
mark_story
6726b76077 Refactoring input() to reduce number of method calls.
Applying patch from 'j3ffy' to allow user defined types to override magic select type.
Test case added.
Fixes #5109
2009-10-31 01:45:17 -04:00
mark_story
ade96b7ea5 Updating doc blocks. 2009-10-31 01:11:02 -04:00
mark_story
83caf50918 Fixing doc blocks and minor refactoring. 2009-10-31 01:04:33 -04:00
mark_story
9ed7a5cd55 Adding new options into doc blocks.
Removing todo as its implemented already.
2009-10-31 00:58:21 -04:00
mark_story
ac302bb6c2 Minor refactoring.
Adding tests for form->create() with file type forms.
2009-10-31 00:08:49 -04:00
José Lorenzo Rodríguez
adea104edb Allowing output disabling of hidden fields in checkbox and radio input types. closes #6185
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-30 22:47:31 -04:00
José Lorenzo Rodríguez
1c47b2182e Adding form encoding default in form create options. Default is always taken from Configure::read('App.encoding'). closes #6042 2009-10-30 22:35:21 -04:00
José Lorenzo Rodríguez
dfc1014fba Making current action be the default for new forms. Updating test accordingly. closes #5353
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-30 22:29:49 -04:00
mark_story
ad8cba41e6 Merge branch '1.3' into 1.3-misc 2009-10-30 22:04:20 -04:00
renan.saddam
84a10904fb Fixing typo on variable name. 2009-10-30 18:42:04 -02:00
phpnut
7bead5df30 Fixing catalog() to return 3 char matches 2009-10-30 14:43:52 -05:00
mark_story
5f1e6ba6a0 Making DboSource::fetchAll return $this->_result if it is a boolean and $out is empty. Allows for Model::query() to return boolean values for operations that do not return recordsets. Fixes #6404 2009-10-29 20:31:29 -04:00
mark_story
17edec8460 Changin how HttpSocket parses query string parameters. Makes HttpSocket querystring parameter parsing more congruent with how PHP handles query string parameters in that it doesn't require urlencoded characters.
Tests added.
Fixes #156
2009-10-29 20:14:36 -04:00
mark_story
a31a2d264c Fixing Debugger::log() . The method used protected properties only available in test cases. No stack trace was being logged when called either. Method has been updated to match its doc block better.
Fixes #222
2009-10-29 19:47:29 -04:00
mark_story
8b26d9ceb2 Applying optimization from 'Ceeram' reduces merges in FormHelper.
Fixes #225
2009-10-29 19:10:04 -04:00
mark_story
84ec53a039 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-10-29 09:51:06 -04:00
mark_story
9446f7dd38 Merge branch 'sqlite-tableparams' into 1.3-misc 2009-10-29 09:50:45 -04:00
mark_story
23831546b5 Adding valid options for sqlite collation. Tests added. 2009-10-29 02:03:50 -04:00
mark_story
a33457155f Adding valid option checking to fieldParameters.
Test case added.
2009-10-29 02:03:21 -04:00
mark_story
f299283dc4 Refactoring duplicated code into a method. 2009-10-29 01:47:25 -04:00
mark_story
2a8858e928 Adding tests to DboSqlite::buildColumn
Adding collate field parameter to DboSqlite.
Removing duplicated code from DboSource, adding parent call instead.
2009-10-29 01:36:15 -04:00
phpnut
80b1eb4ee2 Merging fix for invalid characters in cookie name.
Fixes
2009-10-28 23:44:30 -05:00
renan.saddam
61845090ed Changing variable name to make consistency between others methods. 2009-10-29 01:31:55 -02:00
renan.saddam
e7074c1e5c Moving parameters to $options on Text::truncate() and Text::highlight(). 2009-10-29 01:23:44 -02:00
mark_story
6c18c0e0c7 Fixing escape parameter usage. 2009-10-28 18:41:29 -04:00
mark_story
4bf807b4be Deprecating String::getInstance() 2009-10-28 18:32:04 -04:00
mark_story
ad305a890a Applying optimization from 'ermayer' Reduces functions called from Folder::addPathElement() Fixes #178 2009-10-27 21:06:58 -04:00
mark_story
00d7c655ce Improving documentation for PaginatorHelper::sort() Fixes #210 2009-10-27 13:28:43 -04:00
mark_story
5a093e5627 Fixing issues in postgres with time columns and '' values.
Tests added.
Fixes #213
2009-10-27 13:22:34 -04:00
mark_story
14bd47842c Removing length() from DboMysqli, fixes incorrect float length parsing.
Test case added.
2009-10-24 11:06:27 -04:00
mark_story
c6999aea7f Moving DboMysqli::describe() and DboMysql::describe() into DboMysqlBase. Removes duplicated method code. 2009-10-24 10:46:28 -04:00
mark_story
6123ed47c4 Removing empty strings that caused undefined string offset errors.
Trimming trailing spaces.
2009-10-22 00:17:48 -04:00
José Lorenzo Rodríguez
2f0598b5c4 Removing todo message, as it is implemented correctly 2009-10-22 00:17:39 -04:00
José Lorenzo Rodríguez
ce743c00e8 Expanding Helper an View functionaility to accept deep nested entitities.
This allows the form helper to render inputs with arbitrary number of dot separated parts
2009-10-22 00:17:23 -04:00
José Lorenzo Rodríguez
50ec80ff50 Continuing work on Helper::setEntity and associated methods 2009-10-22 00:17:14 -04:00
José Lorenzo Rodríguez
2941e89da3 Making Helper::viewEntity accept any number of levels 2009-10-22 00:16:37 -04:00
José Lorenzo Rodríguez
31f0cdc214 REfactoring model introspection to gather info form multiple models 2009-10-22 00:16:28 -04:00
mark_story
8b419d2dd8 Removing use of ife() from core classes. 2009-10-21 12:57:15 -04:00
SkieDr
fb64d14442 Add support libs folder into app and plugins that will allow to split users and vendors code. Libs files should follow cake naming conventions for files names and classes. 2009-10-21 14:59:12 +04:00
mark_story
0e23fdfbb3 Fixing infinitely nesting stack frames when TreeBehavior::reorder() is called and the models $cacheQueries = true and there are a sizable number of records being manipulated.
Test cases added.
Fixes #188
2009-10-21 00:22:36 -04:00
mark_story
02df92a3a3 Merge branch 'datasource-enabled' into 1.2 2009-10-20 16:19:45 -04:00
mark_story
6913dd4bae Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2 2009-10-20 16:18:15 -04:00
mark_story
072e1efc13 Adding Datasource::enabled()
Allows for checking a datasource's ability to be used before attempting to connect it.
Added enabled() to all the core dbo's.
Fixes whitescreen when trying to use a non installed database driver.
Fixes #131
2009-10-20 16:11:31 -04:00
renan.saddam
a15289fba8 Saving few Router::normalize() calls, will may increase performance. Fixes #179. 2009-10-20 16:16:31 -02:00
mark_story
fa6b1b1a20 Changing FormHelper::button() to actually create <button> elements instead of input elements. Test cases added. 2009-10-19 23:57:23 -04:00
mark_story
08f07a9aa4 Changing FormHelper::submit() to be able to create all types of submit buttons. Use 'type' option to create reset or button type inputs.
Test cases added.
2009-10-19 23:44:50 -04:00
mark_story
b9e28d1908 Updating doc blocks. 2009-10-19 23:34:34 -04:00
mark_story
34fb1cc683 Refactoring out common code blocks into a separate method. 2009-10-19 21:58:37 -04:00
mark_story
0a79822b9d Expanding some doc blocks for DataSource. 2009-10-19 21:09:47 -04:00
mark_story
2675bbcd53 Fixing FormHelper::__selectOptions incorrectly selecting options due to type juggling. Fixes #167 2009-10-18 22:05:17 -04:00
mark_story
057e3ff0aa Removing $showEmpty parameter from all select based widgets.
Use attributes[empty] instead.  This change unifies the api between form->input() and other widget methods.
Tests and docblocks updated.
2009-10-17 01:29:16 -04:00
mark_story
610a281030 Updating doc blocks. 2009-10-17 00:55:17 -04:00
mark_story
f1c9b33f2b Fixing typos. 2009-10-16 23:19:46 -04:00
mark_story
a46ebc933b Removing redundant function calls. 2009-10-16 23:16:46 -04:00
mark_story
0dee625215 Removing escape parameter from para()
Renaming parameters.
2009-10-16 23:14:42 -04:00
mark_story
3c1d134685 Updating doc blocks.
Renaming inline param for style() to oneline.
Removing escape parameters from div() and tag()
2009-10-16 23:11:13 -04:00
mark_story
8e2f58d086 Removing HtmlHelper::css() inline parameter. Use $options[inline] instead.
Adding tests for inline = false script and css generation.
2009-10-16 23:00:31 -04:00
mark_story
fc4df2bb64 Updating documentation. 2009-10-16 22:53:38 -04:00
mark_story
6bb53a5c9d Removing HtmlHelper::link()'s escapeTitle parameter. $options[escape] now controls escaping of attributes and title text. 2009-10-16 22:49:44 -04:00
mark_story
7344c0ce7d Removing $inline parameter from HtmlHelper::meta() inline is now an option. 2009-10-16 22:31:56 -04:00
mark_story
b021461630 Updating documentation. 2009-10-16 22:15:57 -04:00
mark_story
23cf0da18e Updating doc blocks 2009-10-16 22:10:01 -04:00
mark_story
4e038e55b3 Removing NONE options from FormHelper::dateTime(). These options are legacy options, from before date() and time() existed. If you need only date selects, use date(), same for time selects. 2009-10-16 22:02:07 -04:00
mark_story
d5ce5813c7 Fixing typo. 2009-10-16 22:02:07 -04:00
mark_story
f9f2986f48 Implementing Form helper default options. Allows the creation of persistent form options when opening a form.
Adding patch from 'Ceeram' / 'bankai'
Refs #56.
2009-10-16 22:02:07 -04:00
mark_story
6dcc819121 Updating fileheaders. 2009-10-16 22:02:07 -04:00
mark_story
f07df02087 Making JsHelper::set() work well with setting the variables to an object property. 2009-10-16 22:02:06 -04:00
mark_story
4be98b6ed9 Adding JsHelper::set() + test cases. 2009-10-16 22:02:06 -04:00
predominant
1945204686 Minor formatting of media class. 2009-10-16 22:02:06 -04:00
ADmad
4d4447746a Renaming "flashLayout" to "flashElement" to be consistent with changes to Session component and helper
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-16 22:02:06 -04:00
mark_story
ecc7d9b303 Replacing $pluginPath loops with App::pluginPath(). Minor optimization for App::pluginPath(). 2009-10-16 22:02:06 -04:00
renan.saddam
43dbf71624 Doing a little optimization for php 5.1 <, also fixing tests on Windows. Fixes #155. 2009-10-15 18:09:58 -03:00
mark_story
906eb82e9b Fixing typo in prototype engine helper. Fixes #172 2009-10-15 11:09:13 -04:00
mark_story
082156f9a1 Fixing FormHelper::input() label's for attribute when a datetime type is created and dateFormat or timeFormat is set to NONE. Fixes #168 2009-10-14 21:17:00 -04:00
mark_story
38f65bdc24 Merge branch '1.2-merge-in' into 1.3 2009-10-14 00:55:42 -04:00
mark_story
d1f5acd0e0 Merge commit 'origin/1.2' into 1.2-merge-in
Conflicts:
	cake/console/libs/shell.php
	cake/libs/model/connection_manager.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
mark_story
ca6ca39467 Updating formatting on doc block for string insert. 2009-10-13 12:09:06 -04:00
José Lorenzo Rodríguez
6dbb8690ad Fixing error in String::insert where string that contained a question mark were not propperly replaced 2009-10-13 12:07:22 -04:00
mark_story
e5a99b2685 Updating RequestHandler::renderAs() to respect DS constant, fixing issues on PHP4 + Windows. Fixes #97 2009-10-12 23:55:40 -04:00
mark_story
e04cc81613 Updating doc block.
Removing redundant condition.
2009-10-12 23:38:55 -04:00
mark_story
a3f38c77dd Merge branch '1.3-console' into 1.3 2009-10-11 21:51:02 -04:00
mark_story
71f9ab1717 Merge branch '1.3-misc' into 1.3 2009-10-11 21:44:42 -04:00
mark_story
a89882581b Adding i18n support to text that lacked it. Refs #5814 2009-10-10 00:35:54 -04:00
mark_story
d59a2c8de1 Making subclassing of ErrorHandler much easier.
Test cases added.
2009-10-09 00:13:08 -04:00
mark_story
955bd338e7 Unsetting local vars, so that viewVars with the name will be extracted. 2009-10-08 23:55:17 -04:00
mark_story
f59d95e348 Updating file headers. 2009-10-08 23:46:05 -04:00
mark_story
8d40532931 Applying patch from 'Ceeram'. Adds File::copy() and test case. Refs #150 2009-10-08 23:27:31 -04:00
mark_story
55ef5cedfb Updating fileheaders. 2009-10-07 23:43:02 -04:00
mark_story
2c144a9d0d Adding mb_ functions to Validation methods. 2009-10-07 23:43:02 -04:00
mark_story
0d3ef03b9f Updating file headers. 2009-10-07 23:43:01 -04:00
mark_story
06162d5022 Deprecating TextHelper::trim() as it is an alias for truncate().
Expanding use of mb_ methods.
Tests updated.
2009-10-07 23:43:01 -04:00
jperras
84b5458a36 Reverting inheritance modification to Validation. 2009-10-07 01:08:19 -04:00
jperras
d38e50805d Improving performance of String::insert(). 2009-10-06 22:02:02 -04:00
jperras
1795733eda Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc 2009-10-06 21:27:56 -04:00
mark_story
9a023136e3 Merge branch '1.3-misc' into 1.3 2009-10-06 17:23:35 -04:00
mark_story
f59e4013c7 Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2 2009-10-06 09:22:47 -04:00
mark_story
6e9ca4367e Fixing connection methods in DboSybase. Fixes #145 2009-10-06 09:21:43 -04:00
mark_story
8acf1eeba0 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-10-06 09:09:18 -04:00
Niles
cbf676c0e4 remove call to deprecated method. 2009-10-06 08:42:35 -04:00
mark_story
2d2e692b37 Updating doc blocks to improve API parsing. 2009-10-05 21:27:34 -04:00
mark_story
a99d2ea821 Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2
Conflicts:
	cake/libs/model/model.php
2009-10-05 21:02:41 -04:00
mark_story
51e471427a Updating doc blocks to improve parsing in the API. 2009-10-05 21:01:31 -04:00
mark_story
3bf94e6a28 Updating documentation for Model methods to improve api parsing.
Removing redundant include.
2009-10-05 20:42:37 -04:00
mark_story
d2bf31f69f Fixing broken tests in dbo_mysql caused by changes in CakeSchema.
Adding tableParameter altering to DboMysql.
Tests added.
2009-10-04 21:48:20 -04:00
mark_story
7b0bc014cc Updating whitespacing. 2009-10-04 20:54:27 -04:00
mark_story
778755c2b0 Implementing CakeSchema:;_compareTableParameters. Adding tests for tableParameter comparison. 2009-10-04 20:53:49 -04:00
mark_story
aae120a81a Updating file headers. 2009-10-04 13:35:11 -04:00
mark_story
05f6099def Enabling plugin.name schema file creation and addition.
Making CakeSchema::load() use plugin parameter, tests added.
Plugin schema file added to test_app.
2009-10-04 13:32:33 -04:00
mark_story
0b6d6cee6c Adding placeholder method to DboMysql to handle alteration of table parameter statement generation. 2009-10-03 16:49:01 -04:00