ustva, automail, etc.
This commit is contained in:
@@ -1,6 +1,4 @@
|
|||||||
Imports System.Diagnostics.PerformanceData
|
Imports System.IO
|
||||||
Imports System.IO
|
|
||||||
Imports GrapeCity.Documents.DX.Direct3D11
|
|
||||||
Imports Microsoft.Office.Interop
|
Imports Microsoft.Office.Interop
|
||||||
Imports VERAG_PROG_ALLGEMEIN
|
Imports VERAG_PROG_ALLGEMEIN
|
||||||
|
|
||||||
|
|||||||
@@ -1980,7 +1980,7 @@ Public Class usrCntlUSTV
|
|||||||
|
|
||||||
If importiert Then
|
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
|
If Not System.IO.Directory.Exists(zielOrdner) Then
|
||||||
System.IO.Directory.CreateDirectory(zielOrdner)
|
System.IO.Directory.CreateDirectory(zielOrdner)
|
||||||
|
|||||||
@@ -945,8 +945,6 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
|
|||||||
|
|
||||||
End Select
|
End Select
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
mySmtpsvr.UseDefaultCredentials = False
|
mySmtpsvr.UseDefaultCredentials = False
|
||||||
mySmtpsvr.Credentials = myCredentials
|
mySmtpsvr.Credentials = myCredentials
|
||||||
Try
|
Try
|
||||||
@@ -955,20 +953,26 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
|
|||||||
Msg.From = New MailAddress(eMailfrom)
|
Msg.From = New MailAddress(eMailfrom)
|
||||||
|
|
||||||
If eMailTo IsNot Nothing Then
|
If eMailTo IsNot Nothing Then
|
||||||
For Each s In eMailTo.ToString.Split(";")
|
For Each s As String In eMailTo.ToString.Split(";"c)
|
||||||
If s <> "" Then Msg.To.Add(convertToIso(s).ToString.Trim())
|
If Not String.IsNullOrWhiteSpace(s) Then
|
||||||
|
Msg.To.Add(convertToIso(s).Trim())
|
||||||
|
End If
|
||||||
Next
|
Next
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If cc IsNot Nothing Then
|
If cc IsNot Nothing Then
|
||||||
For Each s In cc.ToString.Split(";")
|
For Each s As String In cc.ToString.Split(";"c)
|
||||||
If s <> "" Then Msg.CC.Add(convertToIso(s).ToString.Trim())
|
If Not String.IsNullOrWhiteSpace(s) Then
|
||||||
|
Msg.CC.Add(convertToIso(s).Trim())
|
||||||
|
End If
|
||||||
Next
|
Next
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If bcc IsNot Nothing Then
|
If bcc IsNot Nothing Then
|
||||||
For Each s In bcc.ToString.Split(";")
|
For Each s As String In bcc.ToString.Split(";"c)
|
||||||
If s <> "" Then Msg.Bcc.Add(convertToIso(s).ToString.Trim())
|
If Not String.IsNullOrWhiteSpace(s) Then
|
||||||
|
Msg.Bcc.Add(convertToIso(s).Trim())
|
||||||
|
End If
|
||||||
Next
|
Next
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@@ -1244,8 +1248,13 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
|
|||||||
Dim invalid As New List(Of String)
|
Dim invalid As New List(Of String)
|
||||||
Dim idn As New IdnMapping()
|
Dim idn As New IdnMapping()
|
||||||
|
|
||||||
|
'If emailList.EndsWith("; ") Then
|
||||||
|
' Return emailList
|
||||||
|
'End If
|
||||||
|
|
||||||
For Each email As String In emailList.Split(";"c, ","c)
|
For Each email As String In emailList.Split(";"c, ","c)
|
||||||
|
|
||||||
|
|
||||||
Dim e As String = email.Trim()
|
Dim e As String = email.Trim()
|
||||||
|
|
||||||
If e = "" Then Continue For
|
If e = "" Then Continue For
|
||||||
@@ -1284,14 +1293,9 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
|
|||||||
invalid.Add(e)
|
invalid.Add(e)
|
||||||
Continue For
|
Continue For
|
||||||
End If
|
End If
|
||||||
' Keine führenden/abschließenden Semikolons
|
|
||||||
If localPart.EndsWith("; ") Then
|
|
||||||
invalid.Add(e)
|
|
||||||
Continue For
|
|
||||||
End If
|
|
||||||
|
|
||||||
' Keine doppelten Punkte
|
' Keine doppelten Punkte
|
||||||
If localPart.Contains("..") Then
|
If localPart.Contains("..") Then
|
||||||
invalid.Add(e)
|
invalid.Add(e)
|
||||||
Continue For
|
Continue For
|
||||||
End If
|
End If
|
||||||
@@ -1305,6 +1309,8 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
|
|||||||
Continue For
|
Continue For
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
' Domainlabels prüfen
|
' Domainlabels prüfen
|
||||||
For Each label As String In domainAscii.Split("."c)
|
For Each label As String In domainAscii.Split("."c)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user