From 78219ec00dd97faa69aa0304efef930a1dfa3316 Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Sun, 22 Feb 2015 20:44:43 +0400
Subject: [PATCH] Support for Delivery Status Notifications (DSN) #325

---
 rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php        | 6 ++----
 .../v/0.0.0/app/templates/Views/User/PopupsCompose.html    | 7 +++++++
 rainloop/v/0.0.0/langs/en.ini                              | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index 2f48ed040..ea52cd200 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -5752,7 +5752,7 @@ class Actions
 	 * @param \RainLoop\Model\Account $oAccount
 	 * @param \MailSo\Mime\Message $oMessage
 	 * @param resource $rMessageStream
-	 * @param bool $bDsn = true
+	 * @param bool $bDsn = false
 	 * @param bool $bAddHiddenRcpt = true
 	 *
 	 * @throws \RainLoop\Exceptions\ClientException
@@ -5826,8 +5826,6 @@ class Actions
 				}
 				else if ($oSmtpClient->IsConnected())
 				{
-					$bDsn = false;
-
 					if (!empty($sFrom))
 					{
 						$oSmtpClient->MailFrom($sFrom, '', $bDsn);
@@ -5906,7 +5904,7 @@ class Actions
 		$sDraftUid = $this->GetActionParam('MessageUid', '');
 		$sSentFolder = $this->GetActionParam('SentFolder', '');
 		$aDraftInfo = $this->GetActionParam('DraftInfo', null);
-		$bDsn = '1' === $this->GetActionParam('Dsn', '0');
+		$bDsn = '1' === (string) $this->GetActionParam('Dsn', '0');
 
 		$oMessage = $this->buildMessage($oAccount, false);
 
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
index f04a2842e..d314406e7 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
@@ -60,6 +60,13 @@
 												<span class="i18n" data-i18n-text="COMPOSE/BUTTON_REQUEST_READ_RECEIPT"></span>
 											</a>
 										</li>
+										<li class="e-item" data-bind="click: function () { requestDsn(!requestDsn()); }">
+											<a class="e-link">
+												<i class="icon-checkbox-unchecked" data-bind="css: {'icon-checkbox-checked': requestDsn(), 'icon-checkbox-unchecked': !requestDsn() }"></i>
+												&nbsp;&nbsp;
+												<span class="i18n" data-i18n-text="COMPOSE/BUTTON_REQUEST_DSN"></span>
+											</a>
+										</li>
 										<li class="e-item" data-bind="click: function () { markAsImportant(!markAsImportant()); }">
 											<a class="e-link">
 												<i class="icon-checkbox-unchecked" data-bind="css: {'icon-checkbox-checked': markAsImportant(), 'icon-checkbox-unchecked': !markAsImportant() }"></i>
diff --git a/rainloop/v/0.0.0/langs/en.ini b/rainloop/v/0.0.0/langs/en.ini
index bd5f6f0e8..928b4287e 100644
--- a/rainloop/v/0.0.0/langs/en.ini
+++ b/rainloop/v/0.0.0/langs/en.ini
@@ -233,6 +233,7 @@ ATTACHMENTS_UPLOAD_ERROR_DESC = "Not all attachments have been uploaded yet."
 BUTTON_REQUEST_READ_RECEIPT = "Request a read receipt"
 BUTTON_MARK_AS_IMPORTANT = "Mark as important"
 BUTTON_OPEN_PGP = "OpenPGP (Plain Text Only)"
+BUTTON_REQUEST_DSN = "Request a delivery receipt"
 
 [POPUPS_ASK]
 BUTTON_YES = "Yes"