mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow sending a share email to multiple users

This commit is contained in:
Joas Schilling 2015-12-07 10:49:34 +01:00
parent 884946276e
commit 5b87413792
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/share/mailnotifications.php
View File

@ -176,10 +176,12 @@ class MailNotifications {
$subject = (string)$this->l->t('%s shared »%s« with you', [$this->senderDisplayName, $filename]);
list($htmlBody, $textBody) = $this->createMailBody($filename, $link, $expiration);
$recipient = str_replace([', ', '; ', ',', ';', ' '], ',', $recipient);
$recipients = explode(',', $recipient);
try {
$message = $this->mailer->createMessage();
$message->setSubject($subject);
$message->setTo([$recipient]);
$message->setTo($recipients);
$message->setHtmlBody($htmlBody);
$message->setPlainBody($textBody);
$message->setFrom([

20
tests/lib/share/MailNotificationsTest.php
View File

@ -123,7 +123,21 @@ class MailNotificationsTest extends \Test\TestCase {
$this->assertSame([], $mailNotifications->sendLinkShareMail('lukas@owncloud.com', 'MyFile', 'https://owncloud.com/file/?foo=bar', 3600));
}
public function testSendLinkShareMailWithReplyTo() {
public function dataSendLinkShareMailWithReplyTo() {
return [
['lukas@owncloud.com nickvergessen@owncloud.com'],
['lukas@owncloud.com,nickvergessen@owncloud.com'],
['lukas@owncloud.com, nickvergessen@owncloud.com'],
['lukas@owncloud.com;nickvergessen@owncloud.com'],
['lukas@owncloud.com; nickvergessen@owncloud.com'],
];
}
/**
* @dataProvider dataSendLinkShareMailWithReplyTo
* @param string $to
*/
public function testSendLinkShareMailWithReplyTo($to) {
$message = $this->getMockBuilder('\OC\Mail\Message')
->disableOriginalConstructor()->getMock();
@ -134,7 +148,7 @@ class MailNotificationsTest extends \Test\TestCase {
$message
->expects($this->once())
->method('setTo')
->with(['lukas@owncloud.com']);
->with(['lukas@owncloud.com', 'nickvergessen@owncloud.com']);
$message
->expects($this->once())
->method('setHtmlBody');
@ -167,7 +181,7 @@ class MailNotificationsTest extends \Test\TestCase {
$this->logger,
$this->defaults
);
$this->assertSame([], $mailNotifications->sendLinkShareMail('lukas@owncloud.com', 'MyFile', 'https://owncloud.com/file/?foo=bar', 3600));
$this->assertSame([], $mailNotifications->sendLinkShareMail($to, 'MyFile', 'https://owncloud.com/file/?foo=bar', 3600));
}
public function testSendLinkShareMailException() {