lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 20:09:09 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

SmtpMessageChannel: Simplifying the processing of the "from" address

Browse Source
This commit is contained in:
Benedek Farkas 2024-03-11 14:25:59 +01:00
parent b5ad09e6db
commit 44dcc86386
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,20 +109,16 @@ namespace Orchard.Email.Services {
mailMessage.Cc.AddRange(ParseRecipients(emailMessage.Cc));
var fromAddress = default(MailboxAddress);
if (!String.IsNullOrWhiteSpace(emailMessage.FromAddress)) {
fromAddress = MailboxAddress.Parse(emailMessage.FromAddress);
}
else {
// Take 'From' address from site settings or web.config.
fromAddress = !String.IsNullOrWhiteSpace(_smtpSettings.FromAddress)
? MailboxAddress.Parse(_smtpSettings.FromAddress)
: MailboxAddress.Parse(((SmtpSection)ConfigurationManager.GetSection("system.net/mailSettings/smtp")).From);
}
mailMessage.Bcc.AddRange(ParseRecipients(emailMessage.Bcc));
fromAddress.Name = string.IsNullOrWhiteSpace(emailMessage.FromName) ? _smtpSettings.FromName : emailMessage.FromName;
var fromAddress = MailboxAddress.Parse(
// "From" address precendence: Current email message > site settings > configuration.
string.IsNullOrWhiteSpace(emailMessage.FromAddress)
? string.IsNullOrWhiteSpace(_smtpSettings.FromAddress)
? ((SmtpSection)ConfigurationManager.GetSection("system.net/mailSettings/smtp")).From
: _smtpSettings.FromAddress
: emailMessage.FromAddress);
fromAddress.Name = string.IsNullOrWhiteSpace(emailMessage.FromName) ? _smtpSettings.FromName : emailMessage.FromName;
mailMessage.From.Add(fromAddress);
if (!String.IsNullOrWhiteSpace(emailMessage.ReplyTo)) {