Commit Graph

59 Commits

Author SHA1 Message Date
Branko Kokanovic 7cef9b0248 Addressing comments, array() to []
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
2018-12-17 23:34:55 +01:00
Branko Kokanovic 8101059062 Addressing comments, count to empty
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
2018-12-17 20:02:00 +01:00
Branko Kokanovic 72d97b44a7 Expose Swift Mailer streaming options in config, fixes #12702
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
2018-11-30 22:36:03 +01:00
Carsten Wiedmann 446d96f3eb
Apply patch from @cwiedmann but drop -oi option for pipe
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-11-29 16:02:35 +01:00
Roeland Jago Douma 054056a8df
Fallback to default path is sendmail can't be found
If the sendmail binary can't be found at all we fallback to the default
path.
It most likely is not there but then at least a proper error message
pops up.

Updated the tests to also properly pass.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 14:03:11 +01:00
Florian Klink 7078a0e53e
Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail
`sendmail` can very well be in a path different from
`/usr/sbin/sendmail`.

We already search `$PATH` at `lib/private/Settings/Admin/Mail.php` to
detect whether we want to offer sendmail as a mail transfer method, so
let's be consistent and actually initialize `\Swift_SendmailTransport`
with this path to sendmail, instead of just hardcoding
`/usr/sbin/sendmail`.

Signed-off-by: Florian Klink <flokli@flokli.de>
2018-11-02 13:57:43 +01:00
brad2014 3442ffeb54 Fix bug #12151: fix list formatting by correcting malformed html
Signed-off-by: Brad Rubenstein <brad@wbr.tech>
2018-10-30 15:28:55 -07:00
Julius Härtl 7a4c23a720
Use index for format string parameters
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-19 11:43:15 +02:00
Julius Härtl 185cb494c0
EMailTemplate: Move background color of buttons to the table to fix rendering in lotus notes
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-19 07:49:48 +02:00
Roeland Jago Douma be7db1573d
Swift to \Swift_Mailer as abstraction
* \Swift_Mailer handles starting the transport etc properly
* Fixed tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Roeland Jago Douma e6e6b5648a
Make swift 6 compatible
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
Morris Jobke 9ee1febf62
Provide an option to disable HTML emails
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-16 19:00:05 +02:00
Jared Boone a5b50e487e Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 is undefined.
Fixes https://github.com/nextcloud/server/issues/8387.

Signed-off-by: Jared Boone <jared.boone@gmail.com>
2018-04-05 16:09:08 -07:00
Roeland Jago Douma f6fe04f3d7
Fix comments
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 09:06:51 +01:00
Roeland Jago Douma 0c500e460f
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 09:06:51 +01:00
Roeland Jago Douma 0cef938299
Make \OCP\Mail strict
* Fix typehints
* Made strict

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 09:06:51 +01:00
Joas Schilling 350e38396f
Allow custom HTML in HTML Emails
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-15 12:09:19 +01:00
Morris Jobke cce4c285db
Fix email buttons for white theme
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:33:54 +01:00
Morris Jobke 0eebff152a
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
Joas Schilling 6a035bd0a0
Move attachment creators to mailer class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 09:26:57 +02:00
Joas Schilling 65e938c4fd
Fix docs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-19 11:18:21 +02:00
Joas Schilling dcb322a6b3
Extend the API with teh parameters from Swift
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-19 11:05:47 +02:00
Joas Schilling ce27e8cf34
Add attachment support to emails
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:44:19 +02:00
Joas Schilling c9af36a9ab
Introduce a public interface for Message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling f109c1a10c
Allow templating of email subjects
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:00 +02:00
Joas Schilling 6dbb64c4a2
Merge setMetaData into constructor
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-04 15:07:41 +02:00
Joas Schilling 09747b296a
Add meta information to emails for better customisation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-24 17:54:22 +02:00
Lukas Reschke 70d42afb93
Use non-deprecated INTL_IDNA_VARIANT_UTS46
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-09 15:12:02 +02:00
Lukas Reschke e1f52fc901
Stricter phan config fixes
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:13 +02:00
Morris Jobke 5bc0edbd29 Merge pull request #5844 from nextcloud/phpstorm_inspect2
More phpstorm inspection fixes
2017-07-24 13:54:30 +02:00
Roeland Jago Douma 5f227bd93b
More phpstorm inspection fixes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:39:29 +02:00
Morris Jobke ae13d011d1 Remove unneeded styles
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-24 11:09:14 +02:00
Lukas Reschke bb6fe6afba
Adjust to height=120
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-24 10:18:16 +02:00
Lukas Reschke ba1e16ea2e Revert "Set max-width of image to 100px in Outlook as well" 2017-07-24 10:14:47 +02:00
Morris Jobke a98f57ebd0 Set max-width of image to 100px in Outlook as well
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-23 23:15:21 +02:00
Joas Schilling 3af8abb098
Allow to overwrite the email template again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 14:23:03 +02:00
Lukas Reschke 099234cf12
Add function to request SVG or regular fallback image
Fixes https://github.com/nextcloud/server/issues/4647

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 14:51:55 +02:00
Joas Schilling f1ffb728b9
Allow meta info and icons
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 14:31:21 +02:00
Joas Schilling 35414884d3
Add lists to HTML emails
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 13:48:27 +02:00
Morris Jobke 16c4755e03
Rename renderHTML to renderHtml
* fixes #4383
* improves consistency

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 15:46:41 -05:00
Morris Jobke 269600a04f Merge pull request #4369 from nextcloud/fix-translations
Fix translations
2017-04-18 18:01:50 -05:00
Joas Schilling 1c0bffe87f
Fix translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
Lukas Reschke bae64e810e
Add instance name to default sender
Otherwise your mail program shows "foo@mail.com" instead of "Nextcloud" or whatever your instance name is.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 21:44:37 +02:00
Morris Jobke 1f962f9115
Update email template for lost password email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 15:19:53 -05:00
Joas Schilling 4b639e2763
No newlines when heading is empty
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:27 +02:00
Bjoern Schiessle 0a464dfb61
make the plain text footer standard compliant and add a space after '--'. It also adds a line break in front so that there is some spacing between the mail body and the footer
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-12 17:16:27 +02:00
Joas Schilling 1c8c62272c
Use instance name as alt-text
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
Joas Schilling 506c7731a6
Don't duplicate the sentence with the header
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
Morris Jobke 33e077c1c1
Properly escape heading, body and button text
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
Morris Jobke 050ce1d40b
Add addBodyButton to add a single button to email templates
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00