lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6196_SupportForAttachments' into 1.10.x

Browse Source
This commit is contained in:
HermesSbicego-Laser
2016-10-25 09:19:54 +02:00
parent bf2201c2a9 e50bd607b7
commit c1b1c4dc06
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,8 @@ namespace Orchard.Email.Services {
if (!String.IsNullOrWhiteSpace(emailMessage.From)) { if (!String.IsNullOrWhiteSpace(emailMessage.From)) {
mailMessage.From = new MailAddress(emailMessage.From); mailMessage.From = new MailAddress(emailMessage.From);
} else { }
else {
// Take 'From' address from site settings or web.config. // Take 'From' address from site settings or web.config.
mailMessage.From = !String.IsNullOrWhiteSpace(_smtpSettings.Address) mailMessage.From = !String.IsNullOrWhiteSpace(_smtpSettings.Address)
? new MailAddress(_smtpSettings.Address) ? new MailAddress(_smtpSettings.Address)
@@ -124,12 +125,14 @@ namespace Orchard.Email.Services {
foreach (var attachmentPath in emailMessage.Attachments) { foreach (var attachmentPath in emailMessage.Attachments) {
if (File.Exists(attachmentPath)) { if (File.Exists(attachmentPath)) {
mailMessage.Attachments.Add(new Attachment(attachmentPath)); mailMessage.Attachments.Add(new Attachment(attachmentPath));
} else { }
else {
throw new FileNotFoundException(T("One or more attachments not found.").Text); throw new FileNotFoundException(T("One or more attachments not found.").Text);
} }
} }
_smtpClientField.Value.Send(mailMessage); _smtpClientField.Value.Send(mailMessage);
} catch (Exception e) { }
catch (Exception e) {
Logger.Error(e, "Could not send email"); Logger.Error(e, "Could not send email");
} }
} }