Email message option for read notification. (#7669)

Fixes #7668
OrchardCMS · Apr 20, 2017 · 7c725bf · 7c725bf
1 parent a200e35
commit 7c725bf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Activities/EmailActivity.cs b/src/Orchard.Web/Modules/Orchard.Email/Activities/EmailActivity.cs
@@ -57,14 +57,16 @@ public override IEnumerable<LocalizedString> Execute(WorkflowContext workflowCon
             var replyTo = activityContext.GetState<string>("ReplyTo");
             var bcc = activityContext.GetState<string>("Bcc");
             var cc = activityContext.GetState<string>("CC");
+            var notifyReadEmail = activityContext.GetState<bool>("NotifyReadEmail");
 
             var parameters = new Dictionary<string, object> {
                 {"Subject", subject},
                 {"Body", body},
                 {"Recipients", recipients},
                 {"ReplyTo", replyTo},
                 {"Bcc", bcc},
-                {"CC", cc}
+                {"CC", cc},
+                {"NotifyReadEmail",notifyReadEmail }
             };
 
             var queued = activityContext.GetState<bool>("Queued");

diff --git a/src/Orchard.Web/Modules/Orchard.Email/Forms/EmailForm.cs b/src/Orchard.Web/Modules/Orchard.Email/Forms/EmailForm.cs
@@ -63,7 +63,12 @@ public void Describe(DescribeContext context) {
                                 Id: "Body", Name: "Body",
                                 Title: T("Body"),
                                 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) {

diff --git a/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs b/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
@@ -118,7 +118,13 @@ public void Process(IDictionary<string, object> parameters) {
                         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);
             }
             catch (Exception e) {