averello/rainloop-webmail-mirror
1
0
Fork 0
mirror of https://github.com/RainLoop/rainloop-webmail.git synced 2026-02-05 11:34:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support for Delivery Status Notifications (DSN) #325

Browse Source
This commit is contained in:
RainLoop Team
2015-02-22 20:44:43 +04:00
parent 4eaef23cc7
commit 78219ec00d
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View File

@@ -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);

7
rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
View File

@@ -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>

1
rainloop/v/0.0.0/langs/en.ini
View File

@@ -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"