This commit is contained in:
Digital Data - Marlon Schreiber
2018-08-10 13:43:18 +02:00
parent 5ff1bec8cc
commit be9fca94b3
6 changed files with 170 additions and 67 deletions

View File

@@ -156,6 +156,7 @@ Public Class clsProfil
Dim MAIL_USER As String = ""
Dim MAIL_USER_PW As String = ""
Dim MAIL_SSL As Boolean = False
Dim MAIL_PORT As String = "25"
For Each emailrow As DataRow In ClassWMResulthandler.clsCURRENT.DT_TBDD_EMAIL.Rows
If emailrow.Item("GUID") = CInt(EMAIL_PROFIL) Then
@@ -164,6 +165,7 @@ Public Class clsProfil
MAIL_USER = emailrow.Item("EMAIL_USER")
MAIL_USER_PW = emailrow.Item("EMAIL_PW")
MAIL_SSL = emailrow.Item("SSL_AUTH")
MAIL_PORT = emailrow.Item("PORT")
End If
Next
@@ -192,7 +194,7 @@ Public Class clsProfil
Email_Betreff = clsDateiverarbeitung.REGEX_REPLACE(WMdok, Email_Betreff)
Email_Body = clsDateiverarbeitung.REGEX_REPLACE(WMdok, Email_Body)
Dim FILENAME = ClassWMResulthandler.clsCURRENT.WDLAUFWERK & ":" & WMdok.aPath
clsEmail.Send_EMail(Email_Betreff, Email_Body, Email_Empfänger, MAILFROM, MAILSMTP, MAIL_USER, MAIL_USER_PW, MAIL_SSL, FILENAME)
clsEmail.Email_Send_Independentsoft(Email_Betreff, Email_Body, Email_Empfänger, MAILFROM, MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_SSL, FILENAME)
Else
@@ -471,7 +473,7 @@ Public Class clsProfil
Dim MAIL_USER As String = ""
Dim MAIL_USER_PW As String = ""
Dim MAIL_SSL As Boolean = False
Dim MAIL_PORT As Integer
For Each emailrow As DataRow In ClassWMResulthandler.clsCURRENT.DT_TBDD_EMAIL.Rows
If emailrow.Item("GUID") = CInt(EMAIL_PROFIL) Then
@@ -480,6 +482,7 @@ Public Class clsProfil
MAIL_USER = emailrow.Item("EMAIL_USER")
MAIL_USER_PW = emailrow.Item("EMAIL_PW")
MAIL_SSL = emailrow.Item("SSL_AUTH")
MAIL_PORT = emailrow.Item("PORT")
End If
Next
@@ -501,7 +504,7 @@ Public Class clsProfil
Return False
End If
clsEmail.Send_EMail(Email_Betreff, Email_Body, Email_Empfänger, MAILFROM, MAILSMTP, MAIL_USER, MAIL_USER_PW, MAIL_SSL, ClassWMResulthandler.clsCURRENT.CONCATTED_FILE)
clsEmail.Email_Send_Independentsoft(Email_Betreff, Email_Body, Email_Empfänger, MAILFROM, MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_SSL, ClassWMResulthandler.clsCURRENT.CONCATTED_FILE)
Else