diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 284dd705..18f3b430 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index d3b0fbf0..423e55c1 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("6.0.8")] +[assembly: AssemblyInformationalVersion("6.0.9")] [assembly: AssemblyCopyright("Copyright © 2014-2020 schick Informatik")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index b777f8f0..359580f6 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("6.0.8.*")] +[assembly: AssemblyVersion("6.0.9.*")] diff --git a/nsw/Source/bsmd.email/BSMDMail.cs b/nsw/Source/bsmd.email/BSMDMail.cs index cec09d94..a463c226 100644 --- a/nsw/Source/bsmd.email/BSMDMail.cs +++ b/nsw/Source/bsmd.email/BSMDMail.cs @@ -145,30 +145,33 @@ namespace bsmd.email public static void SendSystemInfo(string subject, string body, string recipient) { - using (BSMDMail mailer = new BSMDMail()) + using BSMDMail mailer = new BSMDMail(); + if(recipient.Equals(Properties.Settings.Default.POP3User, StringComparison.OrdinalIgnoreCase)) { - MailMessage message = new MailMessage(); - MailAddress fromAddress = new MailAddress(Properties.Settings.Default.Sender); - message.From = fromAddress; - message.Subject = subject; - message.IsBodyHtml = false; - message.Body = body; + log.Warn("system info recipient is pop3 user, skipping send to avoid loops"); + return; + } + MailMessage message = new MailMessage(); + MailAddress fromAddress = new MailAddress(Properties.Settings.Default.Sender); + message.From = fromAddress; + message.Subject = subject; + message.IsBodyHtml = false; + message.Body = body; - message.To.Add(recipient); - MailAddress adminAddress = new MailAddress(Properties.Settings.Default.AdminEmail); - message.CC.Add(adminAddress); - try - { - mailer.Send(message); - } - catch (SmtpException smtpException) - { - log.ErrorFormat("SMTP error while sending e-mail:{0}", smtpException.Message); - } - catch (Exception ex) - { - log.ErrorFormat("other error while sending e-mail:{0}", ex.Message); - } + message.To.Add(recipient); + MailAddress adminAddress = new MailAddress(Properties.Settings.Default.AdminEmail); + message.CC.Add(adminAddress); + try + { + mailer.Send(message); + } + catch (SmtpException smtpException) + { + log.ErrorFormat("SMTP error while sending e-mail:{0}", smtpException.Message); + } + catch (Exception ex) + { + log.ErrorFormat("other error while sending e-mail:{0}", ex.Message); } }