From 5b87413792416beec851be7ecfcaaf2d5bb933c4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 7 Dec 2015 10:49:34 +0100
Subject: [PATCH 1/2] Allow sending a share email to multiple users

---
 lib/private/share/mailnotifications.php   |  4 +++-
 tests/lib/share/MailNotificationsTest.php | 20 +++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php
index f45d80b37ca..4d282158ba4 100644
--- a/lib/private/share/mailnotifications.php
+++ b/lib/private/share/mailnotifications.php
@@ -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([
diff --git a/tests/lib/share/MailNotificationsTest.php b/tests/lib/share/MailNotificationsTest.php
index 2124a8bf13b..0706b97233b 100644
--- a/tests/lib/share/MailNotificationsTest.php
+++ b/tests/lib/share/MailNotificationsTest.php
@@ -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() {

From 820c3b852dd478761a0ce433d0553a0f94731370 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 7 Dec 2015 12:01:02 +0100
Subject: [PATCH 2/2] Add a unit test for single user case as well

---
 tests/lib/share/MailNotificationsTest.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/lib/share/MailNotificationsTest.php b/tests/lib/share/MailNotificationsTest.php
index 0706b97233b..8684886e798 100644
--- a/tests/lib/share/MailNotificationsTest.php
+++ b/tests/lib/share/MailNotificationsTest.php
@@ -125,19 +125,21 @@ class MailNotificationsTest extends \Test\TestCase {
 
 	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'],
+			['lukas@owncloud.com', ['lukas@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']],
+			['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', ['lukas@owncloud.com', 'nickvergessen@owncloud.com']],
 		];
 	}
 
 	/**
 	 * @dataProvider dataSendLinkShareMailWithReplyTo
 	 * @param string $to
+	 * @param array $expectedTo
 	 */
-	public function testSendLinkShareMailWithReplyTo($to) {
+	public function testSendLinkShareMailWithReplyTo($to, array $expectedTo) {
 		$message = $this->getMockBuilder('\OC\Mail\Message')
 			->disableOriginalConstructor()->getMock();
 
@@ -148,7 +150,7 @@ class MailNotificationsTest extends \Test\TestCase {
 		$message
 			->expects($this->once())
 			->method('setTo')
-			->with(['lukas@owncloud.com', 'nickvergessen@owncloud.com']);
+			->with($expectedTo);
 		$message
 			->expects($this->once())
 			->method('setHtmlBody');