Commit graph

578 commits

Author SHA1 Message Date
ADmad
d466e00644 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30
euromark
7a287a6942 More coding standard corrections. 2014-04-29 14:19:33 +02:00
mark_story
04edb547f3 Merge branch 'master' into 2.5 2014-04-23 22:21:57 -04:00
mark_story
6f68049bf5 Reject file paths containing ...
Paths containing `..` are generally up to no good. Throw an exception,
as developers can use realpath() if they really need to get relative
paths.

Fixes #3370
2014-04-23 22:20:14 -04:00
mark_story
2333c3d535 Update docs for file().
Mention that relative paths will be prepended with APP.

Refs #3370
2014-04-23 22:15:10 -04:00
ADmad
ead494eec1 Allow setting only default layout without specifying template in email config.
Closes #3336
2014-04-22 20:02:36 +05:30
euromark
a7744e6ff4 a few more corrections 2014-04-08 01:49:33 +02:00
euromark
0ece694a75 microptimize options and default merge and other string key array merges 2014-04-08 01:25:14 +02:00
Jose Lorenzo Rodriguez
343d3279b9 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2014-04-06 21:50:41 +02:00
mark_story
4ec81542db Fix email rendering when using 2 different plugins.
When an email template and layout are in different plugins the incorrect
plugin would be used for the layout.

Fixes #3062
2014-04-04 21:45:04 -04:00
Mark Story
dea6709d89 Merge pull request #3014 from ndm2/smtp-extensibility-response-access
SMTP transport - Extensibility and response access
2014-03-23 09:24:21 -04:00
mark_story
afc8587949 Merge branch 'master' into 2.5 2014-03-18 22:12:14 -04:00
Hadrien
d55a167830 Themed CakeEmail should load view helpers with the theme set 2014-03-18 14:22:24 +01:00
mark_story
9888209e9a Add tests and fix issues with multiple trailing whitespaces.
Closes #3016
2014-03-17 13:08:46 -04:00
ADmad
961f9d7669 Merge branch 'master' into 2.5 2014-03-16 20:17:24 +05:30
ndm2
0ae225615c Match SP as per rfc2821 2014-03-15 11:47:13 +01:00
samokspv
9e15042eff changed regexp for response code
Facebook servers have now HTTP response without status string. The use 
"HTTP/1.1 200 "
while CakePHP needs 
"HTTP/1.1 200 Ok"
because preg_match() in code use + instead *
2014-03-13 19:11:14 +02:00
mark_story
7b2ac816c6 Retain the original file name so errors can be generated properly.
We should hold onto the original file so we can generate a error message
when the file is not found.

Fixes #2990
Closes #3011
2014-03-13 12:29:16 -04:00
ndm2
c1824071c9 Expose last SMTP response. 2014-03-13 16:28:54 +01:00
ndm2
5326073c80 Refactor some code into overridable methods.
This should make the transport a little more extensibility friendly.
2014-03-13 16:06:43 +01:00
mark_story
5544fcc4c2 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2014-03-03 21:20:58 -05:00
mark_story
549908738b Include the last error if available when sending with mail() fails.
When sending email using mail() include the last error if available.

Fixes #2910
2014-03-02 21:07:25 -05:00
mark_story
0f584c0e8b Merge branch 'master' into 2.5 2014-02-24 21:19:17 -05:00
Mark Story
e0e8f91d9e Merge pull request #2866 from paddythenerd/master
Unsetting url both with & w/o this->base to allow proper handling when app n...
2014-02-24 20:27:25 -05:00
Patrick Barabe
a69aeb67c1 A better fix for issue #2711. Allows url to be unset from request array regardless of this->base context 2014-02-19 13:37:01 -07:00
Patrick Barabe
a9d7792678 Unsetting url both with & w/o ->base to allow proper handling when app not hosted at server's DocumentRoot 2014-02-19 11:02:25 -07:00
Christophe Vandeplas
f018e4ff4d fixes issue #2855 where cafile is not set in HttpSocket 2014-02-18 09:39:56 +01:00
ADmad
9de3418079 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/Model/Permission.php
2014-02-11 18:17:59 +05:30
ADmad
bea30e62cb Renamed CakeRequest::onlyAllow() to CakeRequest::allowMethod().
Existing name is unintuitive and it's not easily apparent what
the method does. Closes #2803
2014-02-10 17:38:55 +05:30
Eric Martins
2793dca671 Fix ApiGen errors 2014-02-07 18:29:54 -02:00
mark_story
c1ab6fa9d1 Merge branch 'master' into 2.5 2014-01-30 10:13:37 -05:00
Walker Hamilton
df2fc07940 Grammatical fix in API docs only
Grammatical fix in API docs only

reset
2014-01-29 11:51:29 -06:00
Mark Story
6eb5a38f22 Merge pull request #2692 from jrbasso/2.5-cors
Added support to cross origin requests
2014-01-29 06:45:11 -08:00
ADmad
c093804b35 Merge branch 'master' into 2.5 2014-01-26 17:39:50 +05:30
Juan Basso
dae756c84a Added option to allowed headers 2014-01-21 15:31:05 -05:00
ber clausen
d241a06a65 Correctly remove routing url from query string.
It mostly happens when in nxing setups, because of location defined like:

try_files $uri $uri/ /app/webroot/index.php?$uri&$args;
2014-01-21 16:57:46 -02:00
Juan Basso
5d9d62ba57 Fixed doc description 2014-01-21 11:42:04 -05:00
Juan Basso
a8ea1c6b55 Fixed CS 2014-01-21 10:47:08 -05:00
Juan Basso
5d016a7dbf Fixed code for PHP 5.2 2014-01-21 09:55:11 -05:00
Juan Basso
ec7196013c Added support to cross origin requests 2014-01-21 09:44:49 -05:00
Matthew Ouyang
0536e058f9 correct the option key
documentation fix
'statusCodes' instead of 'codes'
2014-01-16 00:09:21 -05:00
Matthew Ouyang
84eb46dbdc allow additional status codes through constructor
through $options['statusCodes']
2014-01-14 11:18:57 -05:00
mark_story
3cee3b0e99 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2013-12-30 21:28:22 -05:00
euromark
2f02d0c755 Add missing pkpass mimetype 2013-12-30 01:19:09 +01:00
mark_story
99e4dbd827 Merge branch 'master' into 2.5 2013-12-23 11:58:07 -05:00
mark_story
70530135d6 Don't use FORWARDED_HOST when getting referer values.
HTTP_X_FORWARDED_HOST is supposed to be used by proxies to indicate the
original HTTP_HOST value. It has nothing to do with referer values.

Since the HTTP_X_FORWARDED_HOST is intended to replace the HOST header
in proxied setups, add a trustProxy parameter to host() and default it
to false. This maintains existing behavior and allows people to access
the proxied value.

Fixes #2537
2013-12-23 11:32:14 -05:00
ber clausen
98962806cd Double rainbow. 2013-12-22 21:47:19 -02:00
ADmad
49a9d24ca7 By default use filter_var() to valid email addresses in CakeEmail.
Refs #2477
2013-12-18 01:07:40 +05:30
mark_story
c2b8778ce8 Merge branch 'master' into 2.5 2013-12-14 17:45:49 -05:00
ADmad
87440bba87 Fixed docblock. Closes #2476 2013-12-12 11:00:29 +05:30