the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 15:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1112 from Rudloff/feature/unsubscribe

Browse source 
Add unsubscribe button
This commit is contained in:
RainLoop Team 2016-07-17 18:04:26 +03:00 committed by GitHub
parent d7ab67a460 b23d9a77c4
commit c148e19ea3
9 changed files with 53 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dev/Model/Message.jsx
View file

@ -53,6 +53,7 @@ class MessageModel extends AbstractModel
this.bcc = [];
this.replyTo = [];
this.deliveredTo = [];
this.unsubsribeLinks = [];
this.newForAnimation = ko.observable(false);
@ -141,6 +142,7 @@ class MessageModel extends AbstractModel
this.bcc = [];
this.replyTo = [];
this.deliveredTo = [];
this.unsubsribeLinks = [];
this.newForAnimation(false);
@ -246,6 +248,7 @@ class MessageModel extends AbstractModel
this.bcc = emailArrayFromJson(json.Bcc);
this.replyTo = emailArrayFromJson(json.ReplyTo);
this.deliveredTo = emailArrayFromJson(json.DeliveredTo);
this.unsubsribeLinks = json.UnsubsribeLinks;
this.subject(json.Subject);
if (isArray(json.SubjectParts))
@ -716,6 +719,7 @@ class MessageModel extends AbstractModel
this.bcc = message.bcc;
this.replyTo = message.replyTo;
this.deliveredTo = message.deliveredTo;
this.unsubsribeLinks = message.unsubsribeLinks;
this.unseen(message.unseen());
this.flagged(message.flagged());

2
dev/View/User/MailBox/MessageView.js
View file

@ -290,6 +290,7 @@ function MessageViewMailBoxUserView()
this.viewSize = ko.observable('');
this.viewLineAsCss = ko.observable('');
this.viewViewLink = ko.observable('');
this.viewUnsubscribeLink = ko.observable('');
this.viewDownloadLink = ko.observable('');
this.viewUserPic = ko.observable(Consts.DATA_IMAGE_USER_DOT_PIC);
this.viewUserPicVisible = ko.observable(false);
@ -374,6 +375,7 @@ function MessageViewMailBoxUserView()
this.viewSize(oMessage.friendlySize());
this.viewLineAsCss(oMessage.lineAsCss());
this.viewViewLink(oMessage.viewLink());
this.viewUnsubscribeLink(oMessage.unsubsribeLinks[0]);
this.viewDownloadLink(oMessage.downloadLink());
this.viewIsImportant(oMessage.isImportant());
this.viewIsFlagged(oMessage.flagged());

4
rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
View file

@ -172,7 +172,8 @@ class MailClient
\MailSo\Mime\Enumerations\Header::REPLY_TO,
\MailSo\Mime\Enumerations\Header::DATE,
\MailSo\Mime\Enumerations\Header::SUBJECT,
\MailSo\Mime\Enumerations\Header::CONTENT_TYPE
\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
\MailSo\Mime\Enumerations\Header::LIST_UNSUBSCRIBE,
), true);
}
@ -213,6 +214,7 @@ class MailClient
\MailSo\Mime\Enumerations\Header::X_CONFIRM_READING_TO,
\MailSo\Mime\Enumerations\Header::AUTHENTICATION_RESULTS,
\MailSo\Mime\Enumerations\Header::X_DKIM_AUTHENTICATION_RESULTS,
\MailSo\Mime\Enumerations\Header::LIST_UNSUBSCRIBE,
), true);
//
// return \MailSo\Imap\Enumerations\FetchType::ENVELOPE;

31
rainloop/v/0.0.0/app/libraries/MailSo/Mail/Message.php
View file

@ -157,6 +157,11 @@ class Message
*/
private $sReadReceipt;
/**
* @var array
*/
private $aUnsubsribeLinks;
/**
* @var array
*/
@ -223,6 +228,7 @@ class Message
$this->sInReplyTo = '';
$this->sReferences = '';
$this->aUnsubsribeLinks = array();
$this->iSensitivity = \MailSo\Mime\Enumerations\Sensitivity::NOTHING;
$this->iPriority = \MailSo\Mime\Enumerations\MessagePriority::NORMAL;
@ -498,6 +504,14 @@ class Message
return $this->sReadReceipt;
}
/**
* @return array
*/
public function UnsubsribeLinks()
{
return $this->aUnsubsribeLinks;
}
/**
* @return string
*/
@ -686,6 +700,23 @@ class Message
$this->sReadReceipt = \trim($oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_CONFIRM_READING_TO));
}
//Unsubscribe links
$this->aUnsubsribeLinks = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::LIST_UNSUBSCRIBE);
if (empty($this->aUnsubsribeLinks))
{
$this->aUnsubsribeLinks = array();
}
else
{
$this->aUnsubsribeLinks = explode(',', $this->aUnsubsribeLinks);
$this->aUnsubsribeLinks = array_map(
function ($link) {
return trim($link, ' <>');
},
$this->aUnsubsribeLinks
);
}
$sDraftInfo = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_DRAFT_INFO);
if (0 < \strlen($sDraftInfo))
{

2
rainloop/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
View file

@ -66,4 +66,6 @@ class Header
const X_MSMAIL_PRIORITY = 'X-MSMail-Priority';
const IMPORTANCE = 'Importance';
const X_PRIORITY = 'X-Priority';
const LIST_UNSUBSCRIBE = 'List-Unsubscribe';
}

2
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -9888,6 +9888,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
'Priority' => $mResponse->Priority(),
'Threads' => $mResponse->Threads(),
'Sensitivity' => $mResponse->Sensitivity(),
'UnsubsribeLinks' => $mResponse->UnsubsribeLinks(),
'ExternalProxy' => false,
'ReadReceipt' => ''
));
@ -9966,6 +9967,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
$mResult['DraftInfo'] = $mResponse->DraftInfo();
$mResult['InReplyTo'] = $mResponse->InReplyTo();
$mResult['UnsubsribeLinks'] = $mResponse->UnsubsribeLinks();
$mResult['References'] = $mResponse->References();
$fAdditionalExternalFilter = null;

1
rainloop/v/0.0.0/app/localization/webmail/_source.en.yml
View file

@ -102,6 +102,7 @@ en:
BUTTON_BACK: "Back"
BUTTON_CLOSE: "Close"
BUTTON_DELETE: "Delete"
BUTTON_UNSUBSCRIBE: "Unsubscribe from this list"
BUTTON_ARCHIVE: "Archive"
BUTTON_SPAM: "Spam"
BUTTON_NOT_SPAM: "Not Spam"

1
rainloop/v/0.0.0/app/localization/webmail/fr_FR.yml
View file

@ -102,6 +102,7 @@ fr_FR:
BUTTON_BACK: "Retour"
BUTTON_CLOSE: "Fermer"
BUTTON_DELETE: "Supprimer"
BUTTON_UNSUBSCRIBE: "Se désabonner de cette liste"
BUTTON_ARCHIVE: "Archive"
BUTTON_SPAM: "Indésirable"
BUTTON_NOT_SPAM: "Acceptable"

7
rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
View file

@ -147,6 +147,13 @@
<span class="i18n" data-i18n="MESSAGE/BUTTON_DELETE"></span>
</a>
</li>
<li class="e-item" role="presentation" data-bind="visible: message() && message().unsubsribeLinks[0]">
<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="link: viewUnsubscribeLink()">
<i class="icon-remove"></i>
&nbsp;&nbsp;
<span class="i18n" data-i18n="MESSAGE/BUTTON_UNSUBSCRIBE"></span>
</a>
</li>
</div>
<div data-bind="visible: allowMessageActions">
<li class="divider" role="presentation"