36f9ad32f2
Merge pull request #20447 from liamjack/fix/13287/welcome_email
...
Increase max-height on button in welcome email template
2020-04-17 09:42:49 +02:00
bb4dedb015
Provide the proper language to the mailer
...
Else we can't properly translate the footer in the recipients e-mail
language.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-04-16 09:04:13 +02:00
301335e9e1
Fix #13287 - Increase max-height on button in welcome email template
...
Signed-off-by: Liam JACK <liamjack@users.noreply.github.com>
2020-04-12 13:07:16 +02:00
caff1023ea
Format control structures, classes, methods and function
...
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.
This also removes and empty lines from method/function bodies at the
beginning and end.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 14:19:56 +02:00
f4c09f299d
Make sure there is exactly one newline after imports
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:14:31 +02:00
1a9330cd69
Update the license headers for Nextcloud 19
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-31 14:52:54 +02:00
a16aa99586
Added Hook before Message is send
...
Signed-off-by: Arne Hamann <kontakt+github@arne.email>
2020-03-24 20:57:27 +01:00
76a706738b
Do not use the instance name as user part of from mail addresses
...
This will cause issues since the theming name can contain characters
that are not allowed in the local part of the mail address (like spaces)
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-12 14:20:03 +01:00
5bf3d1bb38
Update license headers
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-05 15:38:45 +01:00
68748d4f85
Some php-cs fixes
...
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-22 20:52:10 +01:00
52dcc9550c
changed order of methods
...
Signed-off-by: Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
2019-02-26 00:24:46 +01:00
65853a3314
fix(EMailTemplate): malformed HTML in some cases
...
when an addBodyListItem() is not directly followed by addBodyButton(), resulting HTML is broken
Signed-off-by: Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
2019-02-24 20:14:59 +01:00
7cef9b0248
Addressing comments, array() to []
...
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
2018-12-17 23:34:55 +01:00
8101059062
Addressing comments, count to empty
...
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
2018-12-17 20:02:00 +01:00
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
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
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
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
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
7a4c23a720
Use index for format string parameters
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-19 11:43:15 +02:00
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
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
e6e6b5648a
Make swift 6 compatible
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-04 08:28:33 +02:00
9ee1febf62
Provide an option to disable HTML emails
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-16 19:00:05 +02:00
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
f6fe04f3d7
Fix comments
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 09:06:51 +01:00
0c500e460f
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 09:06:51 +01:00
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
350e38396f
Allow custom HTML in HTML Emails
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-15 12:09:19 +01:00
cce4c285db
Fix email buttons for white theme
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:33:54 +01:00
0eebff152a
Update license headers
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
6a035bd0a0
Move attachment creators to mailer class
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 09:26:57 +02:00
65e938c4fd
Fix docs
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-19 11:18:21 +02:00
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
ce27e8cf34
Add attachment support to emails
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:44:19 +02:00
c9af36a9ab
Introduce a public interface for Message
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
f109c1a10c
Allow templating of email subjects
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:00 +02:00
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
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
70d42afb93
Use non-deprecated INTL_IDNA_VARIANT_UTS46
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-09 15:12:02 +02:00
e1f52fc901
Stricter phan config fixes
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:13 +02:00
5bc0edbd29
Merge pull request #5844 from nextcloud/phpstorm_inspect2
...
More phpstorm inspection fixes
2017-07-24 13:54:30 +02:00
5f227bd93b
More phpstorm inspection fixes
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:39:29 +02:00
ae13d011d1
Remove unneeded styles
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-24 11:09:14 +02:00
bb6fe6afba
Adjust to height=120
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-24 10:18:16 +02:00
ba1e16ea2e
Revert "Set max-width of image to 100px in Outlook as well"
2017-07-24 10:14:47 +02:00
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
3af8abb098
Allow to overwrite the email template again
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 14:23:03 +02:00
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
f1ffb728b9
Allow meta info and icons
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 14:31:21 +02:00
John Molakvoæ
Roeland Jago Douma
Liam JACK
Christoph Wurst
Arne Hamann
Julius Härtl
Tomasz Paluszkiewicz
Branko Kokanovic
Carsten Wiedmann
Florian Klink
brad2014
Morris Jobke
Jared Boone
Joas Schilling
Lukas Reschke