Commit graph

213 commits

Author SHA1 Message Date
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
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
ADmad
72d6ca636f Docblock fixes 2012-11-29 04:36:29 +05:30
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
Ceeram
56225bcca3 fix all warnings except TODO warnings 2012-11-14 12:56:10 +01: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
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
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
Jose Lorenzo Rodriguez
9ac5cbed36 Added MailTransport test class refs #2824 2012-09-09 15:48:14 +02:00
Jorge González
17db6f9d23 Merge branch '2.3' of https://github.com/cakephp/cakephp into feature/smtp-tls 2012-07-23 22:24:10 +01: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
Jorge González
55c92065c6 adding a tls option to SmtpTransport to support TLS SMTP servers like MS Exchange 2010 2012-07-21 20:28:38 +01: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
05bcc4fe58 Delete a space between ! and empty 2012-05-09 00:16:17 +09: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
212028cda2 Remove comments, and fix debug transport for email. 2011-10-23 00:23:50 +11:00
Graham Weldon
2844f4a477 Fixed sending BCC with DATA for CakeEmail, as well as 7->8bit conversion tests passing 2011-10-23 00:20:37 +11: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
Ceeram
883f579670 fixing duplicate emails being sent with MailTransport fixes #2022 2011-09-29 15:00:48 +02: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
3be9a8a5e8 debugtransport now also returns in correct format as stated in RFC 2822 2.3, updated tests 2011-08-29 11:21:46 +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
Ceeram
c93274a528 dropping first parameter for _applyConfig() 2011-08-25 16:50:30 +02:00
Ceeram
4cc5295400 more refactoring of CakeEmail 2011-08-25 16:03:39 +02:00
Ceeram
0b8a3069eb removing duplicate code, config() already applies configs now 2011-08-24 16:58:51 +02:00
Ceeram
138aae670a CakeEmail constructor now accepts $config 2011-08-17 23:15:57 +02:00
Ceeram
803cd287c2 config() will apply configs from email.php if string is passed 2011-08-17 23:11:49 +02:00
Juan Basso
895c10af7b Adjusted some types in @param, @return and @var. 2011-07-31 22:57:17 -04:00
Juan Basso
ebb70c4810 Fixed type to parameters that is defined in the code. 2011-07-31 18:03:28 -04:00
Juan Basso
fedadc091c Included @throws in API that was missing. 2011-07-31 16:55:52 -04:00
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Juan Basso
070980b170 Fixed some API doc in i18n and network. 2011-07-28 23:56:10 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Mark Story
ce7ec44298 Importing Multibyte.
Fixes fatal errors when mbstring is not installed.
2011-06-19 22:42:56 -07:00
Juan Basso
d220ee5578 Implemented the support to use helpers in CakeEmail. Fixes #1754 2011-06-19 18:43:17 -04:00
Jose Lorenzo Rodriguez
6637d2544c Adding a Debug transport class to help users test their apps when sending emails 2011-06-17 17:55:36 -04:30
Juan Basso
cb88b952f4 Supporting template/layout in plugins for CakeEmail. Fixes #1743. 2011-05-31 22:57:08 -04:00
ADmad
4c042ae133 Adding proper visibility keywords for class functions 2011-05-29 03:31:34 +05:30
Juan Basso
3812ac70cb Fixed the default name of email transport. Fixes #1728. 2011-05-24 01:01:58 -04:00
AD7six
fe2ec74b0e correct paths to Config dir 2011-05-16 21:52:25 +02:00
Jose Lorenzo Rodriguez
4ee4e426f4 Fixing more tests failing in case sensitive systems 2011-05-15 20:38:56 -04:30
AD7six
0cb70ae3bb remove CONFIGS constant 2011-05-15 18:34:52 +02:00
Juan Basso
50206f4315 Fixed invalid PhpDoc tag. 2011-04-28 21:25:18 -04:00
Juan Basso
1523ff6874 Moved the CakeEmail to Network/Email. Now this class have similar structure of HttpSocket. 2011-04-26 22:20:35 -04:00
Juan Basso
1fee549063 Ooops, removed debug call. 2011-04-19 20:25:09 -04:00
Juan Basso
e0b4623065 Added support to sender email. Fixes #13. 2011-04-19 20:24:51 -04:00
Juan Basso
1004b1a168 Fixed the set of boundary. 2011-04-19 09:22:42 -04:00
Juan Basso
3200e380d3 Created a new method to return the transport class before send. In some cases you need to do extra calls/configurations before send. 2011-04-13 00:04:37 -04:00
Juan Basso
40e8632408 Changed to translate messages using cake domain. 2011-04-12 23:37:50 -04:00
Juan Basso
935badff03 Fixed to MailTransport use configs intead Configure::read(). 2011-04-12 23:34:23 -04:00
Juan Basso
3c703641b0 Changed the use of import to uses. 2011-04-12 23:31:07 -04:00
Juan Basso
50c21ccdfe Renamed the transport files to the new structure. 2011-04-12 22:34:45 -04:00