Merge pull request #15558 from owncloud/backport-15541

[stable8] Add "Reply-To" support for sharing notifications

3 files changed, 16 insertions, 14 deletions

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 6d0a6a4e3b9..6792753954b 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -105,7 +105,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			// don't send a mail to the user who shared the file
 			$recipientList = array_diff($recipientList, array(\OCP\User::getUser()));
 
-			$mailNotification = new OC\Share\MailNotifications();
+			$mailNotification = new OC\Share\MailNotifications(\OCP\User::getUser());
 			$result = $mailNotification->sendInternalShareMail($recipientList, $itemSource, $itemType);
 
 			\OCP\Share::setSendMailStatus($itemType, $itemSource, $shareType, $recipient, true);
@@ -137,7 +137,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			$file = $_POST['file'];
 			$to_address = $_POST['toaddress'];
 
-			$mailNotification = new \OC\Share\MailNotifications();
+			$mailNotification = new \OC\Share\MailNotifications(\OCP\User::getUser());
 
 			$expiration = null;
 			if (isset($_POST['expiration']) && $_POST['expiration'] !== '') {
diff --git a/lib/private/mail.php b/lib/private/mail.php
index 6b7eec6e080..1a2025de0b2 100644
--- a/lib/private/mail.php
+++ b/lib/private/mail.php
@@ -28,10 +28,11 @@ class OC_Mail {
 	 * @param string $ccaddress
 	 * @param string $ccname
 	 * @param string $bcc
+	 * @param string $replyTo
 	 * @throws Exception
 	 */
 	public static function send($toaddress, $toname, $subject, $mailtext, $fromaddress, $fromname,
-		$html=0, $altbody='', $ccaddress='', $ccname='', $bcc='') {
+		$html=0, $altbody='', $ccaddress='', $ccname='', $bcc='', $replyTo='') {
 
 		$SMTPMODE = OC_Config::getValue( 'mail_smtpmode', 'sendmail' );
 		$SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' );
@@ -79,7 +80,9 @@ class OC_Mail {
 			if($ccaddress != '') $mailo->AddCC($ccaddress, $ccname);
 			if($bcc != '') $mailo->AddBCC($bcc);
 
-			$mailo->AddReplyTo($fromaddress, $fromname);
+			if($replyTo !== '') {
+				$mailo->addReplyTo($replyTo);
+			}
 
 			$mailo->WordWrap = 78;
 			$mailo->IsHTML($html == 1);
diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php
index 342d3d5057a..2e3f71f5990 100644
--- a/lib/private/share/mailnotifications.php
+++ b/lib/private/share/mailnotifications.php
@@ -37,6 +37,9 @@ class MailNotifications {
 	 */
 	private $from;
 
+	/** @var string Mail address used for reply to */
+	private $replyTo;
+
 	/**
 	 * @var string
 	 */
@@ -49,20 +52,16 @@ class MailNotifications {
 
 	/**
 	 *
-	 * @param string $sender user id (if nothing is set we use the currently logged-in user)
+	 * @param string $sender user id
 	 */
-	public function __construct($sender = null) {
+	public function __construct($sender) {
 		$this->l = \OC::$server->getL10N('lib');
 
 		$this->senderId = $sender;
 
 		$this->from = \OCP\Util::getDefaultEmailAddress('sharing-noreply');
-		if ($this->senderId) {
-			$this->from = \OCP\Config::getUserValue($this->senderId, 'settings', 'email', $this->from);
-			$this->senderDisplayName = \OCP\User::getDisplayName($this->senderId);
-		} else {
-			$this->senderDisplayName = \OCP\User::getDisplayName();
-		}
+		$this->replyTo = \OCP\Config::getUserValue($this->senderId, 'settings', 'email', $this->from);
+		$this->senderDisplayName = \OCP\User::getDisplayName($this->senderId);
 	}
 
 	/**
@@ -118,7 +117,7 @@ class MailNotifications {
 
 			// send it out now
 			try {
-				\OCP\Util::sendMail($to, $recipientDisplayName, $subject, $htmlMail, $this->from, $this->senderDisplayName, 1, $alttextMail);
+				\OC_MAIL::send($to, $recipientDisplayName, $subject, $htmlMail, $this->from, $this->senderDisplayName, 1, $alttextMail, '', '', '', $this->replyTo);
 			} catch (\Exception $e) {
 				\OCP\Util::writeLog('sharing', "Can't send mail to inform the user about an internal share: " . $e->getMessage() , \OCP\Util::ERROR);
 				$noMail[] = $recipientDisplayName;
@@ -145,7 +144,7 @@ class MailNotifications {
 		$failed = array();
 		foreach ($rs as $r) {
 			try {
-				\OCP\Util::sendMail($r, $r, $subject, $htmlMail, $this->from, $this->senderDisplayName, 1, $alttextMail);
+				\OC_MAIL::send($r, $r, $subject, $htmlMail, $this->from, $this->senderDisplayName, 1, $alttextMail, '', '', '', $this->replyTo);
 			} catch (\Exception $e) {
 				\OCP\Util::writeLog('sharing', "Can't send mail with public link to $r: " . $e->getMessage(), \OCP\Util::ERROR);
 				$failed[] = $r;