diff --git a/app/ClassWMResulthandler/DD_WMResulthandler.vbproj b/app/ClassWMResulthandler/DD_WMResulthandler.vbproj index 76e878f..86b682f 100644 --- a/app/ClassWMResulthandler/DD_WMResulthandler.vbproj +++ b/app/ClassWMResulthandler/DD_WMResulthandler.vbproj @@ -44,12 +44,15 @@ On + + ..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + False ..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll - - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Email .NET\Bin\Independentsoft.Email.dll + + ..\..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll @@ -105,7 +108,6 @@ - diff --git a/app/ClassWMResulthandler/ModCurrent.vb b/app/ClassWMResulthandler/ModCurrent.vb index 738063c..d8dd370 100644 --- a/app/ClassWMResulthandler/ModCurrent.vb +++ b/app/ClassWMResulthandler/ModCurrent.vb @@ -3,5 +3,6 @@ Public CURRENToWMConnect As Object Public CURRENToWMSession As Object Public CURRENT_WMDriveLetter As String = "W" + Public CURRENT_TempFiles As List(Of String) End Module diff --git a/app/ClassWMResulthandler/My Project/AssemblyInfo.vb b/app/ClassWMResulthandler/My Project/AssemblyInfo.vb index 6f0c2ef..7abb7cd 100644 --- a/app/ClassWMResulthandler/My Project/AssemblyInfo.vb +++ b/app/ClassWMResulthandler/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/app/ClassWMResulthandler/My Project/Settings.Designer.vb b/app/ClassWMResulthandler/My Project/Settings.Designer.vb index acea1eb..0720041 100644 --- a/app/ClassWMResulthandler/My Project/Settings.Designer.vb +++ b/app/ClassWMResulthandler/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/app/ClassWMResulthandler/clsDateiverarbeitung.vb b/app/ClassWMResulthandler/clsDateiverarbeitung.vb index 56979ee..4bd9cae 100644 --- a/app/ClassWMResulthandler/clsDateiverarbeitung.vb +++ b/app/ClassWMResulthandler/clsDateiverarbeitung.vb @@ -4,6 +4,7 @@ Imports System.Text Imports System.Text.RegularExpressions Imports DigitalData.Modules.Logging Imports Newtonsoft.Json +Imports Newtonsoft.Json.Linq Imports WINDREAMLib Public Class clsDateiverarbeitung @@ -211,7 +212,7 @@ Public Class clsDateiverarbeitung Try Const WMObjectEditModeLifeCycleEdit = "&H00000080" Const WMLifeCycleTypeArchivePeriod = 2 - + Logger.Debug($"ArchiveDate for WMFile shall be changed: pFromDate [{pFromDate}] pDateOperator [{pDateOperator}]...") pWMObject.LockFor(WMObjectEditModeLifeCycleEdit) Dim oLC = pWMObject.aWMLifeCycle() @@ -236,6 +237,7 @@ Public Class clsDateiverarbeitung Return False End Select Dim archBis = DateAdd(oDateIntervall, pIntervall, oDateFrom) + Logger.Debug($"...archBis is [{archBis.ToShortDateString}]!") 'Dim pArchiveDate As String = archBis.ToString("yyyy-MM-dd") oLC.SetPeriodEndDate(WMLifeCycleTypeArchivePeriod, archBis) @@ -699,6 +701,18 @@ Public Class clsDateiverarbeitung wdIndexwert = wdIndexwert.ToString.TrimEnd wdIndexwert = wdIndexwert.ToString.TrimStart Logger.Debug("indexvalue read is: '" & wdIndexwert & "'") + Try + Dim oConvertDT As DateTime + If DateTime.TryParse(wdIndexwert.ToString, oConvertDT) Then + Logger.Debug("indexvalue is datetime - converting to date") + Dim myDate As Date = wdIndexwert + wdIndexwert = Format(myDate, "yyyy-MM-dd") + End If + Catch ex As Exception + Logger.Warn("clsDateiverarbeitung: Error checking datetime: " & ex.Message) + End Try + + _STRING = _STRING.Replace(reg_element.Value, wdIndexwert.ToString) Logger.Debug("REGEX_String (" & i & ") " & _STRING) i += 1 diff --git a/app/ClassWMResulthandler/clsEmail.vb b/app/ClassWMResulthandler/clsEmail.vb deleted file mode 100644 index 8fca829..0000000 --- a/app/ClassWMResulthandler/clsEmail.vb +++ /dev/null @@ -1,84 +0,0 @@ - -Imports System -Imports Independentsoft.Email -Imports Independentsoft.Email.Smtp -Imports Independentsoft.Email.Mime -Imports DigitalData.Modules.Logging -Imports System.Net.Mail -Imports System.Net -Imports System.Net.Mime - -Public Class clsEmail - Dim Logger As DigitalData.Modules.Logging.Logger - Private Shared MailAktiv As Boolean = False - Sub New(MyLogger As LogConfig) - Logger = MyLogger.GetLogger() - End Sub - Public Function Email_Send(ByVal pMailSubject As String, ByVal pMailBody As String, pMailto As String, - pMailfrom As String, pMailSmtp As String, pMailport As Integer, pMailUser As String, pMailPW As String, - pAUTH_TYPE As String, Optional pAttment As String = "", Optional pTest As Boolean = False) - Try - Dim oError As Boolean = False - Dim oReceipiants As String() - If pMailto.Contains(";") Then - oReceipiants = pMailto.Split(";") - Else - ReDim Preserve oReceipiants(0) - oReceipiants(0) = pMailto - End If - For Each oMailReceipiant As String In oReceipiants - Dim sClient = New Net.Mail.SmtpClient(pMailSmtp) - Dim mymesssage As New MailMessage - sClient.Port = pMailport - If pAUTH_TYPE = "SSL" Then - sClient.EnableSsl = True - Else - sClient.EnableSsl = False - End If - - sClient.Credentials = New NetworkCredential(pMailUser, pMailPW) - sClient.UseDefaultCredentials = False - If pTest = True Then - mymesssage.Body = $"This is the body (text will be replaced within profile)!
mailsmtp: {pMailSmtp}
mailport: {pMailport}
mailUser: {pMailUser}
mailPW: XXXX
AUTH_TYPE: {pAUTH_TYPE}" - Else - mymesssage.Body = pMailBody - End If - - 'mymesssage.IsBodyHtml = True - Dim htmlView As AlternateView = AlternateView.CreateAlternateViewFromString(mymesssage.Body) - htmlView.ContentType = New System.Net.Mime.ContentType("text/html") - mymesssage.AlternateViews.Add(htmlView) - pAttment = pAttment.Replace("W:\", "\\windream\objects\") - If pAttment <> String.Empty Then - If System.IO.File.Exists(pAttment) Then - Logger.Debug($"working on attachment {pAttment.ToString}...") - Dim oAttachment As New System.Net.Mail.Attachment(pAttment) - mymesssage.Attachments.Add(oAttachment) - Else - Logger.Warn($"Attachment {pAttment.ToString} is not existing - Mail won't be send!") - oError = True - - End If - End If - - - mymesssage.From = New MailAddress(pMailfrom) - mymesssage.Subject = pMailSubject - mymesssage.To.Add(New MailAddress(oMailReceipiant)) - sClient.Send(mymesssage) - Logger.Info($"Email successfully send to: [{oMailReceipiant}]!") - Logger.Debug($"Email successfully send to: [{oMailReceipiant}]!") - Next - If oError = False Then - Return True - Else - Return False - End If - - Catch ex As Exception - Logger.Error(ex) - Return False - End Try - - End Function -End Class diff --git a/app/ClassWMResulthandler/clsJob_Work.vb b/app/ClassWMResulthandler/clsJob_Work.vb index 5cb8760..de1ce24 100644 --- a/app/ClassWMResulthandler/clsJob_Work.vb +++ b/app/ClassWMResulthandler/clsJob_Work.vb @@ -1,9 +1,12 @@ Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Messaging +Imports DigitalData.Modules.Messaging.Mail + Public Class clsJob_Work Dim Logger As Logger Private MyLogger As LogConfig - Private _mail As clsEmail - Public Sub New(MyLoggerConf As LogConfig, _email As clsEmail) + Private _mail As MailSender + Public Sub New(MyLoggerConf As LogConfig, _email As MailSender) Logger = MyLoggerConf.GetLogger() MyLogger = MyLoggerConf _mail = _email @@ -44,11 +47,25 @@ Public Class clsJob_Work Logger.Warn("PWPlain is Nothing - Could not decrypt passwort 44") Return False End If - If _mail.Email_Send(Email_subject, Email_Body, Email_receipiants, oMAILFROM, oMAILSMTP, oMAIL_PORT, oMAIL_USER, oMAIL_USER_PW, oMAIL_AUTH_TYPE, Attachment_Filename) = True Then - Return True - Else - Logger.Warn("Email_Send_Independentsoft was not successfull!") - Return False + Dim oSendto As New List(Of String) + Dim oSplit = Email_receipiants.Split(";") + For Each oMailAdress In oSplit + oSendto.Add(oMailAdress) + Next + + Dim oAttMt As New List(Of String) + If Attachment_Filename <> String.Empty Then + oAttMt.Add(Attachment_Filename) + End If + If _mail.Connect(oMAILSMTP, oMAIL_PORT, oMAIL_USER, oPWPlain, oMAIL_AUTH_TYPE) = True Then + Logger.Info($"MAIL: Connection to {oMAILSMTP} successfull!") + If _mail.SendMail(oSendto, oMAILFROM, Email_subject, Email_Body, Now, oAttMt, 0) = True Then + Return True + + Else + Logger.Warn("ConnectToServer was not successfull!") + Return False + End If End If Catch ex As Exception Logger.Error(ex) diff --git a/app/ClassWMResulthandler/clsProfil.vb b/app/ClassWMResulthandler/clsProfil.vb index 26d5da7..998dabf 100644 --- a/app/ClassWMResulthandler/clsProfil.vb +++ b/app/ClassWMResulthandler/clsProfil.vb @@ -3,6 +3,8 @@ Imports System.IO Imports System.Text Imports Newtonsoft.Json Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Messaging +Imports DigitalData.Modules.Messaging.Mail Public Class clsProfil Inherits clsCURRENT @@ -14,7 +16,7 @@ Public Class clsProfil Private _database As clsDatabase Private _dateiverarbeitung As clsDateiverarbeitung Private _JobWork As clsJob_Work - Private _email As clsEmail + Private _email As MailSender Private Shared WD_aktivesDokument As WMObject #End Region Sub New(MyLogger As LogConfig, PROFIL_ID As Integer) @@ -23,7 +25,7 @@ Public Class clsProfil windream_index = New clsWindream_Index(MyLogger) _database = New clsDatabase(MyLogger) _dateiverarbeitung = New clsDateiverarbeitung(MyLogger) - _email = New clsEmail(MyLogger) + _email = New MailSender(MyLogger) _JobWork = New clsJob_Work(MyLogger, _email) End Sub @@ -167,6 +169,7 @@ Public Class clsProfil oGesamtFiles = windreamSucheErgebnisse.Count Dim oCountDocs As Integer = 0 Dim oEmailAttachment_path As String + For Each WMdok As WMObject In windreamSucheErgebnisse oEmailAttachment_path = String.Empty @@ -254,16 +257,42 @@ Public Class clsProfil Email_Body = _dateiverarbeitung.REGEX_REPLACE(WMdok, Email_Body) oEmail_Betreff = $"{oEmail_Betreff} [eMail {oCountDocs} von {oGesamtFiles}]" If oAttachment_FullFilename <> String.Empty Then - Logger.Warn($"Email Attachment {oAttachment_FullFilename}") + Logger.Info($"Email Attachment {oAttachment_FullFilename}") End If - If _email.Email_Send(oEmail_Betreff, Email_Body, Email_Empfänger, MAILFROM, MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_AUTH_TYPE, oAttachment_FullFilename) = True Then + Dim oSendto As New List(Of String) + Dim oSplit = Email_Empfänger.split(";") + For Each oMailAdress In oSplit + oSendto.Add(oMailAdress) + Next + Dim oAttMt As New List(Of String) + If oAttachment_FullFilename <> String.Empty Then + oAttMt.Add(oAttachment_FullFilename) + clsCURRENT.TEMP_FILES.Add(oAttachment_FullFilename) + End If + Logger.Debug("Now _email and Messaging...") + If Not IsNothing(_email) And _email.Connected2Server = False Then + If _email.Connect(MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_AUTH_TYPE) = True Then + Logger.Info($"MAIL: Connection to {MAILSMTP} successfull!") + Else + Logger.Warn($"{oFileRunNo} Email_ConnectToServer was not successfull!") + FileJobSuccessful = False + End If + + End If + If Not IsNothing(_email) And _email.SendMail(oSendto, MAILFROM, oEmail_Betreff, Email_Body, Now, oAttMt, 0) = True Then FileJobSuccessful = True Else - - Logger.Warn($"{oFileRunNo} Email_Send_Independentsoft 1 was not successfull!") FileJobSuccessful = False + If IsNothing(_email) Then + Logger.Info($"_email is nothing") + Else + Logger.Info($"{oFileRunNo} Email_SendMail was not successfull!") + + End If + End If + Else Logger.Warn($"{oFileRunNo} DT_TBDD_EMAIL is nothing or contains no rows") Return False @@ -312,6 +341,8 @@ Public Class clsProfil End Select Next + + '################################## 'JETZT DER DURCHLAUF DER DATEI-JOBS '################################## @@ -446,8 +477,18 @@ Public Class clsProfil Else Logger.Warn("KEINE File-JOBS für Profil '" & _Profilname & "' angelegt!") End If - Next + Next + Try + If Not IsNothing(_email) Then + If _email.Connected2Server = True Then + _email.DisconnectFromServer() + End If + + End If + Catch ex As Exception + + End Try 'Jetzt nochmal ein Durchlauf für Profiljobs wo alle Dateien abgearbeitet wurden. For Each DR_PR_JB As DataRow In DT_PROFIL_JOB.Rows Logger.Info("New run for " & DR_PR_JB.Item("JOB_TYP").ToString.ToUpper) @@ -594,14 +635,30 @@ Public Class clsProfil Return False End If + Dim oSendto As New List(Of String) + Dim oSplit = Email_Empfänger.split(";") + For Each oMailAdress In oSplit + oSendto.Add(oMailAdress) + Next - If _email.Email_Send(Email_Betreff, Email_Body, Email_Empfänger, MAILFROM, MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_AUTH_TYPE, clsCURRENT.CONCATTED_FILE) = True Then - FileJobSuccessful = True - Else - Logger.Warn("Email_Send_Independentsoft 2 was not successfull!") - FileJobSuccessful = False + Dim oAttMt As New List(Of String) + If clsCURRENT.CONCATTED_FILE <> String.Empty Then + oAttMt.Add(clsCURRENT.CONCATTED_FILE) + clsCURRENT.TEMP_FILES.Add(clsCURRENT.CONCATTED_FILE) End If + If _email.Connect(MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_AUTH_TYPE) = True Then + If _email.SendMail(oSendto, MAILFROM, Email_Betreff, Email_Body, Now, oAttMt, 0) = True Then + FileJobSuccessful = True + Else + Logger.Warn("Email_SendMail2 was not successfull!") + FileJobSuccessful = False + End If + _email.DisconnectFromServer() + Else + Logger.Warn($"Email_ConnectToServer2 was not successfull!") + FileJobSuccessful = False + End If Else Logger.Warn("DT_TBDD_EMAIL is nothing or contains no rows") @@ -619,10 +676,12 @@ Public Class clsProfil Try Dim myproc As Process = New Process() myproc.StartInfo.FileName = """" & oFileString & """" - myproc.StartInfo.Verb = "printto" + myproc.StartInfo.Verb = "printto" '"printto" myproc.StartInfo.Arguments = oPrintername myproc.StartInfo.UseShellExecute = True + Logger.Debug($"Send2Printer [{ myproc.StartInfo.FileName} # Verb:{myproc.StartInfo.Verb} # Arguments: {myproc.StartInfo.Arguments}] ") myproc.Start() + System.Threading.Thread.Sleep(500) Dim p As Process p = Process.GetProcessById(myproc.Id) Dim sw As Stopwatch = New Stopwatch() @@ -636,15 +695,24 @@ Public Class clsProfil End If Loop Logger.Debug("...process has exited: ") - Logger.Info($"Send2Printer [{ myproc.StartInfo.FileName} # Verb:{myproc.StartInfo.Verb} # Arguments: {myproc.StartInfo.Arguments}]successfull! ") FileJobSuccessful = True sw.Stop() - ' myproc.Kill() + Logger.Info($"Send2Printer successfully [{ myproc.StartInfo.FileName} # Verb:{myproc.StartInfo.Verb} # Arguments: {myproc.StartInfo.Arguments}] ") + File.Delete(oFileString) Logger.Debug($"Deleted oFileString [{oFileString}]!") Catch ex As Exception - Logger.Warn("Could not print (printto) file: " & oFileString) - Logger.Error(ex) + Dim omsg = "ERROR: Could not print (printto) file: " & oFileString + omsg &= vbNewLine & ex.Message + Logger.Info(omsg) + Logger.Error(ex, omsg) + FileJobSuccessful = False + Try + File.Delete(oFileString) + Catch ex1 As Exception + + End Try + End Try Next Case "Send InfoMail with WM-Search".ToUpper diff --git a/app/ClassWMResulthandler/packages.config b/app/ClassWMResulthandler/packages.config index 95c4503..551fb56 100644 --- a/app/ClassWMResulthandler/packages.config +++ b/app/ClassWMResulthandler/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/app/DDWDResultHandler/App.config b/app/DDWDResultHandler/App.config index 7a36213..819f882 100644 --- a/app/DDWDResultHandler/App.config +++ b/app/DDWDResultHandler/App.config @@ -1,15 +1,15 @@ - + -
+
-
+
- + - + @@ -27,23 +27,23 @@ - + - - + + - - + + - - + + diff --git a/app/DDWDResultHandler/DDWDResultHandler.vb b/app/DDWDResultHandler/DDWDResultHandler.vb index 19492c6..2e2a358 100644 --- a/app/DDWDResultHandler/DDWDResultHandler.vb +++ b/app/DDWDResultHandler/DDWDResultHandler.vb @@ -171,6 +171,17 @@ Public Class DDWDResultHandler If initresult = True Then '##### Profildurchlauf ######## _profil.Profil_Durchlauf(False) + For Each oFile As String In clsCURRENT.TEMP_FILES + If File.Exists(oFile) Then + Try + File.Delete(oFile) + Catch ex As Exception + + End Try + + End If + Next + ElseIf initresult = False Then Logger.Warn("clsProfil konnte nicht initialisiert werden") notcompleted = True diff --git a/app/DDWDResultHandler/My Project/AssemblyInfo.vb b/app/DDWDResultHandler/My Project/AssemblyInfo.vb index 0a1a781..ffe81eb 100644 --- a/app/DDWDResultHandler/My Project/AssemblyInfo.vb +++ b/app/DDWDResultHandler/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/app/DDWDResultHandler/My Project/Settings.Designer.vb b/app/DDWDResultHandler/My Project/Settings.Designer.vb index b52bad0..1619ffa 100644 --- a/app/DDWDResultHandler/My Project/Settings.Designer.vb +++ b/app/DDWDResultHandler/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/app/DDWDResultHandler/ServiceDDWDResultHandler.vbproj b/app/DDWDResultHandler/ServiceDDWDResultHandler.vbproj index d934a32..9a63c11 100644 --- a/app/DDWDResultHandler/ServiceDDWDResultHandler.vbproj +++ b/app/DDWDResultHandler/ServiceDDWDResultHandler.vbproj @@ -52,8 +52,7 @@ On - - False + ..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/app/DDWDResultHandler/packages.config b/app/DDWDResultHandler/packages.config index 4636f89..d755623 100644 --- a/app/DDWDResultHandler/packages.config +++ b/app/DDWDResultHandler/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/ResultHandler_Konfig/App.config b/app/ResultHandler_Konfig/App.config index ebb63ca..e5a2184 100644 --- a/app/ResultHandler_Konfig/App.config +++ b/app/ResultHandler_Konfig/App.config @@ -1,25 +1,25 @@ - + -
+
-
+
- + - + - + - + False @@ -35,32 +35,32 @@ within the resulting "app.config" or "web.config" file. --> - - - - + + + + - + - - + + - - + + - - + + diff --git a/app/ResultHandler_Konfig/My Project/Settings.Designer.vb b/app/ResultHandler_Konfig/My Project/Settings.Designer.vb index 139d491..4e53a59 100644 --- a/app/ResultHandler_Konfig/My Project/Settings.Designer.vb +++ b/app/ResultHandler_Konfig/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/app/ResultHandler_Konfig/My Project/licenses.licx b/app/ResultHandler_Konfig/My Project/licenses.licx index e69de29..887f673 100644 --- a/app/ResultHandler_Konfig/My Project/licenses.licx +++ b/app/ResultHandler_Konfig/My Project/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/ResultHandler_Konfig/ResultHandler_Konfig.vbproj b/app/ResultHandler_Konfig/ResultHandler_Konfig.vbproj index bd2e19c..29f5ef4 100644 --- a/app/ResultHandler_Konfig/ResultHandler_Konfig.vbproj +++ b/app/ResultHandler_Konfig/ResultHandler_Konfig.vbproj @@ -68,11 +68,15 @@ + + False + ..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + False ..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll - + False ..\..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll @@ -98,6 +102,9 @@ P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll True + + P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll diff --git a/app/ResultHandler_Konfig/frmMain.vb b/app/ResultHandler_Konfig/frmMain.vb index 0d8bb27..d2ca7ab 100644 --- a/app/ResultHandler_Konfig/frmMain.vb +++ b/app/ResultHandler_Konfig/frmMain.vb @@ -910,19 +910,38 @@ Public Class frmMain End Sub Private Sub btnsendtestmail_Click(sender As Object, e As EventArgs) Handles btnsendtestmail.Click - Dim _ss2email As New Email(MyLogger) + ' Dim _ss2email As New Email(MyLogger) + Dim llmail As New MailSender(MyLogger) If txtTestmailTo.Text <> String.Empty Then My.Settings.Save() Dim wrapper As New clsEncryption("!35452didalog=") Dim PWPlain = wrapper.DecryptData(EMAIL_PWTextBox.Text) - If _ss2email.NewEmail(txtTestmailTo.Text, "Testmail from GUI WMResultHandler", "This is the body (text will be replaced within profile)", EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text, - PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, "GUI WMRH - Test") = True Then - MsgBox("Email(s) has/have been sent successfully.", MsgBoxStyle.Information) + If llmail.ConnectToServer(EMAIL_SMTPTextBox.Text, PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text) = True Then + Dim oSendto As New List(Of String) + oSendto.Add(txtTestmailTo.Text) + Dim oAttMt As New List(Of String) + If txtAttachment.Text <> String.Empty Then + oAttMt.Add(txtAttachment.Text) + End If + If llmail.SendMail(oSendto, EMAIL_FROMTextBox.Text, "Testmail from GUI WMResultHandler", "TEST", Now, oAttMt, 1) = True Then + MsgBox("Email has been sent successfully.", MsgBoxStyle.Information) + Else + MsgBox("Could not send the testmail. Please check the log.", MsgBoxStyle.Exclamation) + End If + llmail.DisconnectFromServer() Else - MsgBox("Could not send the testmail. Please check the log.", MsgBoxStyle.Exclamation) + MsgBox("Could not connect to server. Please check the log.", MsgBoxStyle.Exclamation) + End If + ' Dim oSMTP As SmtpClient = llmail.New_SMTPConnection(Nothing, EMAIL_SMTPTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, PORTTextBox.Text) + 'If _ss2email.NewEmail(txtTestmailTo.Text, "Testmail from GUI WMResultHandler", "This is the body (text will be replaced within profile)", EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text, + ' PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, "GUI WMRH - Test") = True Then + ' MsgBox("Email(s) has/have been sent successfully.", MsgBoxStyle.Information) + ' Else + ' MsgBox("Could not send the testmail. Please check the log.", MsgBoxStyle.Exclamation) + ' End If End If End Sub diff --git a/app/ResultHandler_Konfig/packages.config b/app/ResultHandler_Konfig/packages.config index d378bac..b580f72 100644 --- a/app/ResultHandler_Konfig/packages.config +++ b/app/ResultHandler_Konfig/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file