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
0ae69aace9
App::import to App::uses
2013-09-25 19:40:14 +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
Alexander Hofbauer
78d5b69bec
Load helpers of email view
2013-09-02 14:36:08 +02:00
mark_story
3244b9e3d7
Merge branch 'master' into 2.4
2013-08-16 14:47:01 -04:00
dmromanov
56ef44f495
Excluded method names from several tanslation strings
...
Removed unnecessary sprintfs
2013-08-16 13:42:28 +04: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
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
euromark
a90cb29c0f
simplify else cases
2013-07-03 01:14:41 +02:00
nojimage
f6a011215c
change emailRegex to emailPattern
2013-07-01 00:03:18 +09: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
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
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
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
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
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
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
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
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
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +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
ADmad
72d6ca636f
Docblock fixes
2012-11-29 04:36:29 +05:30
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
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
mark_story
71507796c7
Add docs.
2012-07-21 21:35:45 -04:00
mark_story
6ce4a3a1ec
Add tests for contentDisposition flag.
...
Fixes #3042
2012-07-21 21:22:04 -04:00
Joey Jan
9deb966657
Add ability to disable content-disposition for email attachments.
...
This solves issues with outlook and text/calendar attachments.
Refs #3042
2012-07-21 21:01:45 -04:00
euromark
3945c0e6a8
rtim files
2012-07-18 03:55:29 +02:00
Matt Hamann
a7ef245de5
Added 'helpers' to _applyConfig.
...
Allows default Helpers to be modified by EmailConfig setup.
Conflicts:
lib/Cake/Network/Email/CakeEmail.php
2012-06-22 21:44:17 -04:00
José Lorenzo Rodríguez
ed15634ccb
Merge pull request #663 from jellehenkens/api-docs-mixed-params
...
Updating @param mixed docblock lines to proper multi type @param's
2012-05-22 08:38:23 -07:00
mark_story
0ed6752110
Fix coding standards.
2012-05-21 20:29:00 -04:00
Norio Suzuki
f816f6ae1b
Supported japanese legacy charset and changed to use upper case charset in Content-Type line
2012-05-21 20:28:59 -04:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
Norio Suzuki
db20600d02
Fix SMTP Transparency (RFC5321 4.5.2. first line period)
2012-05-07 22:34:14 +00:00
mark_story
2480ee1beb
Fix coding standards.
2012-04-20 20:52:10 -04:00
euromark
a5c323064f
domain configurable for mailing in CLI environment
2012-04-20 03:38:26 +02:00
mark_story
9f9feec222
Merge branch '2.2-hash' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
a24aca6ffc
Fix a few code standards errors.
2012-04-06 22:56:01 -04:00
Norio Suzuki
26b93afc3c
fixed CakeEmail::reset, no initialized charset and headerCharset property
2012-04-01 23:42:18 +00:00
Rachman Chavik
6fa30db504
CakeEmail can use theme when rendering template
2012-03-28 22:01:30 +07:00
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
Norio Suzuki
358b84b577
Add charset() / headerCharset() methods to CakeEmail class
2012-03-16 12:54:30 +00:00
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
mark_story
a6da736149
Fix coding standards errors in Network/
2012-03-04 11:18:20 -05:00
Christopher Vrooman
585f1e2c31
Minor changes to two error messages.
2012-02-19 14:47:49 -02:00
Majna
1dbafe1d4f
Fix docblocks.
2012-02-17 13:51:20 +01:00
mark_story
0207a61e9b
Move alias wrapping into _formatAddress()
...
Fixes #2502
2012-02-11 10:16:08 -05:00
mark_story
f02a3b0531
Wrap aliases containing , in ""
...
Fixes #2502
2012-01-25 21:03:03 -05:00
mark_story
e6f5ebc257
Merge changes from hmic/CakeEmail-2.0
...
Adds parameters for file attachments instead of having
boundary prefixes in multiple places.
Fixes #GH433
2012-01-20 20:17:02 -05:00
mark_story
4d73f4e6a1
Fix boundaries used in multi-part messages.
...
Inline attachments should use the multipart/related boundary. Otherwise
sections will be incorrectly nested.
Fixes #2413
2012-01-11 20:44:42 -05:00
Hans-Joachim Michl
29cfdb4b41
Fixed wrong boundary marker for inline-files, inline-files should start new rel-boundaries, not (outer-)mixed-boundaries.
...
Amavis spits out this error:
X-Amavis-Alert: BAD HEADER MIME error: error: unexpected end of parts before epilogue
2012-01-11 20:30:49 -05:00
Mark Story
83b28c42cf
Fix failing tests and missing boundary markers.
...
When sending html + text emails, there were duplicate multipart/alternative sections
and the trailing top level boundary was missing.
2011-12-27 23:38:21 -05:00
Mark Story
0e4af546d6
Update sending attachments.
...
Both inline and external attachments, as well as mixed sets of
inline and external attachments should work now. Re-built the internals
of message rendering to remove duplication and redundant code paths.
Fixes #2413
Fixes #2320
2011-12-27 22:51:47 -05:00
Mark Story
53598c722c
Pulling out view rendering from boundary setting.
2011-12-27 22:51:47 -05:00
Mark Story
8414d37e48
Add docblock examples for attachments.
2011-12-27 22:51:47 -05:00
Kyle Robinson Young
c836ba08a3
Add/move docblocks to make text available in the API docs
2011-12-08 07:35:02 -08:00
mark_story
87f5b6cf26
Fix more strict errors.
...
Fix strict errors in test files.
Remove a test in CakeEmail as array -> string causes a notice
in PHP 5.4
2011-11-13 20:47:55 -05:00
Graham Weldon
7ed6e041b9
Changed getContentTransferEncoding to protected
2011-10-22 15:24:26 +11:00
Norio Suzuki
712822ef83
add some test for ISO-2022-JP charset mails
2011-10-20 00:18:42 +09:00
Graham Weldon
86a081463c
Added content transfer encoding detection based on charset.
2011-10-19 16:02:31 +11:00
Graham Weldon
bd291456e8
Changed CakeEmail transport to 8bit
2011-10-19 15:20:55 +11:00
Jose Lorenzo Rodriguez
b38c0e50a4
Adding configuration options to CakeEmail to set the header encoding and body encoding, also translating
...
all string from the App.encoding value to the configured charset if they differ. This makes possible to
send correctly emails in japanese charset
2011-10-16 15:43:10 -04:30
mark_story
6bf6d79979
Removing 'cake' domain from core.
...
This domain was supposed to be replaced by cake_dev.
There are a number of translations that should be App land as well.
Such as those in helpers.
Fixes #2103
2011-10-14 21:01:17 -04:00
mark_story
adcb80b5b9
Making the HtmlHelper a default helper for emails.
2011-10-01 22:55:04 -04:00
mark_story
c9bd97309f
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/configure.php
cake/libs/controller/components/email.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/email.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ViewTask.php
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Utility/InflectorTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Utility/Inflector.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper.php
lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00
Jose Lorenzo Rodriguez
b9b7516945
Merge remote-tracking branch 'ceeram/2.0-email' into 2.0
...
Conflicts:
lib/Cake/Network/Email/AbstractTransport.php
lib/Cake/Network/Email/CakeEmail.php
lib/Cake/Network/Email/DebugTransport.php
lib/Cake/Network/Email/MailTransport.php
lib/Cake/Network/Email/SmtpTransport.php
2011-08-31 17:39:41 -04:30
Ceeram
0b00fb4fe0
fixing bug in deliver(), and adding more tests
2011-08-29 17:13:41 +02:00
Ceeram
2efa3b0377
optmizing CakeEmail, and improving tests, transport class config() now returns configs array if no array is passed
2011-08-29 03:11:30 +02:00
Ceeram
9300f094a5
fixing output for logs and accept log level from configs
2011-08-26 09:33:49 +02:00
Ceeram
9e0ff5ad88
add Cakelog to send(), transport classes now all return in same format, fixing some typos
2011-08-26 02:31:18 +02:00