Commit graph

1216 commits

Author SHA1 Message Date
chinpei215
d7ae1c92e7 Backport test cases and make sure those pass 2016-10-16 22:04:24 +09:00
chinpei215
0d96b9ff64 Backport changes in SecurityComponent and FormHelper 2016-10-16 21:55:05 +09:00
mark_story
8baf193995 Fix warning in PHP 7.1
Refs #9592
2016-10-11 16:59:35 -04:00
Ashley Pinner
5f22fae1da Adding Base64 support to the HtmlHelper::image() function
Requested by cakephp/cakephp#9560
2016-10-06 09:01:15 +01:00
Mischa ter Smitten
1ccdc21d5b Possible fix for _lastAction method 2016-09-22 21:33:43 +02:00
mark_story
ad5130cd31 Merge branch '2.next' into 2.x 2016-09-18 22:22:56 -04:00
mark_story
4f70bdb3b8 The _lastAction property should not double include the base path.
FormHelper should not run URLs through Router twice when determining the
the form's lastAction attribute. However, because we're using the helper
method (see #9414) we do need to HTML decode the URL before using it in
form token generation.

Refs #9455
2016-09-13 22:21:01 -04:00
Val Bancer
5253f0b3bd fixes postLink form last action
https://github.com/cakephp/cakephp/issues/9392
2016-09-05 23:14:43 +02:00
mark_story
e8d63725d8 Merge branch '2.x' into 2.next 2016-09-04 23:54:22 -04:00
Mark van Driel
e3b0aca95e Removed bug fix for Helper::_confirm to keep the code compatible 2016-08-21 17:09:43 +02:00
Mark van Driel
34afc377ec Added support for confirm (message) option to submit in FormHelper 2016-08-20 12:51:13 +02:00
mark_story
61b3fbd605 Merge branch '2.x' into 2.next 2016-08-09 22:12:26 -04:00
antograssiot
6dbd5c659d fix api generation 2016-08-02 22:01:35 +02:00
mark_story
7c2d6ae197 Combine code paths.
At the end of both if/else arms we should have an array that can be
pushed through Hash::filter().

Refs #8654
2016-06-28 22:06:53 -04:00
nojimage
57e0a97483 refs #8654 FormHelper cleanup unlockFields key 2016-06-28 22:01:06 -04:00
mark_story
432eb9c432 Merge branch '2.x' into 2.next 2016-06-27 21:47:47 -04:00
mark_story
8c73086717 Fix PHPCS error. 2016-05-25 23:05:12 +02:00
mark_story
e78af35af7 Only clear the unlocked fields on end().
Doing this work on end() allows fields to be unlocked before the form is
created which can be helpful.

Refs #8880
2016-05-25 23:04:53 +02:00
Mark Story
b15560ea0c Merge pull request #8880 from nojimage/form-unlockfields-2x
Reset FormHelper::$_unlockFields for 2.x
2016-05-25 22:59:25 +02:00
mark_story
d5d46e21bd Fix indentation. 2016-05-22 16:39:49 -04:00
nojimage
850305a384 fixes reset FormHelper::$_unlockFields 2016-05-21 13:33:20 +09:00
xhs345
eeefa03546 Updated Radio and Inputs form helper
Also added UnitTest for radio fieldset class-name
2016-05-19 17:28:47 -07:00
xhs345
615be3ad14 Fix for Issue #8847
Add attribute 'fieldset' to Form->radio
2016-05-18 10:53:06 -07:00
mark_story
12c6fd4e22 Merge branch '2.x' into 2.next 2016-05-02 21:58:41 -04:00
schrolli
0de87cd74e Added also datetime, since it can have microseconds, too 2016-05-02 17:11:28 +02:00
mark_story
ade9d8a811 Restore backwards compatibility with old 2.x in FormHelper.
Restore the behavior of the string 'action' option to its former glory.
While we've deprecated this it needs to continue working as it did
before.

Refs #8628
2016-05-01 22:21:23 -04:00
schrolli
40b812e391 added field type "time" sothat no "maxlength" attribute is set for
the text-input element. This is neccessary when a "length" is
specified for a time-database-field. This length dictates the amount
of decimal digits, eg. milliseconds, and not the overall character size.
2016-05-01 05:56:50 +02:00
mscherer
dda9e83ab6 Refactor Object to CakeObject for future PHP7 comp. 2016-04-08 14:33:26 +02:00
mark_story
1333cc4b3e Merge branch 'postlink-token' into 2.x
Fix inline postLink() calls corrupting the containing form's tampering
token.

Refs #8387
2016-04-01 23:08:41 -04:00
mark_story
745f3a33e6 Fix boolean values in select widgets.
Boolean `false` should be treated like `0` when comparing option values.

Refs #8468
2016-03-15 22:59:03 -04:00
Markus Bauer
95558d0bba Data passed through FormHelper::postLink is excluded from CSRF creation of an outer form. Subsequent fix for #8387. 2016-03-02 03:02:43 +01:00
Markus Bauer
7df96b3912 Creating correct CSRF tokens when using FormHelper::postLink within another form. Fixes #8387 2016-03-02 02:51:06 +01:00
mark_story
3b5a71df37 Merge branch '2.7' into 2.8 2016-01-28 21:51:59 -05:00
Edgaras Janušauskas
fde1d08b43 Fix PHPDoc @return by replacing $this to self 2016-01-28 23:10:42 +02:00
ADmad
a890d76990 Merge pull request #8107 from ndm2/2.7-fix-post-link-description
2.7 - Fix `FormHelper::postLink()` description.
2016-01-26 18:38:29 +05:30
ndm2
4e58d595ae Fix FormHelper::postLink() description.
Update description with a short explanation that considers the
`inline` and `block` options.
2016-01-26 10:59:03 +01:00
mark_story
d773644232 Merge branch '2.7' into 2.8 2016-01-12 22:14:16 -05:00
Mark Scherer
8423c004b9 Invert condition to avoid else. 2016-01-07 10:51:34 +01:00
Mark Scherer
b1f1003ebe Allow 3.x backport of url=>false in 2.x 2016-01-07 10:48:20 +01:00
Mark S
daca52e37c Use is_array() check 2016-01-06 18:05:01 +01:00
Mark Scherer
cd59ab9c40 Fix tests 2016-01-04 15:08:31 +01:00
Mark Scherer
a2ce6c8c1f Deprecate action in Form::create() 2016-01-04 14:22:40 +01:00
mark_story
4de92123fa Back port fixes from #7899 to 2.x
Fix XmlView failing when return => domdocument is used.
2016-01-03 22:08:09 -05:00
mark_story
7c2ec5b451 Merge branch '2.7' into 2.8 2015-12-27 10:51:41 -05:00
mark_story
72b98f58a8 Backport paginator changes for string integers.
Backport the intent of #7845 into 2.x. The implementation differs a bit
from 3.x but paginator helper internals are pretty different in both
branches.

Refs #7092
2015-12-26 22:52:57 -05:00
mark_story
48450e71fa Merge branch '2.7' into 2.8 2015-11-11 22:53:45 -05:00
mark_story
1a6f733286 Merge branch '27-pages-fix' into 2.7 2015-11-05 22:30:25 -05:00
mark_story
5e60cc5d18 Fix plugin view names being able to escape the plugin root directory.
Remove the ability to specify completely arbitrary view files. This is
possibly a breaking change. However, I feel the risks out weigh the
benefits in this situation. Now absolute paths must be located *within*
a configured view path.
2015-11-01 22:04:15 -05:00
Marc Würth
58316b3a58 Specify type hint
Plus fix two typos.
2015-10-27 16:47:48 +01:00
Mark Scherer
8287981855 Make sure direction values are lowercased to be consistent. 2015-10-26 23:20:30 +01:00
mark_story
7bf6768066 Merge pull request #7516 into 2.7
PaginatorHelper::meta() skips url parameters (passed and named) which
results in urls not respecting defined routes.  It means
PaginatorHelper::meta() does not generate same urls as
PaginatorHelper::prev() & PaginatorHelper::next().

Refs #7516
2015-10-10 22:31:15 -04:00
Marc Würth
ed410dd12c Do not mix void with other return types
Inspired by #7527
2015-10-10 15:49:00 +02:00
Mohsen
f57cdb7568 PaginatorHelper::meta() skips url parameters and disrespects defined routes
PaginatorHelper::meta() skips url parameters (passed and named) which results in urls not respecting defined routes.
It means PaginatorHelper::meta() does not generate same url as PaginatorHelper::prev() & PaginatorHelper::next().
2015-10-07 15:07:37 +03:30
mark_story
506051f688 Correct input generation for postgres numeric types.
Numeric types in postgres are treated like decimals, except they can
have no length, precision or scale components defined.

IE does not accept 1.00000 as a valid step attribute so we'll default to
any when we encounter decimal types with no length.

Refs #7497
2015-10-01 21:46:21 -04:00
Mark Story
12f5aee5a2 Merge pull request #7447 from ravage84/2.7-lib-improvements
Various improvements to the CakePHP lib files
2015-09-25 12:14:00 -04:00
Marc Würth
1267586f23 Re-add closing tags to ctp files
Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444715
2015-09-25 18:10:18 +02:00
Marc Würth
e690662f0e Various improvments to the CakePH Plib files
Mostly CS, doc blocks and explicit returning nulls.
2015-09-25 17:11:20 +02:00
mark_story
9eafde13d2 Set the key variable in the SessionHelper.
This fixes cross template compatibility between the Flash and Session
helpers.

Refs #7365
2015-09-09 22:08:49 -04:00
mark_story
143c34bdc1 Handle case where a visible input shares a name with an invisible one.
If a visible input is created *after* a hidden input was created, the
form would always blackhole unless the visible input had the same value
as the hidden input.

Refs #7274
2015-08-22 23:10:44 -04:00
Mark Scherer
f154a8f4d7 Fix MediaView extension handling as documented and expected. 2015-08-21 12:35:49 +02:00
mark_story
0df0f1a559 Don't use short tags.
They are not broadly supported before PHP 5.4 and we should escape all
the content the core templates output.
2015-08-20 22:36:09 -04:00
mattmemmesheimer
70feb52f73 Changing the default layout to use FlashComponent::render instead of the deprecated SessionComponent::flash. Changing the flash elements to retain the id attribute that was previously present. Also fixing file permissions on the template files I added. 2015-08-20 20:19:22 -05:00
mattmemmesheimer
7d5e6e3a3e Reverting accidental chmod. 2015-08-19 17:50:47 -05:00
mattmemmesheimer
0df7bcd26d Adding Flash element template files. 2015-08-16 17:55:03 -05:00
Mark Story
de4b44a37b Merge pull request #7077 from dereuromark/2.7-static
Replacing self with static due to PHP5.3+. Following #7040.
2015-07-23 22:27:37 -04:00
mark_story
b3a192add0 Add warning for irregular method.
Refs #7096
2015-07-23 21:49:22 -04:00
Yoshiyuki Kinjo
00919c5f01 Fix FormHelper::input ignoring value option.
Signed-off-by: mark_story <mark@mark-story.com>

Backport fixes from #7082 to 2.7
2015-07-22 22:00:20 -04:00
Mark Scherer
52e79987a2 Replacing self with static due to PHP5.3+. Following #7040. 2015-07-21 10:22:53 +02:00
mark_story
47378427e3 Merge branch '2.6' into 2.7 2015-07-11 21:25:26 -04:00
Marc Würth
4a131bdcbf Capitalize Windows, the OS 2015-07-09 15:54:03 +02:00
mark_story
cbd45f702d Make FlashComponent/FlashHelper more backwards compatible.
Merge branch 'issue-6874' into 2.7.

Make AuthComponent use FlashComponent, and make FlashHelper more
compatible with SessionHelper::setFlash().
2015-06-26 22:05:32 -04:00
mark_story
ae2ea1ea6c Merge branch '2.6' into 2.7 2015-06-25 21:50:47 -04:00
Highstrike
8257100f54 How about this? 2015-06-24 15:46:48 +03:00
Highstrike
ef1fc7dfef PHPCS 2015-06-24 15:18:57 +03:00
Highstrike
833c747b41 Test append PR to Issue
This commit fixes #6874
2015-06-24 14:18:14 +03:00
Highstrike
7cdf19363d Tab instead of space
IDE preference
2015-06-24 14:09:32 +03:00
Highstrike
58983f717a 2.7.0-RC Auth doesn't use the new Flash component
Changed 'Flash.' to 'Message.' and also provided backwards compatibility
in FlashHelper->render
2015-06-24 14:06:35 +03:00
Mark Scherer
6e5381a4e3 Cleanup method calls. 2015-06-20 23:27:32 +02:00
mark_story
664ba53c89 Merge branch '2.6' into 2.7 2015-06-20 10:03:14 -04:00
Mark Scherer
1d03d5bd59 Consolidate template whitespace 2015-06-20 05:10:35 +02:00
mark_story
705f44e30a Fix regression where attributes were created with no whitespace. 2015-06-19 22:00:27 -04:00
Mark Scherer
7dedf7f86d Refactor cleanly. 2015-06-17 11:38:42 +02:00
Mark Scherer
2d7487d33c img tag needs manual space 2015-06-17 11:34:03 +02:00
Mark Scherer
51d75bc2be Remove overhead whitespace in templates. 2015-06-17 11:04:04 +02:00
Mark Scherer
ccac3b3e06 Allow deep options for radio() just as for select(). 2015-06-16 13:23:51 +02:00
mark_story
d7d8b90986 Merge branch '2.6' into 2.7 2015-05-28 19:34:59 -04:00
Mark Scherer
29747995dc Add missing minimizable HTML attributes 2015-05-18 18:10:02 +02:00
Mark Scherer
4915e802c1 Fix tableCells() 2015-05-02 16:52:51 +02:00
Mark Scherer
ed21f84236 Backport _xmlOptions 2015-05-02 14:24:02 +02:00
Mark Scherer
adf2eb03f2 Backport jsonOptions 2015-04-30 15:51:13 +02:00
mark_story
345d8d8390 Merge branch '2.6' into 2.7 2015-04-29 19:54:53 -04:00
Mark Scherer
c31fcd6f39 Correct default value to false. 2015-04-21 14:32:34 +02:00
Mark Scherer
8cdf222cc0 Also fix hour() 2015-04-20 22:04:33 +02:00
Mark Scherer
a9ae7fd5bb Fix year form field when magic input wrapper is used.
s
2015-04-20 18:31:00 +02:00
mark_story
3151c53255 Merge branch '2.6' into 2.7 2015-03-23 22:50:09 -04:00
mark_story
744952e344 Fix FormHelper::create() dropping 0 value parameter.
When 0 is the first passed parameter we shouldn't drop it.

Fixes #6107
2015-03-19 21:15:20 -04:00
José Lorenzo Rodríguez
277f641108 Merge pull request #6064 from robmcvey/jsonView
2.6 jsonView should throw exception if json_encode fails
2015-03-18 10:01:40 +01:00
mark_story
6df7bf9c21 Fix notice errors in pagination link generation.
No errors should be emitted when creating links for models that were not
paginated.

Refs #6090
2015-03-17 22:19:17 -04:00
Rob McVey
d94e05cf76 Assert exception msg contains UTF-8
The different versions of PHP throw several various messages for UTF-8
sequences, so this just performs a basic regex check
2015-03-15 11:01:51 +00:00
Rob McVey
5002bd4dbe Use fall back json_last_error_msg 2015-03-14 09:21:15 +00:00