Christian Winther
cbb4f7db90
allow serialize in json and xml alias
2013-07-06 16:57:46 +00:00
Marc Würth
d9882fcc08
Fixed three @param data types
2013-07-06 16:49:21 +02:00
mark_story
a7213b2e64
Update doc block.
2013-07-05 21:25:06 -04:00
Marc Würth
85a75906d4
Minor doc block improvements
...
http://ch1.php.net/manual/de/exception.construct.php
Second parameter gets only passed by. Exception constructor uses an int for the second parameter,not a string.
Replaced text by docblock @see
http://www.phpdoc.org/docs/latest/for-users/phpdoc/tags/see.html
2013-07-06 00:27:23 +02:00
euromark
af455b4121
correct return types in doc blocks
2013-07-05 17:19:22 +02:00
euromark
ba02678693
doc block corrections
2013-07-05 16:17:23 +02:00
euromark
c478d60e79
bool to boolean
2013-07-05 16:07:29 +02:00
euromark
e7f380d2b7
doublespace to single space
2013-07-05 14:36:40 +02:00
euromark
c989624f80
whitespace coding standards
2013-07-05 14:15:18 +02:00
mark_story
fd2c096712
Update version number to 2.4.0-beta
2013-07-04 22:07:25 -04:00
mark_story
06fc8dbfc1
Update version number to 2.3.7
2013-07-04 22:05:00 -04:00
mark_story
22a198a8ba
Merge branch 'master' into 2.4
2013-07-04 21:40:51 -04:00
mark_story
c685f6ca13
Make check for ..
more specific.
...
A `..` anywhere in the classname is invalid.
2013-07-04 21:40:30 -04:00
euromark
a620fbbbb8
fix cs
2013-07-04 13:30:08 +02:00
euromark
f680c763b2
ticket-3902 - paginator and display of order via model default order
2013-07-04 13:07:14 +02:00
José Lorenzo Rodríguez
9c4775a220
Merge pull request #1393 from markstory/constant-time-login
...
Hash passwords even when users don't exist.
2013-07-03 13:49:03 -07:00
mark_story
c597855fe4
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Network/CakeRequestTest.php
2013-07-03 14:21:09 -04:00
mark_story
36d8473215
Make check for ..
more specific.
...
A `..` anywhere in the classname is invalid.
2013-07-03 14:19:39 -04:00
euromark
f389435bae
coding standards and else block simplification
2013-07-03 19:27:17 +02:00
euromark
a90cb29c0f
simplify else cases
2013-07-03 01:14:41 +02:00
euromark
7cb19b97db
coding standards and simplification of else cases as well as some minor fixes
2013-07-03 00:52:48 +02:00
Jose Lorenzo Rodriguez
58149f2315
Backporting from 2.4 fix for booleans in mysql when running PHP 5.5
2013-07-02 16:51:29 -04:30
Marc Würth
ff1f80349a
Removed superfluous break
...
In every case of the if clause it will return, so break is not needed.
2013-07-02 21:00:24 +02:00
euromark
c671d8da62
use strict comparison for strings
2013-07-02 11:01:02 +02:00
mark_story
2f57a7fb18
Use simpler and faster code.
...
substr_compare() is up to 2x slower than just substr(). Use a faster,
more common, and simpler to read variant of the same thing.
2013-07-01 23:06:56 -04:00
mark_story
521c293eb1
Fix coding standards.
2013-07-01 22:56:00 -04:00
Mark Story
9a08aeafcf
Merge pull request #1377 from ravage84/fix-for-3318
...
Trim off webroot/index.php when determining base and url.
Trimming off index.php from url and webroot/index.php from base url allows the correct values to be created when a path contains index.php in it.
Fixes #3318
2013-07-01 19:51:34 -07:00
mark_story
17e4eee73d
Hash passwords even when users don't exist.
...
Not hashing passwords when users don't exist means there is an
opportunity for timing attacks when people use blowfish or other
expensive hashing algorithms.
2013-07-01 21:52:15 -04:00
mark_story
9754789b69
Don't load classnames with ..
in their names.
...
Classnames with . in them are invalid and can be leveraged to load code
outside of an application by traversing directories.
2013-07-01 21:21:20 -04:00
Mark Story
2219991d3b
Merge pull request #1386 from nojimage/cakeemail-custom-email-validation
...
CakeEmail class be able to setting custom email validation rule.
2013-07-01 07:36:34 -07:00
Mark Story
da033cbed7
Merge pull request #1375 from dereuromark/master-cake-email
...
Move boundary calculation inside _render()
2013-07-01 06:12:24 -07:00
Mischa ter Smitten
dad1f16eaf
Made _stop() usage in Consoles / Tasks more consistent
2013-07-01 14:15:54 +02:00
Mark Story
94db8fbed6
Merge pull request #1380 from ceeram/2.4-ext
...
Set extension with multiple accept based on order in parseExtensions.
2013-06-30 19:42:50 -07:00
Marc Würth
e84bf65016
Typo in FormAuthenticate.php
2013-07-01 00:03:03 +02:00
nojimage
f6a011215c
change emailRegex to emailPattern
2013-07-01 00:03:18 +09:00
Marc Würth
f930a50805
Fix for #3318
...
Fixes https://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/3318
It seems fixing this in the htaccess file(s) isn't going to work even though a url rewriting based solution was more clean. On the plus side this works for any web server.
If a url is called with "index.php" in it then the CakeRequest swallows this part and fixes the path. Any linked url from the requested page will have a clean url. Thus after following one of these urls this problem is gone anyway.
Some code docblock improvements to CakeRequestTest.php
Added test case for fix
Also now you can call just index.php even if you have url rewriting enabled
2013-06-30 05:38:58 +02:00
mark_story
f09693f6e8
Merge branch 'master' into 2.4
2013-06-29 23:26:26 -04:00
mark_story
1d18a4f702
Fix issue where redirectURLs were not generated correctly.
...
When the first path segment matches the base path an incorrect URL was
generated. Trimming slashes off makes Router normalize the URL correctly
as the leading / implies that the base is already prepended.
Fixes #3897
2013-06-29 23:26:13 -04:00
mark_story
0d76bfe325
Add an additional test for CakeRequest::referer().
...
Trying to track down the issue for #3897 . This test coverage was
missing, so fix that.
2013-06-29 23:26:13 -04:00
nojimage
eabea1163f
CakeEmail::emailRegex() change to null default value
2013-06-30 00:51:02 +09:00
ADmad
75e7797a26
Allow escaping only attributes of a link and not it's title
2013-06-29 20:51:52 +05:30
euromark
c94fe1b729
also move protected variable resetting into the correct scope
2013-06-29 16:23:55 +02:00
euromark
b346c4af8e
Test to proof that render itself should handle the boundary.
2013-06-29 15:16:58 +02:00
nojimage
175280ad79
CakeEmail be able to setting custom email validation rule
2013-06-29 02:55:16 +09:00
nojimage
202b753c63
Add emailRegex property to CakeEmail
2013-06-29 02:44:55 +09:00
Maurits van der Schee
cd71a8439c
Add option to send email attachment from string (not only from file).
...
I would be very pleased if this option would be available in some
future version. Thank you.
2013-06-28 02:12:28 +02:00
Mark Story
b73f927787
Merge pull request #1381 from ravage84/patch-1
...
Annotated testReconnect
2013-06-27 14:59:29 -07:00
Marc Würth
aabeaada0f
Fixed @return statement in DboSource::disconnect
2013-06-27 17:38:46 +02:00
Marc Würth
9591f55394
Annotated testReconnect
2013-06-27 17:15:56 +02:00
Mark Story
6fdbdf508f
Merge pull request #1368 from planardothum/url-conformance
...
Url conformance
2013-06-27 06:31:42 -07:00
Ceeram
6a0185d7e6
Set extension with multiple accept based on order in parseExtensions, currently with multiple accepted types, no extension is set at all
2013-06-27 14:34:00 +02:00
Marc Würth
070a6f0ad5
Added a related cookbook link to DataSource.php
2013-06-26 22:07:52 +02:00
euromark
0ca1ba3211
allow callbacks to modify attachements by moving the decision to calculate boundary value into the correct position inside _render()
2013-06-26 02:20:31 +02:00
Marc Würth
2609016dfe
Changed http links to lighthouse, groups.google and github to https
...
Because they get redirected anyway and we should follow good practices.
Also in many cases similar URLs were already using https
2013-06-25 22:58:30 +02:00
euromark
ee5e8c95dd
fix issue with FormHelper and undefined variable and extract
2013-06-25 12:11:10 +02:00
euromark
290c343a74
tests to disprove that input date and partial dateFormat does not work
2013-06-25 11:54:29 +02:00
Juan Basso
19c94d0211
Fixed default datestyle for postgres tests
2013-06-25 00:15:03 -04:00
Juan Basso
accc98f55d
Resetting the datestyle to not affect other tests
2013-06-24 23:36:40 -04:00
Jose Lorenzo Rodriguez
489d1db7d1
More edge case handlignfor native_type in mysql for older versions of
...
php
2013-06-24 14:15:15 +02:00
Jose Lorenzo Rodriguez
b8bbf0b4a9
Preventing notice in older versions of php
2013-06-24 14:03:50 +02:00
Jose Lorenzo Rodriguez
f6eac9a175
Fixing boolean type introspection for Mysql in PHP 5.5
2013-06-24 13:42:29 +02:00
euromark
d6c25bd0e3
add convenience method param() for PaginatorHelper
2013-06-24 00:03:08 +02:00
José Lorenzo Rodríguez
fb111d6fd6
Merge pull request #1366 from dereuromark/2.4-unify-engine
...
unify engine to not require the suffix
2013-06-23 14:42:13 -07:00
Werner Pieterson
9383236114
Formatted code
...
Formatted code to conform to style guide
2013-06-23 19:49:17 +02:00
Werner Pieterson
b172d6e254
Fixed "delete" translation string bug
2013-06-23 18:10:29 +02:00
ADmad
3e8a7f5e66
Make ScaffoldView extend View instead of deprecated ThemeView
2013-06-22 22:05:31 +05:30
mark_story
dcf7df39d2
Merge branch 'master' into 2.4
2013-06-21 17:47:37 -04:00
mark_story
94815a74f1
Add ordering to prevent occasional pgsql failures.
2013-06-21 17:47:08 -04:00
Harold Putman
7acf162268
HTTP_HOST is not available in CLI
...
use FULL_BASE_URL instead.
2013-06-21 16:37:39 -04:00
Harold Putman
1ff77f2363
Fix subtle error in Regex matching URI scheme.
...
[+-.] will match plus, hyphen, and dot, but also comma. Use [+\-.] since commas not allowed in URI scheme.
2013-06-21 15:17:59 -04:00
Harold Putman
2fd36bdedc
Router::url should passthru //example.com/file.ext
...
The function allows ://example.com/file.ext but was treating //example.com as cake-relative URL. The updated regex matches URI schemes as defined in RFC2396. Will passthru any of these formats:
* Starts with a valid URI scheme (javascript:, https:, itunes:, ftp:)
* Starts with a '#'
* [NEW] Starts with a '?' which may be meaningless, but is as valid as starting with '#' (RFC1808)
* starts with //, or :// (:// is not technically valid, but included for compatibilty)
2013-06-21 15:10:11 -04:00
Harold Putman
cfdac5e32d
Allow plus signs in URL's to pass unscathed in Helper functions.
...
According to RFC 1738 the plus sign does not have special meaning outisde of the query part of a URL.
2013-06-21 14:24:39 -04:00
Marc Würth
2418ea0a57
Fixed typo in AuthComponent::redirectUrl
2013-06-21 16:49:31 +02:00
euromark
8141dd2d5d
unify other log types as well
2013-06-21 16:43:01 +02:00
euromark
24506dcc2c
update test for FileLog config
2013-06-21 16:39:51 +02:00
euromark
b6a2c2a982
update bootstrap config
2013-06-21 16:38:25 +02:00
euromark
cb24dbb084
unify engine to not require the suffix (as Cache and other places do).
2013-06-21 15:04:27 +02:00
mark_story
68db74d32d
Cleanup from previous commit.
...
Refs #GH-1352
2013-06-19 15:06:51 -04:00
Lucas Machado
dc3f9113b0
Fix to the date input year field
...
Create the field if no value is informed only to the maxYear and not to
the current date.
2013-06-19 15:05:15 -04:00
Mark Story
691288accc
Merge pull request #1362 from dereuromark/master-cake-session
...
cake session clarification
2013-06-18 15:05:00 -07:00
euromark
1b1943954b
CakeSession improvements
2013-06-18 23:49:42 +02:00
euromark
eb13242680
assert proper array access for _dateTimeSelected()
2013-06-18 09:39:43 +02:00
Rachman Chavik
0d486bdab4
AuthComponent: Allow suppressing authError message
...
When unauthenticated users accesses protected areas, they are greeted
with the default 'You are not allowed to access that location' which is
not desired in some cases.
This patch allows applications to suppress this message by setting
AuthComponent::authError to false bypassing the call to
SessionComponent::setFlash() altogether.
Refs: https://github.com/croogo/croogo/pull/175#discussion_r4714240
2013-06-17 09:33:59 +07:00
ADmad
12da3b1f27
Merge branch 'master' into 2.4
2013-06-16 13:07:44 +05:30
mark_story
111bfa43d4
Fix incorrect autolinking when urls end at HTML tags.
...
Fixes #3879
2013-06-15 22:01:29 -04:00
mark_story
1c358c0f53
Add tests for Model::clear()
2013-06-14 09:21:20 -04:00
Mark Story
b2a40c787d
Merge pull request #1327 from pafuinlu/patch-2
...
Added a clear() function to Model.php (2.4 branch)
2013-06-14 06:18:37 -07:00
mark_story
fe809cd85d
Remove undocumented magic features for IIS.
...
Undocumented, untested features break very easily. It is best to not
have them where possible.
2013-06-13 18:01:11 -04:00
euromark
4671f235ad
duplicate line removed
2013-06-13 14:15:00 +02:00
José Lorenzo Rodríguez
2f93d781ad
Merge pull request #1349 from renansaddam/smtpTransportReturnPath
...
Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport
2013-06-13 05:05:36 -07:00
mark_story
e2d69402e7
Remove dead view cache code.
...
Now that cache files contain the response headers, this is no longer
needed. Remove what is now duplicate code.
Refs #2358
2013-06-12 21:30:42 -04:00
Mark Story
e454f2d2a3
Merge pull request #1334 from thegallagher/2.3-cache-fix
...
Fix content-type header in cached views.
Fixes #2358
2013-06-12 18:27:42 -07:00
Mark Story
57d8c6b412
Merge pull request #1350 from dereuromark/master-post-link-doc-block
...
doc block formhelper postLink
2013-06-12 09:37:08 -07:00
euromark
b5b8885096
doc block formhelper postLink
2013-06-12 18:14:02 +02:00
Mark Story
d52c401ff2
Merge pull request #1348 from thomseddon/consistent-timestamps
...
Unify modified/created times. Both the created/updated timestamps will reflect the same point in time now.
2013-06-12 07:13:48 -07:00
Thom Seddon
305b3f4688
Unify modified/created times
...
The former implementation meant that it was not guarantee that
the times automatically generated for the modified/created fields
would be exactly the same for a given operation.
2013-06-12 13:51:56 +01:00
Renan Gonçalves
796e4b45dd
Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport.
...
The Return-Path header should not be present on the SMTP transaction, this header is set by the time of final delivery.
Quote RFC2821:
> When the delivery SMTP server makes the "final delivery" of a message, it inserts a return-path line at the beginning of the mail data. This use of return-path is required; mail systems MUST support it. The return-path line preserves the information in the from the MAIL command.
2013-06-12 11:31:49 +02:00
Rik van der Heijden
e7d2892e81
Fixed unit-test locales
2013-06-11 20:18:40 +02:00
Mark Story
eb72c709f2
Merge pull request #1344 from dereuromark/2.4-router-url
...
fix absolute url generation
2013-06-10 19:13:16 -07:00
mark_story
cd3c54bb9d
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-06-10 22:12:10 -04:00