Skip to content

New emails for sharebymail #4307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 9 commits into from
Apr 12, 2017
Merged

New emails for sharebymail #4307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
050ce1d
Add addBodyButton to add a single button to email templates
MorrisJobke Apr 11, 2017
33e077c
Properly escape heading, body and button text
MorrisJobke Apr 11, 2017
d0bae44
Use new email design for sharebymail emails
MorrisJobke Apr 11, 2017
506c773
Don't duplicate the sentence with the header
nickvergessen Apr 12, 2017
1c8c622
Use instance name as alt-text
nickvergessen Apr 12, 2017
0a464df
make the plain text footer standard compliant and add a space after '…
schiessle Apr 12, 2017
4b639e2
No newlines when heading is empty
nickvergessen Apr 12, 2017
983210d
Dont add click-button text for plaintext mails
nickvergessen Apr 12, 2017
ae4c289
Fix unit tests
MorrisJobke Apr 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 40 additions & 60 deletions apps/sharebymail/lib/ShareByMailProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,42 +260,35 @@ protected function sendMailNotification($filename, $link, $owner, $initiator, $s
}

$message = $this->mailer->createMessage();
$htmlBody = $this->createMailBody('mail', $filename, $link, $ownerDisplayName, $initiatorDisplayName);
$textBody = $this->createMailBody('altmail', $filename, $link, $ownerDisplayName, $initiatorDisplayName);
$message->setTo([$shareWith]);
$message->setSubject($subject);
$message->setBody($textBody, 'text/plain');
$message->setHtmlBody($htmlBody);
$this->mailer->send($message);

}
$emailTemplate = $this->mailer->createEMailTemplate();

/**
* create mail body
*
* @param $filename
* @param $link
* @param $owner
* @param $initiator
* @return string plain text mail
* @throws HintException
*/
protected function createMailBody($template, $filename, $link, $owner, $initiator) {

$mailBodyTemplate = new Template('sharebymail', $template, '');
$mailBodyTemplate->assign ('filename', \OCP\Util::sanitizeHTML($filename));
$mailBodyTemplate->assign ('link', $link);
$mailBodyTemplate->assign ('owner', \OCP\Util::sanitizeHTML($owner));
$mailBodyTemplate->assign ('initiator', \OCP\Util::sanitizeHTML($initiator));
$mailBodyTemplate->assign ('onBehalfOf', $initiator !== $owner);
$mailBody = $mailBodyTemplate->fetchPage();

if (is_string($mailBody)) {
return $mailBody;
$emailTemplate->addHeader();
$emailTemplate->addHeading($this->l->t('%s shared »%s« with you', [$ownerDisplayName, $filename]), false);

if ($owner === $initiator) {
$text = $this->l->t('%s shared »%s« with you.', [$ownerDisplayName, $filename]);
} else {
$text= $this->l->t('%s shared »%s« with you on behalf of %s.', [$ownerDisplayName, $filename, $initiator]);
}

throw new HintException('Failed to create the E-mail',
$this->l->t('Failed to create the E-mail'));
$emailTemplate->addBodyText(
$text . ' ' . $this->l->t('Click the button below to open it.'),
$text
);

$emailTemplate->addBodyButton(
$this->l->t('Open »%s«', [$filename]),
$link
);
$emailTemplate->addFooter();

$message->setTo([$shareWith]);
$message->setSubject($subject);
$message->setBody($emailTemplate->renderText(), 'text/plain');
$message->setHtmlBody($emailTemplate->renderHTML());
$this->mailer->send($message);

}

/**
Expand All @@ -316,39 +309,26 @@ protected function sendPassword($filename, $initiator, $shareWith, $password) {
$subject = (string)$this->l->t('Password to access »%s« shared to you by %s', [$filename, $initiatorDisplayName]);

$message = $this->mailer->createMessage();
$htmlBody = $this->createMailBodyToSendPassword('mailpassword', $filename, $initiatorDisplayName, $password);
$textBody = $this->createMailBodyToSendPassword('altmailpassword', $filename,$initiatorDisplayName, $password);
$message->setTo([$shareWith]);
$message->setSubject($subject);
$message->setBody($textBody, 'text/plain');
$message->setHtmlBody($htmlBody);
$this->mailer->send($message);

}
$emailTemplate = $this->mailer->createEMailTemplate();

/**
* create mail body to send password to recipient
*
* @param string $filename
* @param string $initiator
* @param string $password
* @return string plain text mail
* @throws HintException
*/
protected function createMailBodyToSendPassword($template, $filename, $initiator, $password) {
$emailTemplate->addHeader();
$emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]));

$mailBodyTemplate = new Template('sharebymail', $template, '');
$mailBodyTemplate->assign ('filename', \OCP\Util::sanitizeHTML($filename));
$mailBodyTemplate->assign ('password', \OCP\Util::sanitizeHTML($password));
$mailBodyTemplate->assign ('initiator', \OCP\Util::sanitizeHTML($initiator));
$mailBody = $mailBodyTemplate->fetchPage();
$emailTemplate->addBodyText($this->l->t(
'%s shared »%s« with you. You should have already received a separate mail with a link to access it.',
[$initiatorDisplayName, $filename]
));
$emailTemplate->addBodyText($this->l->t('It is protected with the following password: %s', [$password]));

if (is_string($mailBody)) {
return $mailBody;
}
$emailTemplate->addFooter();

$message->setTo([$shareWith]);
$message->setSubject($subject);
$message->setBody($emailTemplate->renderText(), 'text/plain');
$message->setHtmlBody($emailTemplate->renderHTML());
$this->mailer->send($message);

throw new HintException('Failed to create the E-mail',
$this->l->t('Failed to create the E-mail'));
}


Expand Down
36 changes: 0 additions & 36 deletions apps/sharebymail/templates/altmail.php
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions apps/sharebymail/templates/altmailpassword.php
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions apps/sharebymail/templates/mail.php
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions apps/sharebymail/templates/mailpassword.php
View file
Open in desktop

This file was deleted.

Loading