adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
18971 commits 7 branches 0 tags 44 MiB
Commit graph

776 commits

Author SHA1 Message Date
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
mark_story
71312932e8 Merge branch 'master' into 2.5 2013-11-21 21:46:21 -05:00
ber clausen
1b9bf7b0fd Always remove verify_host from SSL context. 
It is only used to be able to set ```CN_match```.
 2013-11-21 16:23:01 -02:00
ADmad
dda6080579 Merge branch 'master' into 2.5 2013-11-19 00:27:12 +05:30
Marc Würth
7cfa0116f4 Removed "PHP 5" from file header DocBlocks 
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
 2013-11-13 22:58:39 +01:00
Kim Egede Jakobsen
18e0dc95dd Remove @return from docblock (for __construct && __destruct methods) 2013-11-11 14:54:48 +01:00
Kim Egede Jakobsen
f0205f53ad Try to make same comments for constructors. 
Conflicts:
	lib/Cake/I18n/L10n.php
 2013-11-11 11:03:57 +01:00
mark_story
3c1f775ab2 Merge branch 'master' into 2.5 2013-11-09 09:37:27 -05:00
mark_story
407c420176 Remove CRLF from To headers in MailTransport. 
Like other header fields To should not contain CRLF.

Refs #2209
 2013-11-08 13:25:51 -05:00
mark_story
2e7d687b98 Merge branch 'master' into 2.5 2013-11-07 23:01:25 -05:00
Bryan Crowe
9ee5efaa2d Add missing return type 2013-11-07 22:14:11 -05:00
mark_story
145dbacb78 Fix incorrectly encoded headers in MailTransport. 
When encoded values are present in header fields, they need to have
newlines removed as leaving the newlines in place and interfere with
delivery on Qmail based SMTP servers.

Fixes #2209
 2013-11-04 22:17:21 -05:00
ADmad
d9ca148499 Merge branch 'master' into 2.5 
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
 2013-10-30 02:34:09 +05:30
Saleh Souzanchi
8844e54647 Merge remote-tracking branch 'cakephp/master' into 2.x-fix-download-multi-connection 2013-10-28 03:35:44 +03:30
Saleh Souzanchi
ab96ed56f3 fix multi connection/part downloading file 2013-10-28 01:06:33 +03:30
Saleh Souzanchi
459de09144 optimise download file 2013-10-28 01:03:06 +03:30
Saleh Souzanchi
bfde2d136f fix spell of contentType 2013-10-28 00:49:40 +03:30
Saleh Souzanchi
1f13f86367 add mkv mime file type 2013-10-28 00:14:38 +03:30
mark_story
23b23d8050 Fix delivery issues with long subject lines and MailTransport. 
A few people have reported issues sending wrapped messages via
MailTransport. Removing the new lines has been suggested as a fix.

Refs #2176
 2013-10-23 12:41:57 -04:00
Bryan Crowe
a943ea5c34 Add space between classname(s) 2013-10-22 22:59:50 -04:00
Bryan Crowe
d39ced8381 Correct 'an URL' to 'a URL' in docblocks 2013-10-22 00:09:34 -04:00
euromark
1cb24ae537 CS fixes using phpcs-fixer auto-correction. 2013-10-12 01:27:00 +02:00
Jose Lorenzo Rodriguez
df549898ad Merge remote-tracking branch 'origin/2.5' into k-halaburda-master 2013-10-12 01:05:02 +02:00
Bryan Crowe
4242bd4f3d Additional Cake references to CakePHP and docblock typo 2013-10-09 19:38:16 -04:00
mark_story
59f441e6bc Make equality checks more strict. 2013-10-08 16:29:24 -04:00
euromark
eb852a0247 Strict checks where applicable. 2013-10-08 20:16:55 +02:00
mark_story
f82b00c25e Fix content view variable being stomped by send() parameter. 
The content of send() should only be used if it is a non-empty value.

Fixes #4129
 2013-10-08 12:28:45 -04:00
Bryan Crowe
c1dd0e4393 Changed url to URL where appropriate 2013-10-07 23:17:58 -04:00
mark_story
60b0893c79 Merge branch 'master' into 2.5 2013-10-06 23:49:32 -03:00
mark_story
530731ec5d More gracefully handle invalid data in Accept headers. 
Some browsers have invalid accept headers, we should ignore the invalid
extension data as assuming it will be a qualifier can result in
incorrect results.

Fixes #4105
 2013-10-02 11:29:04 -04:00
José Lorenzo Rodríguez
06a89f128a Changing order of jpeg aliases so that mapType() returns the most common one 2013-09-28 14:24:13 +02:00
mark_story
5e9b22271a Merge branch 'master' into 2.5 2013-09-27 22:26:33 -04:00
mark_story
e96fe515a1 Rename config class used in test cases. 
Having a separate classname for testing allows the testsuite to not
provide a classname that the application would. This allows composer to
generate the correct classmap when CakePHP is installed with composer.

Fixes #4112
 2013-09-27 22:22:23 -04:00
mark_story
cc5795c67d Merge branch 'master' into 2.5 2013-09-26 10:07:10 -04:00
euromark
0ae69aace9 App::import to App::uses 2013-09-25 19:40:14 +02:00
mark_story
d2577fac60 Merge branch 'master' into 2.5 2013-09-21 20:01:50 -04:00
mark_story
809f6129e0 Update docs for HttpSocket methods. 
delete() uses the request body, not the query string.
 2013-09-17 21:17:26 -04:00
mark_story
a7a6fcae8a Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2013-09-17 10:11:24 -04:00
euromark
382f75dbfc cs corrections, bool to boolean and int to integer. 2013-09-17 14:44:34 +02:00
mark_story
ba4afcc074 Fix incorrectly encoded address fields. 
Address fields cannot contain : or " it causes a number of
mail servers/clients to be confused.

Fixes #4058
 2013-09-12 20:14:11 -04:00
mark_story
59bb05b433 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2013-09-02 11:35:09 -04:00
Alexander Hofbauer
78d5b69bec Load helpers of email view 2013-09-02 14:36:08 +02:00
mark_story
ad7563736f Expand doc blocks for CakeRequest::addDetector. 2013-08-27 09:46:59 -04:00
Calin
075bf37030 Added test case for param with options detector. 
Fix coding standards errors.
 2013-08-27 09:38:46 -04:00
Calin
cf3dfb0c66 Allow 'options' to be given as array when adding a param detector - similar to env / options. 
Allow the following when adding request detectors using CakeRequest::addDetector():

    array('param'=>'{param-name}', 'options'=>array())
 2013-08-27 11:00:32 +03:00
mark_story
0f2d59d987 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Network/CakeResponse.php
	lib/Cake/TestSuite/CakeTestCase.php
 2013-08-18 23:10:08 -04:00
mark_story
3244b9e3d7 Merge branch 'master' into 2.4 2013-08-16 14:47:01 -04:00
euromark
6cf147e8c8 unify null checks - avoid method call in favor of strict check 2013-08-16 20:12:49 +02:00
dmromanov
b4092e374d Corrected spelling 2013-08-16 14:06:36 +04:00
dmromanov
56ef44f495 Excluded method names from several tanslation strings 
Removed unnecessary sprintfs
 2013-08-16 13:42:28 +04:00
Mark Story
7c29aa5155 Merge pull request #1508 from fuga/feature/email-config 
making the config method of email-transport-classes mergable
 2013-08-15 08:26:11 -07:00
mark_story
cb6ea82fea Allow CakeEmail::template() to disable layout rendering. 
Fix the code to act as documented. Sending template('view', null) should
disable layout rendering.

Fixes #3983
 2013-08-13 14:01:33 -04:00
euromark
759c24e660 correct doc blocks as per cs 2013-08-13 12:29:20 +02:00
fuga
303261e231 making the config method of email-transport-classes mergable into the current config value. 2013-08-12 10:28:17 +09:00
José Lorenzo Rodríguez
42bb766d92 Merge pull request #1503 from tigrang/cake-response-multi-header 
Cake response multi header. Fixes #3960
 2013-08-11 12:19:26 -07:00
James Watts
f76046625b Updated doc block comment 2013-08-10 14:45:00 +02:00
James Watts
2ce2a2aaa9 Updated the handling of response status codes 
Improved API integrity by blocking the ability to set invalid status codes according to the HTTP spec. This includes any non-numeric codes, or any code that is greater or less than 3 digits in length (100-999 being the accepted range).
 2013-08-10 13:30:02 +02:00
Tigran Gabrielyan
f6e1c7ca3d Improve code readability 2013-08-09 20:26:17 -07:00
Tigran Gabrielyan
777a46ff6d Fix CS issue 2013-08-09 20:00:33 -07:00
Tigran Gabrielyan
a6e3bb37a6 Restructured CakeResponse::header() to avoid multiple returns, assignments, and calls to itself 
Added ability to send multiple values with the same type of header in CakeResponse
 2013-08-06 01:35:45 -07:00
ADmad
61bf8df454 Renaming base url config keys and methods for better uniformity. 2013-08-01 00:44:36 +05:30
Phally
6b41eaa950 Merge branch 'master' into 2.4 2013-07-26 19:44:11 +02:00
mark_story
f725779a17 Better support various ranges as described in RFC2616 
Refs #3914
 2013-07-18 11:26:55 -04:00
mark_story
e03d3df0fe Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Test/Case/View/HelperTest.php
	lib/Cake/VERSION.txt
 2013-07-17 22:40:09 -04:00
mark_story
2df873412c Add CakeResponse::location() 
This method provides an easy to use interface to get/set the location
header in a response object. This is primarily to facilitate future
development in 3.x
 2013-07-16 23:38:57 -04:00
mark_story
4d6258adeb Correct off by one error. 
Refs #3914
 2013-07-15 21:48:03 -04:00
ADmad
d161b21ae1 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
 2013-07-14 10:58:55 +05:30
mark_story
494fd05de6 Fix downloading Ranges in files. 
Correctly handle ranges that don't terminate at the end of the file.
Also reject invalid ranges as described in RFC-2616.

Thanks to Kim Biesbjerg for the initial patch.

Fixes #3914
 2013-07-11 23:20:12 -04:00
mark_story
b3273e9cc2 Correct documentation. 
Options are traditionally above the @param block as it results in easier
to read API docs.
 2013-07-11 21:00:11 -04:00
Mark Story
d992d3a626 Merge pull request #1385 from LeaseWeb/2.4 
Add option to send email attachment from string (not only from file).
 2013-07-10 10:12:07 -07:00
ADmad
4ded269549 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
	lib/Cake/VERSION.txt
 2013-07-07 12:22:12 +05:30
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
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
euromark
a90cb29c0f simplify else cases 2013-07-03 01:14:41 +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
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
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
nojimage
eabea1163f CakeEmail::emailRegex() change to null default value 2013-06-30 00:51:02 +09:00
euromark
c94fe1b729 also move protected variable resetting into the correct scope 2013-06-29 16:23:55 +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
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
ADmad
12da3b1f27 Merge branch 'master' into 2.4 2013-06-16 13:07:44 +05:30
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
mark_story
cd3c54bb9d Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-06-10 22:12:10 -04:00
Frank de Graaf
f79a258a64 Minor optimization of CakeEmail::_wrap(). 2013-06-11 00:53:25 +03:00
José Lorenzo Rodríguez
3b4a4fde31 Merge pull request #1317 from lorenzo/feature/full-base-url 
Adding App.fullbaseURL as a recognized Configure value
 2013-06-05 15:12:27 -07:00
Mark Story
59646aa30a Merge pull request #1326 from fahad19/http-patch 
convenience wrapper for HTTP PATCH in HttpSocket class.
 2013-06-04 20:54:45 -07:00
Fahad Ibnay Heylaal
679177b8f3 convenience wrapper for HTTP PATCH in HttpSocket class. 2013-06-04 22:46:15 +02:00
ADmad
3303a2cda1 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
	lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
	lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
	lib/Cake/Console/Templates/skel/Config/acl.ini.php
	lib/Cake/Console/Templates/skel/Config/acl.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/database.php.default
	lib/Cake/Console/Templates/skel/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
	lib/Cake/Console/Templates/skel/Console/cake.bat
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/Controller/AppController.php
	lib/Cake/Console/Templates/skel/Controller/PagesController.php
	lib/Cake/Console/Templates/skel/Model/AppModel.php
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
 2013-06-02 18:03:59 +05:30
Mark Story
4b7c128f04 Merge pull request #1320 from ravage84/docblock-improvements 
Improved the DocBlocks and other code cleanup
 2013-05-31 07:36:04 -07:00
Mark
525bf3b362 Merge pull request #1297 from dereuromark/master-email-wrapping 
enforce a better email wrapping to send valid emails
 2013-05-31 07:30:32 -07:00
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup 
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
 2013-05-31 00:11:19 +02:00
Jose Lorenzo Rodriguez
4bc92b822e Adding App.fullbaseURL as a recognized Configure value 2013-05-30 16:07:26 +02:00
Sebastián Marcos Arce
fe774ecc03 Update HttpSocket.php 
Add 'allow_self_signed' SSL context option.
 2013-05-30 10:06:10 -03:00
ADmad
36c592e72e Merge branch 'master' into 2.4 2013-05-26 11:23:53 +05:30
euromark
75b5a323e4 enforce a better email wrapping to send valid emails 2013-05-23 18:34:39 +02:00
mark_story
ca1f9e800e Make CakeEmail::config() merge configuration. 
This allows you to incremementally overwrite configuration and better
matches other config methods in CakePHP.

Fixes #3848
 2013-05-23 09:47:24 -04:00
mark_story
85a906c0fc Expand doc blocks. 2013-05-23 09:45:50 -04:00
ADmad
11e428bca3 Fix docblock 2013-05-23 01:02:07 +05:30
ADmad
eccdf3bf60 Ensure passing empty array to SmtpTransport::config() does not reset existing config. 
Synced args and return value with AbstractTransport::config().

Fixes #3840
 2013-05-22 11:36:31 +05:30
TAKAHASHI Kunihiko
05473fe7d0 Processing was simplified when a length of one line was smaller than CakeEmail::LINE_LENGTH_MUST 2013-05-21 10:50:46 +09:00
Mark Story
631082a2a4 Merge pull request #1284 from jmillerdesign/public-cakeemail-readfile 
Utilize File utility to base64 encode email attachments
 2013-05-20 08:19:39 -07:00
J Miller
b42a2d45e7 Remove readBase64() from File utility, since it is not commonly used. 2013-05-19 22:00:42 -07:00
ADmad
fb86859585 Merge branch 'master' into 2.4 2013-05-19 14:37:41 +05:30
J Miller
987c01856a Change variable name to be descriptive 2013-05-17 19:01:18 -07:00
TAKAHASHI Kunihiko
a562d9c04e The assembly of the message was not correctly completed in specific Japanese. 2013-05-17 18:36:53 +09:00
J Miller
4a4ca7c8d4 Make readBase64 an instance method 
Leverage the existing code in File::read() and simply add in chunking and base64 encoding.
 2013-05-16 18:56:46 -07:00
J Miller
dfdde954ea Create method readAndBase64Encode() in File utility. 
Move this utility method out of CakeEmail, which allows other Mail transports to encode files manually. Maintains BC.
 2013-05-16 13:20:59 -07:00
J Miller
f47609bd61 Allow readFile() in CakeEmail to be accessed publicly 
I needed this method while building a Transport, and saw no reason why it needed to be protected.
 2013-05-15 23:27:05 -07:00
mark_story
df872dde28 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-05-10 21:58:48 -04:00
mark_story
6017db9dc8 Add missing urlencoding to base/webroot. 
This fixes URL generation when PHP_SELF or the request path contains
special characters.
 2013-05-10 11:04:46 -04:00
ADmad
a10275fb8b Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
 2013-05-05 14:36:46 +05:30
Diego Massanti
255fe004eb Patched CakeResponse's MapType() to increase performance by reducing hundreds of is_array() and is_string() system calls 2013-05-01 09:50:29 -03:00
Mark Story
ac94d11e65 Merge pull request #1254 from dereuromark/master-spelling-corrections 
spelling corrections (a url to an URL, unify URL)
 2013-04-29 09:27:48 -07:00
euromark
ff0aa70b59 fix line length for templated emails 2013-04-29 16:18:00 +02:00
euromark
09d9efe235 spelling corrections (a url to an URL, unify URL) 2013-04-29 11:05:17 +02:00
ADmad
8135d405a3 Merge branch 'master' into 2.4 2013-04-27 18:39:30 +05:30
Mark Story
509b2b1e44 Merge pull request #1247 from DiegoMax/master 
Added missing HTTP Status 505 to CakeResponse
 2013-04-25 14:58:39 -07:00
Diego Massanti
a3d405524e Added HTTP Status 505 (Unsupported Version) to CakeResponse 2013-04-25 17:59:28 -03:00
ADmad
06a5c509c0 Merge branch 'master' into 2.4 2013-04-21 19:15:55 +05:30
mark_story
3680ee0f1f Add some docs for cookies. 2013-04-18 21:23:40 -04:00
mark_story
4d8dd12449 Add support for key => value cookies. 
This makes using simple arrays easier, and I feel it is a long standing
omission from HttpSocket.

Fixes #3771
 2013-04-18 21:22:50 -04:00
mark_story
ce04d6afa1 Add CakeRequest::isAll(). 
Provides a way to test multiple request types at the same time. And
assert that all pass. This replaces longer conditionals with a terser
syntax.

Refs #3714
 2013-04-01 21:52:22 -04:00
mark_story
d4a3594e4f Add support for is() with multiple types. 
Add ability to check if a request is one of a set number of types
by providing an array. If any type matches, then the method returns
true.

Refs #3714
 2013-04-01 21:52:15 -04:00
mark_story
3fc627c5f8 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
	lib/Cake/View/Helper/HtmlHelper.php
 2013-03-30 22:12:27 -04:00
Joel Bradshaw
ece6ac3663 Backwards compat for auth in the config array of HttpSocket::request() 
Brings functionality back in line with docs as well
 2013-03-29 15:46:42 -07:00
mark_story
041c2d289f Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/Shell.php
 2013-03-26 20:31:54 -04:00
euromark
6002d6913d correct doc block 2013-03-18 17:17:16 +01:00
mark_story
81dc4c1e85 Merge branch 'master' into 2.4 2013-03-13 20:30:25 -04:00
mark_story
cec4e8b758 Force & when creating requests. 
Some people will have entities in arg_seperator.output. Make HttpSocket
more resiliant.

Fixes #3692
 2013-03-13 20:22:58 -04:00
mark_story
8209097bc3 Merge branch 'master' into 2.4 2013-03-09 12:40:59 -05:00
Adam Taylor
433dd09ec4 Fix typos 2013-03-05 00:05:14 -07:00
mark_story
47526e8b4d Refactor code to not use extract()/compact() 2013-03-01 22:34:00 -05:00
Jad Bitar
f1b815a9bb Add scope to email logging. 2013-03-01 22:24:02 -05:00
mark_story
d1c88ebf8a Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Log/Engine/FileLog.php
	lib/Cake/Utility/Validation.php
	lib/Cake/View/Helper/HtmlHelper.php
 2013-02-24 20:24:26 -05:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
ADmad
13029cc2bc Merge branch 'master' into 2.4 2013-02-09 02:20:16 +05:30
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years. 
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
 2013-02-08 20:59:49 +09:00
mark_story
fb8c2a5e46 Make paths platform dependent. 
This fixes issues with the built-in PHP webserver on windows.

Fixes #3608
 2013-02-07 20:41:04 -05:00
mark_story
103bbbc375 Add CakeRequest::param() 
This method gives a read accessor to the data in $request->params.
It removes the need to use isset() and empty().
 2013-02-03 22:09:52 -05:00
mark_story
4af6039107 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Model/Model.php
 2013-01-26 21:16:26 -05:00
mark_story
773666ddad Fix coding standards and save a function call. 2013-01-17 20:34:25 -05:00
Mark Story
acc6a2645f Merge pull request #1039 from bfanger/master 
Fixes an issue with urls as GET parameters
 2013-01-17 17:31:59 -08:00
mark_story
9c29fab4a4 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Network/Http/HttpResponse.php
 2013-01-14 20:24:56 -05:00
U-Zyn Chua
bcdbdc8108 Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK(). Fixes #3531 2013-01-15 09:17:24 +08:00
euromark
11a88042bd fix doc block endings 2013-01-11 15:06:54 +01:00
ADmad
bacfa5a977 Fix missing controller error 2012-12-24 00:29:22 +05:30
Ceeram
3f4d24bfc0 remove unused local variables and a few improvements 2012-12-23 13:53:13 +01:00
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
Bob Fanger
b7b6859c27 Fixes corrupted CakeRequests when a $_GET value contains "://" 2012-12-21 16:12:51 +01:00
euromark
910e21e65e a few more application contents should send the charset 
adding content type tests as dataprovider
 2012-12-21 12:32:32 +01:00
mark_story
554d5794ce Merge branch 'master' into 2.3 2012-12-19 21:18:52 -05:00
mark_story
7ad11f59bb Change line length in emails. 
Use LINE_LENGTH_MUST instead of LINE_LENGTH_SHOULD. This
fixes a number of text wrapping issues caused by the narrower wrap
length.

Fixes #3151
Fixes #3473
 2012-12-17 20:54:38 -05:00
mark_story
6f5ff4d7dd Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
 2012-12-13 20:20:42 -05:00
Ceeram
53b465d64e do not pass 5th argument to mail() when in safe mode, even with a falsy value mail() will return false, fixes #3452 2012-12-13 18:22:45 +01:00
Ceeram
74836a1c30 ignore last few silencers for code sniffer 2012-12-10 17:57:22 +01:00
Ceeram
ec3e7afd75 Remove todo's whihc have been removed in e02eab05d5 
and accidentally been re-added in 3e3af1f998
 2012-12-10 17:06:06 +01:00
ADmad
72d6ca636f Docblock fixes 2012-11-29 04:36:29 +05:30
Ceeram
eadc3a75e5 fix coding standards 2012-11-21 15:39:03 +01:00
mark_story
27d7e2865e Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
 2012-11-20 23:02:33 -05:00
Mark Story
04d4abfa53 Merge pull request #965 from frederikweber/patch-1 
Send charset in Content-Type when Content is JSON.
 2012-11-19 17:08:57 -08:00
frederikweber
374dd55270 Changed else if to elseif. 2012-11-18 14:06:46 +01:00
frederikweber
9b479958f6 Send charset=UTF-8 if Content-Type is JSON. 2012-11-18 12:25:45 +01:00
frederikweber
ac0b9b285d Send charset in Content-Type when Content is JSON. 2012-11-18 11:39:17 +01:00
Ceeram
e02eab05d5 Remove all todo from core, create tickets for them 2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3 fix all warnings except TODO warnings 2012-11-14 12:56:10 +01:00
euromark
b7e75a6399 more whitespace coding standards 2012-11-14 12:36:55 +01:00
mark_story
240c8718eb Implement SSL peer verification in HttpSocket 
Use the stream API and enable SSL certificate validation. This
increases the security features of HttpSocket, and provides easy access
to the stream context options.  SSL related configuration should be
prefixed with 'ssl_'.

Refs #2270
 2012-11-11 14:23:17 -05:00
mark_story
9e725641ad Add context() to CakeSocket. 
This will help enable peer verification for HttpSocket later on.
 2012-11-10 22:58:36 -05:00
mark_story
3e3af1f998 Rename HttpResponse to HttpSocketResponse. 
This fixes long standing issues with pecl/http

Fixes #2765
 2012-11-10 22:36:38 -05:00
mark_story
60f9626838 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Test/Case/View/MediaViewTest.php
 2012-11-02 16:52:51 -04:00
mark_story
8035b37df2 Only set $request->data with PUT/DELETE when it can be decoded. 
Setting $request->data to the raw put data isn't overly useful unless it
can be decoded.  Generally $request->data is expected to be an array,
when its a string things can go funny.

Fixes #3320
 2012-10-31 21:02:47 -04:00
mark_story
b9ee4fc9f1 URL decode redirect urls. 
Some servers send url encoded Location headers. Decode location headers
before processing a redirect.

Fixes #3310
 2012-10-29 22:29:13 -04:00
mark_story
c24bec679b Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/View/Helper/FormHelper.php
 2012-10-27 21:13:53 -04:00
mark_story
528671f468 Replace Set with Hash. 2012-10-25 10:07:39 -04:00
dogmatic69
641ba9f3e6 Merge branch '2.3' into type-checks 
Conflicts:
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/Routing/Dispatcher.php
 2012-10-24 19:03:44 +01:00
mark_story
1aea9ac0c9 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Event/CakeEventManager.php
	lib/Cake/VERSION.txt
	lib/Cake/View/ViewBlock.php
 2012-10-15 21:46:49 -04:00
Adam Taylor
4090c2e932 Remove trailing whitespace from comments 
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
 2012-10-15 18:19:37 -06:00
mark_story
59f84024e5 Handle REQUEST_URI with domain names properly. 
Don't depend on parse_url() as it fails with corrupted urls.  Instead
use FULL_BASE_URL to prepare an absolute path.

Fixes #3270
 2012-10-14 11:58:07 -04:00
mark_story
1110e26483 Fix 0'th index file not being copied to $_FILES. 
Fixes #3256
 2012-10-11 08:39:46 -04:00
dogmatic69
408e619c9f Merge branch '2.3' into type-checks 
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
 2012-10-01 02:08:00 +01:00
mark_story
59e948fb1b Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
mark_story
853d866c35 Remove port numbers from Message-id domains. 
Fixes #3244
 2012-09-28 21:20:14 -04:00
euromark
b47e3a7d92 move charset/App.encoding into CakeResponse 2012-09-27 20:28:19 +02:00
Jose Lorenzo Rodriguez
d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3 
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
 2012-09-25 16:36:03 +02:00
dogmatic69
b1f26b59a3 converting if ($foo != null) to if ($foo) 2012-09-21 23:30:43 +01:00
José Lorenzo Rodríguez
2818ec6eb4 Merge pull request #859 from dereuromark/2.3-format-delta 
adding CakeNumber::formatDelta() and fixing issue with format()
 2012-09-21 00:18:35 -07:00
euromark
213d4caa85 coding standards 2012-09-20 01:50:15 +02:00
euromark
e8cfac0eec adding query() for CakeRequest 2012-09-18 19:38:53 +02:00
dogmatic69
aa87791432 replacing is_integer() with is_int() 2012-09-15 11:15:01 +01:00
dogmatic69
5cc03ca805 converting if($foo == true) to if($foo) 2012-09-14 18:54:29 +01:00
dogmatic69
22a2e1b51e converting $foo == / $foo == 0 to !$foo (and a few $foo === 0) 2012-09-14 18:42:25 +01:00
dogmatic69
cf8fccae96 converting $foo == null / $foo == false to !$foo 2012-09-14 18:26:30 +01:00
Jose Lorenzo Rodriguez
9ac5cbed36 Added MailTransport test class refs #2824 2012-09-09 15:48:14 +02:00
Kyle Robinson Young
bc40ac7d3f Remove unused variables and code 2012-09-05 17:19:13 -07:00