kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove extra info from Body as the From display name is now always set to the user's name

Browse Source
This commit is contained in:
Shaun Walker 2023-01-12 11:48:25 -05:00
parent c6e6c98875
commit afc75a09d9
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
View File

@ -128,29 +128,7 @@ namespace Oqtane.Infrastructure
mailMessage.Subject = notification.Subject;
//body
mailMessage.Body = "";
// check if email is being sent from SMTP Sender rather than notification sender
if (!string.IsNullOrEmpty(notification.FromEmail) && mailMessage.From.Address != notification.FromEmail)
{
// include information of who sent the notification in the body
mailMessage.Body += "From: ";
if (!string.IsNullOrEmpty(notification.FromDisplayName))
{
mailMessage.Body += notification.FromDisplayName + " <" + notification.FromEmail + ">\n";
}
else
{
mailMessage.Body += notification.FromEmail + "\n";
}
}
// check if notification was created in the past
if (notification.CreatedOn.Date != DateTime.UtcNow.Date)
{
mailMessage.Body += "Sent: " + notification.CreatedOn + "\n";
}
mailMessage.Body += "\n" + notification.Body;
mailMessage.Body = notification.Body;
// encoding
mailMessage.SubjectEncoding = System.Text.Encoding.UTF8;