lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-07-15 23:37:44 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Email message option for read notification. (#7669)

Browse Source 
Fixes #7668
This commit is contained in:
LorenzoFrediani-Laser 2017-04-20 21:16:01 +02:00 committed by Sébastien Ros
parent a200e35923
commit 7c725bf2ec
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Email/Activities/EmailActivity.cs
View File

@ -57,6 +57,7 @@ namespace Orchard.Email.Activities {
var replyTo = activityContext.GetState<string>("ReplyTo"); var replyTo = activityContext.GetState<string>("ReplyTo");
var bcc = activityContext.GetState<string>("Bcc"); var bcc = activityContext.GetState<string>("Bcc");
var cc = activityContext.GetState<string>("CC"); var cc = activityContext.GetState<string>("CC");
var notifyReadEmail = activityContext.GetState<bool>("NotifyReadEmail");
var parameters = new Dictionary<string, object> { var parameters = new Dictionary<string, object> {
{"Subject", subject}, {"Subject", subject},
@ -64,7 +65,8 @@ namespace Orchard.Email.Activities {
{"Recipients", recipients}, {"Recipients", recipients},
{"ReplyTo", replyTo}, {"ReplyTo", replyTo},
{"Bcc", bcc}, {"Bcc", bcc},
{"CC", cc} {"CC", cc},
{"NotifyReadEmail",notifyReadEmail }
}; };
var queued = activityContext.GetState<bool>("Queued"); var queued = activityContext.GetState<bool>("Queued");

7
src/Orchard.Web/Modules/Orchard.Email/Forms/EmailForm.cs
View File

@ -63,7 +63,12 @@ namespace Orchard.Email.Forms {
Id: "Body", Name: "Body", Id: "Body", Name: "Body",
Title: T("Body"), Title: T("Body"),
Description: T("The body of the email message."), Description: T("The body of the email message."),
Classes: new[] {"tokenized"}) Classes: new[] {"tokenized"}),
_NotifyReadEmail: New.Checkbox(
Id: "NotifyReadEmail", Name: "NotifyReadEmail",
Title: T("Notify email read"),
Checked: false, Value: "true",
Description: T("Notify when email sent gets read by the recipient."))
)); ));
if (jobsQueueEnabled) { if (jobsQueueEnabled) {

8
src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
View File

@ -118,7 +118,13 @@ namespace Orchard.Email.Services {
mailMessage.ReplyToList.Add(new MailAddress(recipient)); mailMessage.ReplyToList.Add(new MailAddress(recipient));
} }
} }
if (parameters.ContainsKey("NotifyReadEmail")) {
if (parameters["NotifyReadEmail"] is bool) {
if ((bool)(parameters["NotifyReadEmail"])) {
mailMessage.Headers.Add("Disposition-Notification-To", mailMessage.From.ToString());
}
}
}
_smtpClientField.Value.Send(mailMessage); _smtpClientField.Value.Send(mailMessage);
} }
catch (Exception e) { catch (Exception e) {