Commit graph

127 commits

Author SHA1 Message Date
mark_story
0dfce1abf3 Add . to the list of allowed characters.
This was missed when the email validation rules were relaxed in
dc34d80f6f.

Fixes #4027
2014-07-19 19:57:33 -04:00
mark_story
adcf9ab723 Fix failing test.
CakeEmail now has a default validation pattern.

Refs #3742
2014-06-30 13:29:39 -04:00
mark_story
dc34d80f6f Relax email validation rules even more.
While filter_var() allows a number of email addresses that
Validation::email() does not, it misses out of email address that
contain IDN host names, and unicode mailboxes. Both of these are
generally deliverable, and should be permitted. filter_var() also fails
on local mailboxes like `root@localhost` which is useful in the context
of cron jobs.

Fixes #3742
2014-06-30 10:42:37 -04:00
mark_story
20ef10aca2 Fix inline attachments being broken when only sending an HTML text body.
The rel boundary was closed too early causing inline images to be
incorrectly included in the email message.

Refs #3474
2014-05-14 09:42:25 -04:00
mark_story
b8fa7ce134 Fix issues where emails would have multipart/mixed when they should not.
When sending multi-part emails with no attachments we shouldn't include
the outer multipart/mixed header as it confuses Outlook and causes it to
show the email as having attachments even though there are none.

A bunch of tests need to be adjusted as the empty multipart/mixed
container has been removed.

Fixes #3474
2014-05-13 22:03:06 -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
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
euromark
0d09a54033 more missing doc block tags added 2014-04-02 03:02:37 +02: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
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
d97cf79545 Add coverage for comma in email alias.
Closes #2381
2013-11-22 13:14:21 -05:00
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
Bryan Crowe
a943ea5c34 Add space between classname(s) 2013-10-22 22:59:50 -04: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
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
euromark
17bd465cae simplify tests 2013-09-19 00:17:21 +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
3244b9e3d7 Merge branch 'master' into 2.4 2013-08-16 14:47:01 -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
fuga
245611424f Apply ADmad's patch and update testConfig method according to a new specification. 2013-08-13 17:42:52 +09:00
Jose Lorenzo Rodriguez
9d07fc4330 Merge branch 'master' into 2.4
Conflicts:
	lib/Cake/Console/ShellDispatcher.php
	lib/Cake/Utility/CakeNumber.php
	lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
euromark
1339a9dfe1 coding standards according to new sniffer rules 2013-08-08 01:03:21 +02: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
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
nojimage
f6a011215c change emailRegex to emailPattern 2013-07-01 00:03:18 +09: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
euromark
24506dcc2c update test for FileLog config 2013-06-21 16:39:51 +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
euromark
bebb8ec416 do not translate error message in test case 2013-05-28 03:25:52 +02: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
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
ADmad
fb86859585 Merge branch 'master' into 2.4 2013-05-19 14:37:41 +05:30
TAKAHASHI Kunihiko
f541260350 Add TestCase for Network/Email/CakeEmail.php 2013-05-17 18:56:52 +09:00
TAKAHASHI Kunihiko
a562d9c04e The assembly of the message was not correctly completed in specific Japanese. 2013-05-17 18:36:53 +09: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
euromark
ff0aa70b59 fix line length for templated emails 2013-04-29 16:18:00 +02:00
Jad Bitar
f1b815a9bb Add scope to email logging. 2013-03-01 22:24:02 -05: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