Commit Graph

84 Commits

Author SHA1 Message Date
John Molakvoæ 593d64d935
Merge pull request #17456 from brad2014/feature/brad2014/12391-improve-imip-mail-message-take-2 2020-09-04 19:53:02 +02:00
Brad Rubenstein 442af8c5d5 Minor cleanup: php-cs-fixer, tests, interface consistency
IMipPlugin.php Removed blank lines to make php-cs-fixer happy.
Minor cleanup:  bugs found by Psalm static checker
IEMailTemplate: The public interface to addBodyListItem also needs to include the new plainIndent parameter.
IMipPlugin: Fixes an undefined variable for events that do not have DTEND.  Also use explicit string conversion for parameters and properties in several places.

The new email template adds an additional blank line before "button" links in plain text, so the tests were fixed to include that additional blank line.

Signed-off-by: Brad Rubenstein <brad@wbr.tech>
2020-09-02 17:54:36 +02:00
Christoph Wurst 2a054e6c04
Update the license headers for Nextcloud 20
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-08-24 14:54:25 +02:00
brad2014 781359a582 iMIP email improvements (take 2)
This PR is a replacement for PR #17195. It is intended to be simpler
to review and approve, with fewer changes, some disabled by default.

It addresses issues #12391 and #13555, with the following changes:

- The plainText of iMIP emails has been upgraded as described in
issue #12391. The HTML design style has not been changed.

- Some of the HTML and plainText content has been rearranged
(simplified header language, moving the event title to from text
body to the first item in the bullet list, spelling corrections,
moving the description to the end of the list), per issue #12391.

- The interface for EMailTemplate has been extended: addBodyListItem
now takes an optional `plainIndent` parameter. Existing callers
see no change. Where new calls set the  new parameter >0, the list
item label (metaInfo) is put in column 1, and the value is indented
into column 2 (properly accounting for multiple lines, if any).

- An optional dav config setting has been added,
`invitation_list_attendees`. It defaults to 'no', leaving emails
unchanged. If set by the site admin to 'yes', then iMIP emails
include, for the organizer and each attendee, their name, email,
and a ✔︎ if they have accepted the invitation.

- Minor refactoring.

Notes:

- The labels for organizers and attendees list items are new, and
require translation/localization.

- Dav config settings are documented in the code, but not in the
Administrator's Guide.

Signed-off-by: brad2014 <brad2014@users.noreply.github.com>
2020-08-20 22:16:47 +02:00
Simon Spannagel 1fc54d3479 Fix header logo size in notification mails
Signed-off-by: Simon Spannagel <simonspa@kth.se>
2020-07-23 17:52:21 +02:00
Jan-Christoph Borchardt e981669e89
Fix notification mail tests
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-05-01 03:00:42 +02:00
Jan-Christoph Borchardt d582315c10
Notification mails: Fix some alignment details and remove shadow
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-04-30 10:15:19 +02:00
Jan-Christoph Borchardt fbef2708d0
Notification mails: Change font to native font stack
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-04-30 10:14:23 +02:00
Jan-Christoph Borchardt b38c3bfde3
Notification mails: Logo bar/box to circle so it stands nicely on its own
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-04-30 10:14:22 +02:00
Jan-Christoph Borchardt 43371c9f7c
Notification mails: Adjust vertical spacing
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-04-30 10:14:22 +02:00
Jan-Christoph Borchardt 1d5e7b3cee
Fix notification mails height issue in Nextcloud Mail
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2020-04-30 10:14:22 +02:00
Christoph Wurst cb057829f7
Update license headers for 19
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-29 11:57:22 +02:00
Tekhnee 7ee67339e0
Adhere to EMailTemplate interface in constructor call.
Email creation appears to have been refactored lately but it looks like custom template-based emails were left out.

Signed-off-by: Tekhnee <info@tekhnee.org>
2020-04-25 21:24:21 +03:00
John Molakvoæ 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
Roeland Jago Douma 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
Liam JACK 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
Christoph Wurst 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
Christoph Wurst 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
Christoph Wurst 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
Arne Hamann a16aa99586
Added Hook before Message is send
Signed-off-by: Arne Hamann <kontakt+github@arne.email>
2020-03-24 20:57:27 +01:00
Julius Härtl 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
Christoph Wurst 5bf3d1bb38
Update license headers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-05 15:38:45 +01:00
Roeland Jago Douma 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
Tomasz Paluszkiewicz 52dcc9550c
changed order of methods
Signed-off-by: Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
2019-02-26 00:24:46 +01:00
Tomasz Paluszkiewicz 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
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