Commit graph

924 commits

Author SHA1 Message Date
mark_story
4b2504d334 Refactor repetitive logic in jquery engine. 2009-04-11 23:47:43 -04:00
mark_story
3a3e003982 Adding drop() to mootools. 2009-04-11 23:37:24 -04:00
mark_story
1d5e3150a2 Adding drag() to mootools. 2009-04-11 23:09:58 -04:00
mark_story
02bb4e71f3 Adding drag and drop() methods to prototype.
Adding test for option pass through on _mapOptions(). Ensures that
correctly named options do not get munged.
2009-04-11 00:01:40 -04:00
mark_story
646cfd7a83 Adding drop() to jquery.
Adding testcases.
Fixing doc blocks.
2009-04-08 23:57:32 -04:00
mark_story
0269994842 Adding Drag() to jquery 2009-04-08 23:31:17 -04:00
mark_story
49f689a9ce Updating mootools and prototype sortable implementation. 2009-04-06 21:56:20 -04:00
mark_story
f74408df0a Updating request() in prototype. 2009-04-06 00:39:16 -04:00
mark_story
00f3c6f25d Updating prototype engine and test case for request() 2009-04-06 00:03:19 -04:00
mark_story
5f7abae48c Fixing request() callbacks. Starting test for prototype 2009-04-05 23:49:09 -04:00
mark_story
5f4cdf91ac Fixing AjaxHelper::dragOptions to match scriptaculous docs.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8136 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-06 00:57:46 +00:00
mark_story
5c4f838f5a Adding buffer flush to ajax helper test. Test suite menus now properly display.
Fixing Drag options.  Adding test coverage. Fixes #6266

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8135 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-06 00:45:53 +00:00
mark_story
d74e2d1a73 Fixing newline escaping for single quote strings, output now matches json_encode().
Test added, and old test fixed.
Fixing buffering issues, causing test suite menu to disappear when running JavascriptHelper Test case.
Fixes #6167

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8134 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-04 02:42:46 +00:00
mark_story
87c5a5da6a Fixing jquery::request() and update key.
Adding drag and drop test skeleton to mootools/jquery
2009-03-29 23:00:39 -04:00
mark_story
23423f2791 Updating request in Mootools 2009-03-29 22:08:49 -04:00
mark_story
923883bdad Adding default list of buffered methods to the JsBaseEngine. 2009-03-29 16:14:56 -04:00
mark_story
f2578315e7 Refactoring how buffering works.
Adding buffer params to method calls.
Adding tests for buffer calls.
2009-03-29 16:10:04 -04:00
mark_story
57ceba5c9c Adding docs to explain buffering control. 2009-03-29 14:38:09 -04:00
mark_story
8eeb00b66e Refactoring writeScripts to buffer() methods to clarify API. 2009-03-29 14:23:42 -04:00
mark_story
e2918c6f5e Updating slide effects for jquery engine. 2009-03-29 00:28:15 -04:00
mark_story
ba15d955e2 Updating effect in Mootools
Updating effects and effect test in Prototype
2009-03-28 23:46:23 -04:00
mark_story
768941baeb Adding each() to prototype engine 2009-03-28 18:11:16 -04:00
mark_story
55eafaf112 Adding domReady to prototype 2009-03-28 18:06:20 -04:00
mark_story
8cc5990e09 Adding event() and tests to prototype library 2009-03-28 12:08:34 -04:00
mark_story
da2361de14 Adding get() + tests to prototype 2009-03-28 11:50:57 -04:00
mark_story
977efe4e1d Fixing callback naming issues with mootools 2009-03-28 00:31:51 -04:00
mark_story
29b3a96cb2 Adding sort() to option parsing, makes testing easier. 2009-03-28 00:31:08 -04:00
mark_story
9708b2dc50 Adding sortables to mootools engine. 2009-03-28 00:15:05 -04:00
mark_story
d59a704fb1 Adding sortable to jQuery engine. 2009-03-27 23:44:57 -04:00
mark_story
dfe6fe1c0c Reformatting doc blocks 2009-03-27 23:30:03 -04:00
mark_story
0b7d61f8cd Adding docs and errors for methods. 2009-03-27 23:24:08 -04:00
mark_story
574b0529ec Merge branch '1.3' into 1.3-jshelper
Conflicts:
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
2009-03-27 23:13:50 -04:00
mark_story
0516fb2090 Enabling disabled attribute to be passed to hidden input when making checkboxes.
Test case added. 
Fixes #6226

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8128 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-25 16:58:29 +00:00
jperras
4439bc4f70 Fixing regression in PaginatorHelper. Adding tests for PaginatorHelper::sortDir, as well as fixing incorrect test for sorting with Model.field dot notation. Fixes #6218.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8125 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-22 18:59:53 +00:00
mark_story
f15b793a4a Disabling caching of JS files by default. Requiring webroot to be
writable by default it not a good idea.
2009-03-19 22:05:06 -04:00
mark_story
0bd3cc97c1 Adding tests and features for script caching to files. 2009-03-19 22:02:18 -04:00
gwoo
643651fe56 Merge master in 1.3 2009-03-19 14:10:13 -07:00
renan.saddam
76e0f17dbc Updating documentation to improve code completion
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8114 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-17 21:10:28 +00:00
mark_story
d787ec3720 Moving writeCache and getCache to JsHelper.
Adding drag, drop, sortable stubs.
Adding control of caching to JsHelper.
Refactoring tests.
2009-03-15 23:42:25 -04:00
mark_story
91903a4dec Adding request() to mootools. 2009-03-15 22:15:22 -04:00
mark_story
e237eec343 Fixing event stopping in mootools 2009-03-15 21:51:00 -04:00
mark_story
eea1fa576c Refactoring quote style in jquery engine 2009-03-15 21:44:40 -04:00
mark_story
87d68e5029 Switching quote styles in mootools engine
Adding effect() and each() to mootools
Adding tests
2009-03-15 19:59:16 -04:00
mark_story
51a187f3e5 Adding Event binding to mootools engine 2009-03-15 18:48:34 -04:00
mark_story
a9da171e8c Removing multiple param for JsBaseEngine::get() it is not needed.
Adding get() to Mootools engine
2009-03-15 17:48:27 -04:00
mark_story
6b0058308e Adding skeletons for mootools engine 2009-03-15 17:32:04 -04:00
mark_story
4b690237f0 Merge branch '1.3' of git@thechaw.com:cakephp into 1.3-jshelper
Conflicts:
	cake/libs/view/helpers/html.php
2009-03-15 13:20:43 -04:00
mark_story
e873bb5ab9 Adding querystring creation and option mapping to jquery engine.
More complex ajax requests can now be done.
2009-03-15 13:08:29 -04:00
mark_story
72866966b0 Updating parseOptions to allow safeKeys that do not need to be escaped
Useful for handling function callbacks in options arrays.
2009-03-15 12:26:12 -04:00
mark_story
ffdbec12fe Refactoring event() and adding ability to stop default events. 2009-03-15 12:10:46 -04:00
mark_story
ae2114dcc1 Starting request() for jquery engine.
Adding _mapOptions so engines can map from abstract to concrete option
names.
Tests added.
2009-03-14 17:01:49 -04:00
gwoo
6cb8b3d286 Merge branch 'master' into 1.3.x.x 2009-03-14 13:57:18 -07:00
mark_story
12cc01eff5 Fixing + updating doc blocks 2009-03-14 13:48:31 -04:00
mark_story
72e1c73134 Adding effects and effects tests to JqueryEngine 2009-03-14 01:57:24 -04:00
mark_story
94c4e18112 Adding error feedback to base class methods 2009-03-14 00:10:43 -04:00
mark_story
20530f5ffb Adding test case for jquery engine
Adding some methods for jquery engine
Updating methods in base class
2009-03-13 20:50:31 -04:00
mark_story
518e567458 Fixing handling of true, false, null in object encoding. 2009-03-13 19:37:57 -04:00
nate
36d3540c19 Adding native-type-generation fixes for JavascriptHelper::object()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8095 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-13 14:49:00 +00:00
mark_story
2f40804d21 Removing Html tags from JsHelper 2009-03-12 23:49:26 -04:00
mark_story
a1a54a152b Adding methods to baseEngine
Removing file inclusion from JsHelper
Adding writeCache to JsHelper
Adding tests.
2009-03-12 23:48:19 -04:00
mark_story
91e47a6379 Adding scriptBlock() to HtmlHelper.
Adding tests.
2009-03-12 22:59:55 -04:00
mark_story
7ea7bd90c2 Moving script() method into HtmlHelper.
Moving tests.
2009-03-12 19:51:30 -04:00
mark_story
8025743830 Fixing doc blocks in HtmlHelper 2009-03-12 19:34:04 -04:00
mark_story
bf4fa09b8f Removing whitespace introduced in [8014]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8093 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-12 17:33:47 +00:00
gwoo
de6541f658 fixes #6189, paginator sort direction for associated fields of the same name
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8092 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-12 17:11:08 +00:00
mariano.iglesias
fdbf102228 Fixing issue where disallowing plugin was not possible in PaginatorHelper, fixes #6159
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8090 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-11 19:24:06 +00:00
nate
92cc331341 Updating docblocks and code formatting in XML classes, adding test change to previous commit.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8089 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-11 04:09:35 +00:00
mark_story
cf0582773b Adding jqueryEngineHelper stub. 2009-03-09 09:25:39 -04:00
mark_story
100fdc1876 Adding tests for $once parameter 2009-03-08 22:33:34 -04:00
mark_story
efbef5f8c6 Adding Access tags, adding _parseOptions 2009-03-08 01:28:07 -05:00
mark_story
6213b83f8d Removing methods that are being/moved removed.
Reformatting tests.
2009-03-08 01:01:08 -05:00
mark_story
3e0d645957 Moving JS generating methods to BaseEngine class
Adding duplicate script detection.
2009-03-07 22:06:00 -05:00
mark_story
2362f283f2 Refactoring out string escaping and object conversion into base class. 2009-03-07 20:16:11 -05:00
mark_story
0c77cc98b5 Adding min/pack detection and auto use. 2009-03-07 13:10:50 -05:00
mark_story
86c7d62fc2 Updating JsHelper 2009-03-07 11:08:49 -05:00
renan.saddam
b0a0f2ad30 Refactoring last change to cover issues like [7636]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8079 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-06 13:29:56 +00:00
mark_story
c164be8c03 Enabling Asset.timestamp for HtmlHelper::image() making it consistent with Javascript::link().
Tests added.
Fixes #6170

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8078 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-06 04:40:50 +00:00
jperras
571f57822d Refactoring NumberHelper::toReadableSize to properly use I18n functionality.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8071 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-03 23:39:48 +00:00
jperras
79cba70758 Updating number helper to allow output of main currency symbol in the 'after' slot. Also added some basic i18n for NumberHelper::toReadableSize Fixes #6150.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8069 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-03 15:32:12 +00:00
mark_story
259ecbe9a7 Updating doc blocks on formhelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8067 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-28 22:17:56 +00:00
the_undefined
74bf622866 Fixes #6071
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8053 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-23 15:19:33 +00:00
mark_story
01340e8014 Fixing docblocks in HtmlHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8048 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-18 19:07:15 +00:00
mark_story
42ef8bfbcf Updating doc strings in Javascript helper for better api generation.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8047 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-18 18:26:22 +00:00
mark_story
0beda262d1 Updating doc blocks in FormHelper.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8045 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-18 01:39:01 +00:00
gwoo
f0d03a91cf Merge branch 'master' into 1.3.x.x 2009-02-09 12:01:06 -08:00
nate
519db5e281 Changing FormHelper::label() to allow param to be a string (class name) 2009-02-09 11:39:37 -05:00
nate
c2f111a45a Standardizing format string in PaginatorHelper::counter(), %page% becomes {:page}, old keys still work, but will be deprecated 2009-02-07 08:41:15 -05:00
mark_story
e7c71b4125 Updating doc blocks in helpers. Helps generate cleaner API.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8014 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-03 18:48:28 +00:00
TommyO
de1d1ae3bd Fixed asset.timestamp inconsistency for css files.
Added tests to confirm css linking.
Closes #5990. Fixes #5991

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7990 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 22:19:11 +00:00
mark_story
287968934f Fixing next()/prev() when paginating multiple models. Added tests from 'hummer'. Fixes #5970
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7989 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-14 22:08:11 +00:00
mark_story
79c791548f Fixing formHelper::hour when specifying a strtotime compatible string for the selected value. Tests added Fixes #5941
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7967 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-30 16:20:38 +00:00
nate
ad208ff8c3 Refactoring previous fix to revert markup changes in HtmlHelper, updating FormHelper tests to comply with coding standard, correcting bad assertions, fixing issue with field types being mis-identified if duplicate names are used, fixes #5919
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7959 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-25 22:13:06 +00:00
nate
61850b1be1 Cleaning up test code formatting, adding fix for POST hash validation of checkbox lists, fixes #5903, test cases added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7951 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-23 08:13:00 +00:00
nate
e2c087f34b Fixing failing tests in JavascriptHelper.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7944 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-19 01:30:02 +00:00
john
a1046de895 Couple of syntax fixes - missing semicolon and usage of empty() inside a conditional.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7933 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 18:09:32 +00:00
nate
870c4e87ca Fixing code formatting in JavascriptHelper to wrap at 100 characters, small return-home-early refactoring.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7931 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 16:08:31 +00:00
mark_story
9071d8165f Correcting generation of id attributes for radio buttons. Tests added, fixes #5891
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7924 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 01:49:58 +00:00
mark_story
b2b4c4be47 Adding App::import() to app_helper files. Fixes issues with Missing Helper Class, and allows you to use helpers in shell classes. Fixes #5458
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7904 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-05 16:49:43 +00:00
gwoo
4dd105d415 fixes #5829, form helper using proper method reference for parseAttributes. A patch would have been nice, but some ticket submitters prefer not to make much effort.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7902 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-01 19:39:40 +00:00
mark_story
c49f213fcf Adding spaces before self close of meta link elements. W3C recommends a space before />. Fixes #5821
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7899 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-30 05:25:37 +00:00
mark_story
090028403b Fixing FormHelper dateTime creation when using custom empty strings and null values. Tests added. Fixes #5769
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7898 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-29 00:28:31 +00:00
mariano.iglesias
f9557c7611 Fixing issue where radio elements would produce wrong hash when Security component enabled in FormHelper, fixes #5791
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7891 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-25 16:32:54 +00:00
phpnut
69f883a89f Adding $data['attrib'] back to RssHelper::channel(); after more research use cases for this were found.
Related test case added

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7889 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-25 05:54:31 +00:00
mark_story
cfa2229689 Fixing incorrect implementation of RssHelper::channel(). Test cases added.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7887 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-24 23:10:29 +00:00
mark_story
ace8ef4b5a Applying patch from 'tyler'. Updates Ajax helper to reflect updated scriptaculous API. See http://github.com/madrobby/scriptaculous/wikis/ajax-inplaceeditor. Fixes #5790
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7885 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-24 05:23:31 +00:00
nate
ab152bd291 Updating AjaxHelper docblocks and fixing code formatting -- lines wrap at 100 characters. Fixes #5701.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7852 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 22:15:43 +00:00
mariano.iglesias
e9953e3f93 Fixing issue where JavascriptHelper::link was generating wrong URLs when webroot is defined and appending timestapping. Fixing issue in previous commit. Fixes #5723, fixes #5045
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7851 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 12:45:00 +00:00
mariano.iglesias
81e2f4a044 Fixing commit in r7843 so real files are accounted for
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7850 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 12:34:51 +00:00
renan.saddam
6319f8ea69 Removed trailing whitespaces from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:54:07 +00:00
mariano.iglesias
8777b8ef96 Fixing issue where double call to webroot on HtmlHelper::css was generating wrong URLs when forcing asset timestamp, fixes #5723
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7843 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 00:24:51 +00:00
mariano.iglesias
8da2a5208f Adding multibyte support to TextHelper::truncate, fixes #5610
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7842 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 00:07:17 +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
40bf675589 Refactoring DboSource to remove use of str_split, adding $read (false to calls to) DboSource::value() inside DboSource::create(), cleaning up code formatting, fixes #5598, fixes #5682
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7802 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 05:03:01 +00:00
renan.saddam
41d82920f5 Fixing issue with rounded values in NumberHelper::toReadableSize. Fixes #5676.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7790 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-29 01:15:59 +00:00
mark_story
97cd2c5aef Committing patch from 'fernyb' to add support for with key in AjaxHelper::autoComplete()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7785 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-26 23:47:00 +00:00
mark_story
5a2db7a5b4 Fixing interaction between Model::_clearCache() and CacheHelper. Cached view files for camelCased controller or underscored URL's were not being cleared. Fixes #5611
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7783 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-26 18:51:38 +00:00
mark_story
2d1483e1e5 Updating formHelper::dateTime() to work correctly with string timestamp values. Closes #5621
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7781 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-26 14:53:06 +00:00
nate
16e2579f01 Correcting Security component to treat POST data arrays as a single field for validation purposes, fixes #5588
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7774 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 03:18:08 +00:00
mark_story
1b456f2cf1 Applying patch from 'davidpersson' fixing code spacing. Closes #5643
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
mark_story
5c962accc1 Fixing timehelper::fromString when input time is invalid.
Tests added and renamed for better consistentancy with other tests.
Closes #5556

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7713 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-08 17:19:07 +00:00
mark_story
acce4fa54e Adding interval to minute() attributes when timeformat = 24.
Tests added.
Closes #5428, refs #4641

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7711 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-07 16:57:22 +00:00
nate
b29f805632 Allowing $attributes param of FormHelper::select() to be null, fixes #5518
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7697 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-03 21:55:41 +00:00
nate
badfb42c6a Fixing issue with file upload inputs not being factored into form security hash, closes #5489
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7678 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-29 16:23:39 +00:00
mark_story
bf3e254987 Removing secure() from FormHelper::submit(). Removes creation of multiple _Token inputs when multiple submit buttons are created. Fixes #5490.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7677 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-29 01:58:27 +00:00
nate
eb7fb6d7e3 Re-implementing form hashing security to using string-based keying. Fixes #5262, fixes #5300
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7658 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-24 23:02:14 +00:00
DarkAngelBGE
cc425a5e0a adding a couple whitespace corrections (trailing tabs, newlines, ..)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7654 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-24 11:52:29 +00:00
nate
80c1950530 Refactoring FormHelper security token generation, fixing code formatting
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7639 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-21 04:06:37 +00:00
phpnut
8ae5866a1c Additional optimization refactoring
Removed ability to use deprecated / with plugin, helper, etc combinations. The dot notation is only allowed from this point forward.
Corrected tests for the above changes.
Corrected formating in basics.php

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7623 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-18 03:09:19 +00:00
mark_story
44cf61b240 Updating doc blocks for ajax helper. Closes #5426
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7606 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-15 04:03:15 +00:00
nate
dba8d8740d Adding object hook calls for JsHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7562 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-07 03:26:58 +00:00
mark_story
e5cfd69636 Adding test layout with cake:nocache tags.
Adding tests to CacheHelper
Fixing CacheHelper not parsing cake:nocache after $content_for_layout when view file has cake:nocache tags as well.
Closes #5275

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7560 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-05 21:41:07 +00:00
nate
ccc602c82a Updating PaginatorHelper::options() docblock and adding test cases to demonstrate correct usage, closes #5380
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7556 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-04 19:10:15 +00:00
mariano.iglesias
46620f8ee2 Fixing issue where reference fatal is thrown with PHP 5.0.5
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7552 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-04 13:35:04 +00:00
mark_story
c58e58a491 Adding tests for secured forms. Fixes the issues related to checkboxes in multi row forms.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7533 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-29 03:11:35 +00:00
mark_story
c4b4c25402 Removed BOM from form.php. Closes #5317
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7497 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-25 14:57:37 +00:00
mark_story
9ae4975bff Applied patch from 'biscazziere' updated TimeHelper::timeAgoInWords() to be i18n friendly. Closes #5082.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7496 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-25 03:15:10 +00:00
mark_story
792863a3b4 Adding test to illustrate #5302. Corrected Error in doc block. Closes #5302
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7487 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-22 17:50:32 +00:00
nate
6f660812ca Adding FormHelper security token patch from renan.saddam, fixes #5061, adding test to disprove #2729 (FormHelper::input() and float fields)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7486 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-22 16:05:34 +00:00
mark_story
3fb44e4485 Adding 'submitOnBlur' to $editorOptions. Closes #5263
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7467 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-14 21:03:15 +00:00
mark_story
a180071f6c FormHelper::checkbox() now sets name of hidden field when name option is set. Closes #5224
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7449 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-09 22:08:17 +00:00
mark_story
9e51a64f87 Adding additional doc block explanations for method options.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7446 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-08 12:29:49 +00:00
mark_story
54fa1833e8 Added category handling to RssHelper. Additional tests added. Closes #5135
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7443 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-08 03:49:53 +00:00
nate
0119c0d46f Fixing HTML entity escaping in helpers, fixing broken XmlHelper test, all helper tests now passing
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7403 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 04:53:16 +00:00
mark_story
c5cfc77365 Removing php5 only code.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7402 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 01:34:17 +00:00
gwoo
cf8ddbada0 reverting accident commit in time helper from [7387]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7400 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 00:48:14 +00:00
gwoo
7ce4bd4131 closes #5160, finishing tag implementation on paginator helper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7395 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-31 16:58:57 +00:00
mark_story
8b28eec1ab Removed almost all am() calls from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7389 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-31 00:16:16 +00:00
gwoo
a4499befe3 fixes #4086 caching with params
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7388 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 21:14:22 +00:00
TommyO
b6e9888753 Replaced all instances of ife() in /cake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7387 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 20:34:01 +00:00
DarkAngelBGE
1052d21522 fixing broken tests in FormHelper, closes #5088
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7379 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 13:40:59 +00:00
nate
b0b9c1e4bd Adding PaginatorHelper tests for additional custom URL settings
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7358 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-24 04:04:21 +00:00
mark_story
4355a13939 Altered TextHelper::truncate() when using exact = false and considerHtml = true close tags would be chopped off leaving incorrect Html. Closes #4941
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7342 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-16 12:40:49 +00:00
mark_story
5ec8eef6ce Added userOffset check to timeAgoInWords, tests added. Closes #5068.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7333 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-10 03:30:28 +00:00
joelmoss
aa1b0c776e JavascriptHelper::blockEnd now correctly respects safe option. Test also added. Fixes #5074
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7330 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-09 12:08:51 +00:00
gwoo
c3aa47f08e updating Securiity::hash(), closes #5060, closes #5044.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7326 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-07 17:13:09 +00:00
mark_story
e20944a976 Added patch from 'biesbjerg' corrects timestamps not being applied to Vendors css and js. Closes #5045
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7325 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-07 01:19:41 +00:00
phpnut
ed0a031ec4 Adding correct test cases for #5046 showing proper prefix usage, closes #5046 as invalid
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7323 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-05 14:48:09 +00:00
phpnut
9bc1acb2ec Closes #5051, AjaxHelper form function should use mt_rand() instead of rand().
Replaced all rand() with mt_rand() in the core.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7322 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-05 14:31:22 +00:00
phpnut
30a49a39e4 Fixes #5016, Security->disabledFields not working properly. Empty value arrays needed to be unset
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7314 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-05 10:10:19 +00:00
phpnut
822c8978a9 Fixes #5002 Model name in PaginatorHelper sortKey.
Closes #5032
Small performance improvement in App::!__load();

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7312 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-05 09:44:42 +00:00
mark_story
c25ed9016a Fixed attributes being set for select elements in formHelper::dateTime() when $options[id] is specified. Closes #5013.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7306 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-03 00:46:42 +00:00
phpnut
022ffa3f4f Adding fixes for pagination on associated models.
Corrected dot notation use in Controller::paginate();

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7286 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 06:25:08 +00:00
gwoo
7ad1790ea2 removing and moving deprecated code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7285 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 06:19:04 +00:00
gwoo
67f55ba53e fixes #3869, required css for validation fields
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7242 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-23 00:07:33 +00:00
gwoo
4759a4506b better fix for #3869
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7240 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-22 19:31:44 +00:00
gwoo
d29883993e fixes #3869, form 'required' CSS when not actually required
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7239 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-22 19:16:34 +00:00
gwoo
42db64bbb3 fixes #4778, rss helper addNs, closes #4949 xml helper serialize with test case
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7227 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-21 15:23:58 +00:00
nate
f7a4858503 Correcting coding standards violations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7220 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 11:57:56 +00:00
nate
63217b7e10 Fixing failing tests in core helper group, closes #4946
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7213 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-19 14:31:00 +00:00
gwoo
73d9fec80d closes #3691, fix re added
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7208 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-18 17:23:48 +00:00
gwoo
01bf6526c4 fixes #4911, scripts for layout on cache refresh
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7197 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-15 19:48:15 +00:00
gwoo
9d950c7698 closes #4726, test cases added to show special characters in select options
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7189 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-14 21:48:57 +00:00
gwoo
8707c6861a fixes #4912, correct label "for" in time input
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7188 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-14 21:40:01 +00:00
gwoo
2756634b73 removing deprecated methods from HtmlHelper, File, and Folder
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7182 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-13 18:53:06 +00:00
gwoo
97a57a0f05 fixing bug in error handler when callbacks were moved to construct classes, moved callbacks back to dispatcher for now until we find a better place in the controller, fixed caching for the "home" page by adding check for "/', original test case was incorrect.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7177 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-12 18:36:08 +00:00
gwoo
1e231e9511 some cleanup, wrapping uses() in class exists
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7172 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-11 15:46:31 +00:00
mark_story
273dff46f1 reverting paginator helper back to parent::url. Closes #4887
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7171 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-11 12:18:54 +00:00
mark_story
0ce344d852 Minor changes to PaginatorHelper. $this->url() instead of parent::url()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7165 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-11 02:47:50 +00:00
mark_story
44159ec303 Removed all references to Router::url in all helpers. Closes #4880. Fixed failing test in RssHelper, added more tests.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7164 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-11 02:10:32 +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
TommyO
7c6cdb6354 Updated RssHelper to use XmlHelper updated in 7110. fixes #4778
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7111 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-03 22:40:35 +00:00
TommyO
546d804b10 updated XmlHelper to take advantage of Xml class to support namespaces
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7110 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-03 22:35:44 +00:00
gwoo
a13232659f updating cache with new component callback handling
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7101 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-03 05:12:12 +00:00
joelmoss
8b122d5480 OOps! Fixing typo from last commit.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7067 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 16:06:49 +00:00
joelmoss
d294e91d42 Fixing PHP error with $divOptions in FormHelper::input() when passing $option['div'] = false
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7066 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 16:05:53 +00:00
joelmoss
03322a31d7 FormHelper::submit() now accepts alternative wrapping tags, instead of a div.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7065 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 15:44:39 +00:00
joelmoss
4dfe7333b7 FormHelper::error() can now be passed the tag to wrap the error message in.
FormHelper::input() can now be passed the tag to wrap the input element in; same applies to the tag that wraps the error message.
Corrected date format in Form test testMonth().


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7064 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 15:07:32 +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
ca48055ddb Added ability to specify cdata blocks and ignore special character stripping in RssHelper. Tests updated as well. Closes #4491
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7051 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-28 02:19:55 +00:00
mark_story
027a90fab3 Implemented 'mech7' patch to AjaxHelper. Closes #2844
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7050 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-28 00:28:20 +00:00
mark_story
78e534b73b Refactored month() to take monthNames in the options array. Added options descriptions to several doc blocks. Tests updated.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7047 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-27 00:07:00 +00:00
gwoo
0bfa2f72bf fixes #4762, monthNames count
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7046 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-26 19:26:44 +00:00
mark_story
9da3e638df Applied Enhancement submitted by 'chjunior', month display can be set to numbers or translated text. Closes #4327. Tests also updated.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7039 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-24 04:00:26 +00:00
mark_story
0c164efb21 Added missing params to FormHelper doc blocks, marked private methods.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7038 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-24 02:57:48 +00:00
gwoo
7889668b6e disable callbacks in view cache by default
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7034 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 18:52:49 +00:00
gwoo
f7d07012dd cleaning up some deprecated code. renderElement is deprecated, but a the notice was removed for this release. Notice will be thrown in next release and method will be removed in the following release. Refactor of View Caching, along with addition of enabling beforeFilter and component initialize/startup callbacks. Use {{{
//set for the individual action
var $cacheAction = array('view' => array('duration' => '+1 hour', 'callbacks' => false)); 
//globally disable callbacks for all actions
var $cacheAction = array(callbacks' => false, 'view' => '+1 hour');  
//per method
$this->cacheAction = array('duration' => '+1 hour', 'callbacks' => true);
}}}

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7031 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 17:43:13 +00:00
the_undefined
52bae8a7bf Made form helper pick up field definitions outside the current context
Made form helper handle maxlength for float fields properly, fixes #4724


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7021 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 05:14:57 +00:00
nate
7402680cc1 Misc code formatting and whitespace fixes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7020 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-23 05:11:41 +00:00
joelmoss
be63f26e78 Improving documentation for HtmlHelper::tableCells()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7004 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-22 12:32:38 +00:00