lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 20:16:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Making SmtpMessageChannel.ParseRecipients more fault-tolerant to simplify its usage

Browse Source
This commit is contained in:
Benedek Farkas
2024-03-11 14:22:10 +01:00
parent 5e928e7980
commit b5ad09e6db
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,13 +107,7 @@ namespace Orchard.Email.Services {
try {
mailMessage.To.AddRange(ParseRecipients(emailMessage.Recipients));
if (!String.IsNullOrWhiteSpace(emailMessage.Cc)) {
mailMessage.Cc.AddRange(ParseRecipients(emailMessage.Cc));
}
if (!String.IsNullOrWhiteSpace(emailMessage.Bcc)) {
mailMessage.Bcc.AddRange(ParseRecipients(emailMessage.Bcc));
}
mailMessage.Cc.AddRange(ParseRecipients(emailMessage.Cc));
var fromAddress = default(MailboxAddress);
if (!String.IsNullOrWhiteSpace(emailMessage.FromAddress)) {
@@ -126,6 +120,7 @@ namespace Orchard.Email.Services {
: 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;
mailMessage.From.Add(fromAddress);
@@ -199,7 +194,7 @@ namespace Orchard.Email.Services {
}
private IEnumerable<MailboxAddress> ParseRecipients(string recipients) {
return recipients.Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
return recipients?.Split(new[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries)
.SelectMany(address => {
if (MailboxAddress.TryParse(address, out var mailboxAddress)) {
return new[] { mailboxAddress };
@@ -207,7 +202,7 @@ namespace Orchard.Email.Services {
Logger.Error("Invalid email address: {0}", address);
return Enumerable.Empty<MailboxAddress>();
});
}) ?? Enumerable.Empty<MailboxAddress>();
}
}
}