From 83958786981c88b5fb4ee3fcf0fd48aec94cb506 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 24 Jul 2026 17:02:00 +0200 Subject: [PATCH] ustva, automail, etc. --- SDL/Fakturierung/cAutomailversand.vb | 4 +-- SDL/USTV/usrCntlUSTV.vb | 2 +- VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb | 36 +++++++++++++---------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/SDL/Fakturierung/cAutomailversand.vb b/SDL/Fakturierung/cAutomailversand.vb index 0eecd43b..c6cde13c 100644 --- a/SDL/Fakturierung/cAutomailversand.vb +++ b/SDL/Fakturierung/cAutomailversand.vb @@ -1,6 +1,4 @@ -Imports System.Diagnostics.PerformanceData -Imports System.IO -Imports GrapeCity.Documents.DX.Direct3D11 +Imports System.IO Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 98a3c121..6a4e43ef 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -1980,7 +1980,7 @@ Public Class usrCntlUSTV If importiert Then - Dim zielOrdner As String = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(fd.FileName), "importiert") + Dim zielOrdner As String = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(fd.FileName), "Importiert") If Not System.IO.Directory.Exists(zielOrdner) Then System.IO.Directory.CreateDirectory(zielOrdner) diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index 776a1ed4..fc79adf2 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -945,8 +945,6 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( End Select - - mySmtpsvr.UseDefaultCredentials = False mySmtpsvr.Credentials = myCredentials Try @@ -955,20 +953,26 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Msg.From = New MailAddress(eMailfrom) If eMailTo IsNot Nothing Then - For Each s In eMailTo.ToString.Split(";") - If s <> "" Then Msg.To.Add(convertToIso(s).ToString.Trim()) + For Each s As String In eMailTo.ToString.Split(";"c) + If Not String.IsNullOrWhiteSpace(s) Then + Msg.To.Add(convertToIso(s).Trim()) + End If Next End If If cc IsNot Nothing Then - For Each s In cc.ToString.Split(";") - If s <> "" Then Msg.CC.Add(convertToIso(s).ToString.Trim()) + For Each s As String In cc.ToString.Split(";"c) + If Not String.IsNullOrWhiteSpace(s) Then + Msg.CC.Add(convertToIso(s).Trim()) + End If Next End If If bcc IsNot Nothing Then - For Each s In bcc.ToString.Split(";") - If s <> "" Then Msg.Bcc.Add(convertToIso(s).ToString.Trim()) + For Each s As String In bcc.ToString.Split(";"c) + If Not String.IsNullOrWhiteSpace(s) Then + Msg.Bcc.Add(convertToIso(s).Trim()) + End If Next End If @@ -1244,8 +1248,13 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Dim invalid As New List(Of String) Dim idn As New IdnMapping() + 'If emailList.EndsWith("; ") Then + ' Return emailList + 'End If + For Each email As String In emailList.Split(";"c, ","c) + Dim e As String = email.Trim() If e = "" Then Continue For @@ -1284,14 +1293,9 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( invalid.Add(e) Continue For End If - ' Keine führenden/abschließenden Semikolons - If localPart.EndsWith("; ") Then - invalid.Add(e) - Continue For - End If - ' Keine doppelten Punkte - If localPart.Contains("..") Then + ' Keine doppelten Punkte + If localPart.Contains("..") Then invalid.Add(e) Continue For End If @@ -1305,6 +1309,8 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Continue For End If + + ' Domainlabels prüfen For Each label As String In domainAscii.Split("."c)