Merge pull request #31053 from owncloud/email-filter-filename

Filter file name when sending internal mail
owncloud · Apr 9, 2018 · c7c8b5e · c7c8b5e
2 parents d190242 + 893f104
commit c7c8b5e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/private/Share/MailNotifications.php b/lib/private/Share/MailNotifications.php
@@ -37,6 +37,7 @@
 use OCP\ILogger;
 use OCP\Defaults;
 use OCP\Util;
+use OC\Share\Filters\MailNotificationFilter;
 
 /**
  * Class MailNotifications
@@ -122,7 +123,6 @@ public function sendInternalShareMail($recipientList, $itemSource, $itemType) {
 
 			$items = $this->getItemSharedWithUser($itemSource, $itemType, $recipient);
 			$filename = trim($items[0]['file_target'], '/');
-			$subject = (string) $this->l->t('%s shared »%s« with you', [$this->senderDisplayName, $filename]);
 			$expiration = null;
 			if (isset($items[0]['expiration'])) {
 				try {
@@ -138,6 +138,15 @@ public function sendInternalShareMail($recipientList, $itemSource, $itemType) {
 				['fileId' => $items[0]['item_source']]
 			);
 
+			$filter = new MailNotificationFilter([
+				'link' => $link,
+				'file' => $filename,
+			]);
+
+			$filename = $filter->getFile();
+			$link = $filter->getLink();
+
+			$subject = (string) $this->l->t('%s shared »%s« with you', [$this->senderDisplayName, $filename]);
 			list($htmlBody, $textBody) = $this->createMailBody($filename, $link, $expiration, null, 'internal');
 
 			// send it out now

diff --git a/tests/lib/Share/MailNotificationsTest.php b/tests/lib/Share/MailNotificationsTest.php
@@ -260,7 +260,7 @@ public function testSendLinkShareMailException() {
 	}
 
 	public function testSendInternalShareMail() {
-		$this->setupMailerMock('TestUser shared »welcome.txt« with you', ['[email protected]' => 'Recipient'], false);
+		$this->setupMailerMock('TestUser shared »&lt;welcome&gt;.txt« with you', ['[email protected]' => 'Recipient'], false);
 
 		/** @var MailNotifications | \PHPUnit_Framework_MockObject_MockObject $mailNotifications */
 		$mailNotifications = $this->getMockBuilder('OC\Share\MailNotifications')
@@ -278,7 +278,7 @@ public function testSendInternalShareMail() {
 		$mailNotifications->method('getItemSharedWithUser')
 			->withAnyParameters()
 			->willReturn([
-				['file_target' => '/welcome.txt', 'item_source' => 123],
+				['file_target' => '/<welcome>.txt', 'item_source' => 123],
 			]);
 
 		$recipient = $this->getMockBuilder('\OCP\IUser')