predominant
26d526f624
Fix AuthComponent tests for windows newlines.
2010-06-07 01:22:08 +10:00
predominant
6a18b2bc1d
Merge remote branch 'origin/1.3' into 2.0
...
Conflicts:
cake/basics.php
cake/console/libs/shell.php
cake/console/libs/tasks/controller.php
cake/libs/controller/components/request_handler.php
cake/libs/model/model.php
cake/libs/model/model_behavior.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/sanitize.php
cake/libs/validation.php
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/javascript.php
cake/libs/view/pages/home.ctp
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/test_app/libs/cache/test_app_cache.php
cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
Juan Basso
a94b9ee95b
Update various links. Closes #392
2010-05-18 22:15:13 -03:00
mark_story
f114d4299d
Merge branch '2.0' into 2.0-request
...
Conflicts:
cake/libs/router.php
cake/tests/cases/libs/router.test.php
2010-05-17 21:52:14 -04:00
mark_story
b2d8536b3b
Fixing Authcomponent tests. Updating the component + tests to use the new request object.
...
Deprecating a number of Authcomponent properties.
2010-05-15 00:55:15 -04:00
predominant
8f880731c6
Removing closing PHP tags.
2010-05-11 08:27:28 +10:00
predominant
1ec220dac2
Removing closing PHP tags.
2010-05-11 08:07:49 +10:00
Mark Story
982437595e
Fixing errors caused by API changes.
2010-05-02 01:22:59 -04:00
Mark Story
120fdd9045
Removing other uses of Routing.admin as it has been removed from Router.
2010-04-20 23:43:51 -04:00
predominant
850ca02bb6
Changed all public 'var' declarations to be 'public $var'
2010-04-04 17:14:00 +10:00
predominant
329a13fe5f
Changed all $_ declared variables to protected.
2010-04-04 16:36:12 +10:00
Ceeram
7337c12f4f
test for ticket #467
2010-03-19 01:48:28 +01: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
527eec1a54
Fixing doc tags to make merge easier.
2010-01-26 16:51:53 -05:00
Mark Story
5212406ea7
Making xml data test php5 only as Xml::compare() is non-functional in php4
2010-01-14 22:48:19 -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
Mark Story
540e81b1b0
Fixing component and controller test cases to work with less magical session component.
2010-01-13 23:49:11 -05:00
Joël Perras
15b8a3ec71
Updating copyright date on all files.
2010-01-13 23:47: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
Mark Story
c669f8c998
Fixing failing tests in AuthComponent because of required parameter.
2009-12-19 19:58:55 -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
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
predominant
c64389006d
Removing "Long description for file" from /cake/tests tree.
2009-12-08 20:19:42 +11:00
predominant
0977b3fe15
Standardising docblock endings throughout.
2009-11-14 23:19:25 +11:00
predominant
d7b604c8ed
Fixing links throughout
2009-11-06 17:46:59 +11:00
predominant
8f75ff58c7
Removing @filesource
2009-11-06 15:24:02 +11:00
mark_story
078b84500b
Adding test from 'Phally' to expand coverage of allow()
2009-10-15 09:23:24 -04:00
jperras
2b0d13733e
Fixing parameter ordering error of array_map in AuthComponent::allow(). Adding test.
2009-09-21 12:14:20 -04:00
mark_story
a839c29eb8
Fixing use of deprecated methods in Auth test.
2009-09-20 18:16:26 -04:00
mark_story
4a6412fb27
Adding tests for AuthComponent::action().
...
Adding plugin support for AuthComponent in actions mode. Refs #33
2009-09-14 00:29:33 -04:00
mark_story
c94698500b
Adding test case for Auth with authorize = actions.
2009-09-14 00:15:06 -04:00
mark_story
090eb27be1
Updating imports in AuthComponent and AuthComponent test case.
2009-09-13 23:42:25 -04:00
mark_story
b4a1c4723d
Making AuthComponent::deny() case insensitive like allow(). Fixes #6261
2009-08-30 20:41:39 -04:00
renan.saddam
c84b4cf36d
Changing AuthComponent::deny to accepts same param as AuthComponent::allow, tests added
2009-08-13 13:08:30 -03:00
renan.saddam
8d6135a8d1
Adding support for plugin models used in Auth::$userModel
2009-08-13 11:39:59 -03:00
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
gwoo
bc359259a2
Merge branch '1.2' into 1.3
2009-07-02 09:27:00 -07:00
mark_story
ff5d9ed6e0
Fixing issues created in [8205] where allowedActions check was done incorrectly. Fixes #6482
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8208 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-01 03:56:16 +00:00
mark_story
8c7883fe3e
Fixing camel cased methods in checks for allowedActions in AuthComponent under PHP5. Normalizes to lowercase method name. Fixes #6142
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8205 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-30 00:25:09 +00:00
gwoo
f9339e3c81
simplified App::path(). Changed App::build() to handle all paths.
...
tests passing.
2009-06-11 09:13:16 -07:00
gwoo
24d78dd671
moving path configuration to App class
2009-06-07 15:24:10 -07:00
mark_story
9aa64ef564
Ensuring that 'ext' param added by RequestHandler does not end up as a queryString parameter in Auth.redirect.
...
Adding test case.
Fixes #6211
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8182 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-01 00:01:58 +00:00
mark_story
b68c78fc0f
Fixing lost querystring params when user request without a session is performed. Test case updated. Fixes #6211
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8156 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-25 02:16:05 +00:00
mark_story
82cb895f50
Correcting test case simulation. Closes #6211
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8151 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-23 17:26:56 +00:00
davidpersson
fd7d6718a1
Updating tests to not affect other ones when run from a group
...
Adding NoCrossContamination group
Shortening group class names
Renaming lib_controller group
Updating test imports to include the core AppController by default
Some cosmetics
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8123 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-21 23:55:39 +00:00
jperras
641a48342b
Adding test for Auth login redirect to url with query string parameters. Disproves #6211 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8118 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-19 18:37:54 +00:00
davidpersson
3c3b852099
Changing package of tests from "cake.tests" to "cake".
...
Moving tearDown et al. to the top of each test class.
Adding short descriptions to docblocks.
Adding missing docblocks.
Removing unnecessary blank lines and whitespaces.
Updating labels of test groups.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8116 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-18 17:55:58 +00:00
gwoo
b8d21c6c2c
closes #6142 , shows Auth works as expected with camelCased actions
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8065 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-27 16:17:58 +00:00
gwoo
f7dd0800d1
fixes #6062 , AuthComponent and Controller::scaffold
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8018 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-06 23:23:12 +00:00
mark_story
ddc047751c
Adding submitted test cases from harking Closes #6047
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8013 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-02 02:58:15 +00:00
the_undefined
27065d7aab
Fixed bug in AuthComponent that allowed uppercase actions to pass checks
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8011 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-26 18:50:09 +00:00
mark_story
af49aec444
Adding session->delete() to remove bleed through in tests.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8009 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-21 22:52:44 +00:00
mark_story
65a047542e
Adding test case to disprove regression in Auth component. Closes #5961
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8008 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-21 22:34:46 +00:00
mark_story
ba42eb05c1
Fixing broken tests refs #5687
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7986 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 20:37:31 +00:00
gwoo
e496fc9434
updating auth component and test with additional checks for missing data
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7979 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 05:21:26 +00:00
mark_story
6c258c0f93
Fixing Auth's handling of params when loginAction is an array. Tests updated. Fixes #5961
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7972 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-06 03:20:11 +00:00
mark_story
a12fd86c54
Applied patch from 'jperras' fixes error in Auth.test.php. Fixes #5899
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7943 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-18 21:04:05 +00:00
AD7six
b43128c809
Ensuring that the auth component never redirects to an external link.
...
Tests updated to match code changes and tests added for external referer examples
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7874 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-14 09:07:22 +00:00
renan.saddam
111b886570
Removed trailing whitespaces from tests.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7848 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:58:37 +00:00
AD7six
3f2fa6929b
changing tabs for spaces in comment block indentation
...
Removing address and replacing with cakefoundation url
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
nate
1b9357f5e8
Correcting behavior of layering allow/deny calls in AuthComponent, fixes #5595 , formatting fixes for RequestHandler
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7743 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-15 02:52:19 +00:00
mark_story
915a1e119d
Adding test to Auth.test to cover logged in user being denied on an action when there is no HTTP_REFERER set. Refs #5507 .
...
Fixed tests that break when Routing.admin is not set.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7687 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-02 00:18:47 +00:00
nate
fc5b128d68
Refactoring Auth test, adding coverage, and enabling custom Ajax layouts (as specified by RequestHandler), fixes #5446
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7637 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-20 20:18:16 +00:00
mark_story
9895f6d39b
Added check in AuthComponent::hashPasswords() to ensure that data is an array. Tests Added.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7492 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-24 15:18:37 +00:00
gwoo
4a5282bcd7
closes #5172 , AuthComponent login with with UUID
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7396 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-31 19:00:12 +00:00
gwoo
c004dd68a5
removing empty lines from the end of test cases
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7295 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 08:17:02 +00:00
nate
df75a06756
Fixing coding standards violations in core, and adding misc tests
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7222 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 20:17:23 +00:00
phpnut
6807d4c333
Starting initial refactoring of current code base.
...
Made changes to test suite to allow running test without headers already sent errors.
Moved Component::initialize(), Controller::beforeFilter(); and Component::startup(); from Dipatcher::start() to Controller::constructClasses();
Removed Dispatcher::start();
Fixing model instances not being created
Adding additional test to CookieComponent to increase coverage to 95%
Optimizing Set::diff();
Fixing SessionComponent test and RequestHandlerComponent test
Fixing CakeSession tests, removed deprecated code from CakeSession
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7162 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-10 22:38:05 +00:00
AD7six
a978fb2661
adding Doc blocks to everything in tests folder missed in the first pass.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7126 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-05 15:20:45 +00:00
gwoo
b3f605c1d8
fixes #4836 components initialize for error pages, also changing Object::stop() to Object::_stop()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7116 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-04 19:04:58 +00:00
AD7six
f44c755475
Adding doc blocks to everything in the tests dir
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7094 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-02 19:22:55 +00:00
nate
39feb3f7c1
Refactoring DboSource. Model array conditions must now have comparison operators on the left side, fixes misc bugs, updated core to reflect changes
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7075 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-31 12:36:38 +00:00
gwoo
cf896eaa9b
refactoring component handling, closes #4795 , tests added. deprecated Controller::_initComponents();
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7070 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-31 03:54:22 +00:00
nate
42da5aba81
Moving Cake folder to correct location
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2
deleting cake folder from svn
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
mark_story
dcdfdb3cbe
Updated Auth redirect url generation. Now correctly retains passedArgs and namedParams. Added tests for this behavior. Closes #4750
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7040 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-24 22:43:19 +00:00
mark_story
62d4397d4a
All components group works. Acl test and Auth test were clobbering each other.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7000 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 02:46:24 +00:00
nate
6c5f98ddec
Fixing ACL interface class names
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6999 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 02:00:36 +00:00
gwoo
2558705e14
closes #4708 , test case added to show Auth supports routed login actions
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6997 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-21 23:45:58 +00:00
nate
8313fef72d
Changing recursive setting in Auth user lookup query, allows $userScope to use joins, fixes #4665
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6919 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-18 04:49:54 +00:00
gwoo
8a236492a0
adding Object::stop(), updating auth and auth.test to use
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6901 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-16 15:23:00 +00:00
mark_story
5893fd3669
Added additional test using ajaxLogin with Dispatcher. Currently fails.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6896 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-16 01:33:53 +00:00
gwoo
1623fa89f8
updating auth, fixes #4417 ajaxLogin rendering
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6893 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-15 19:20:13 +00:00
the_undefined
bf107d1886
Fixed admin routing redirect in AuthComponent
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6886 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-15 07:06:22 +00:00
the_undefined
451192018a
Improved AuthComponent to use an array to match the login action, fixes #4572
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6830 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 03:22:34 +00:00
gwoo
1346224b1f
updating auth test, closes #4398
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6620 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-02 15:56:19 +00:00
nate
819cd1d667
Re-removing the Auth vulnerability re-introduced in [6593]
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6595 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-20 19:18:52 +00:00
phpnut
47eb421091
"Adding fix to Auth::identity(); for errors thrown on invalid input.
...
Added tests for invalid input.
Debug is turned off in this area of code because of the CakePHP errors handling, messages could cause long delays and exception noticed when debug > 0."
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6593 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-20 07:17:37 +00:00
nate
f3355bd74b
Removing all references to deprecated 'webservices' and 'bare' routes and route parameters, removing deprecated constants, updating core tests
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6453 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-11 06:18:41 +00:00
nate
6dc742d675
Adding ACL test setup to Auth test case
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6375 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-13 04:23:19 +00:00
phpnut
cb53dc61b0
"Closes #2897 , Built-in file validation.
...
Implemented Validation::extension(); and Vaidation::range();
Updated copyright notices in all files"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6296 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 22:18:17 +00:00
nate
9d58121205
Removing trailing slash from normalized URLs in AuthComponent, moving AuthComponent::_normalizeURL() to Router::normalize(), refactoring (Ticket #3042 )
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6145 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-13 07:03:59 +00:00
gwoo
fbd3811cd1
removing usage of Model::loadInfo() replaced by Model::schema(), removing new lines at the end of some files, removed deprecated chmodr() function from basics, updated bake and scaffold views
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5912 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-28 04:18:18 +00:00
phpnut
1aa1164b1d
Closes #3394 , applied test patch
...
Deprecated define('MAX_MD5SIZE', (5 * 1024) * 1024); in core.php
Removing additional defines in core.php, replaced with Configure::write();
Added CakeSession::__startSession() to check for sent headers before attempting to start the session.
Added notices to Configure::__loadBootstrap() that will be removed before stable release.
Refactored Folder::tree().
Added additional FolderTest cases
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5768 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-16 09:05:25 +00:00
gwoo
1eea608e0c
updating Acl to use Configure, adding config stack to CacheEngine, adding notices for defines to Configure, modifying bootstrap for Cache::config() updating tests for acl, auth, and cache.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5752 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-14 01:09:21 +00:00
phpnut
15e943fff8
Fixes #3164 , removed use of uniqid() replaced with String::uuid()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5683 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-21 01:57:27 +00:00
phpnut
b89c3c98ad
Fixes #3217 , Auth flash message when Auth->authorize = false is not shown.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5680 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-21 01:07:59 +00:00
gwoo
9d2a62752d
updating auth test
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5604 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-29 05:35:38 +00:00
gwoo
8bb67d9f6a
Adding Schema support, updated fixtures, deprecated loadInfo, changed Dbo::describe in all dbos, fixed tests,
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5563 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-08-21 21:46:59 +00:00
