Commit graph

422 commits

Author SHA1 Message Date
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
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
euromark
c94fe1b729 also move protected variable resetting into the correct scope 2013-06-29 16:23:55 +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
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
Frank de Graaf
f79a258a64 Minor optimization of CakeEmail::_wrap(). 2013-06-11 00:53:25 +03:00
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
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
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
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
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
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
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
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
euromark
6002d6913d correct doc block 2013-03-18 17:17:16 +01: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
Adam Taylor
433dd09ec4 Fix typos 2013-03-05 00:05:14 -07:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
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
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