diff --git a/App/CONFIG_APP/App.config b/App/CONFIG_APP/App.config deleted file mode 100644 index b3b995b..0000000 --- a/App/CONFIG_APP/App.config +++ /dev/null @@ -1,66 +0,0 @@ - - - - -
- - -
- - - - - - - - - - - - Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd - - - - - - - - - - - - False - - - - - - - - - - - - - sysdba - - - dd - - - False - - - NONE - - - - - - - - - - - - diff --git a/App/CONFIG_APP/My Project/licenses.licx b/App/CONFIG_APP/My Project/licenses.licx deleted file mode 100644 index 887f673..0000000 --- a/App/CONFIG_APP/My Project/licenses.licx +++ /dev/null @@ -1 +0,0 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/App/DigitalData.EMLProfiler/clsDatabase.vb b/App/DigitalData.EMLProfiler/clsDatabase.vb deleted file mode 100644 index 3759f20..0000000 --- a/App/DigitalData.EMLProfiler/clsDatabase.vb +++ /dev/null @@ -1,135 +0,0 @@ -Imports DigitalData.EMLProfiler.ClassCurrent -Imports DigitalData.Modules.Logging -Public Class clsDatabase - Public connectionString As String - Private Logger As Logger - Private MyLogger As LogConfig - - Sub New(LogConf As LogConfig, ConStr As String) - Logger = LogConf.GetLogger - MyLogger = LogConf - Init(ConStr) - End Sub - Public Function Init(ConString As String) As Boolean - Try - - Dim SQLconnect As New SqlClient.SqlConnection - SQLconnect.ConnectionString = ConString - SQLconnect.Open() - SQLconnect.Close() - connectionString = ConString - DTCONFIG = Return_Datatable("select * from TBEMLP_CONFIG") - If Not IsNothing(DTCONFIG) Then - If DTCONFIG.Rows.Count = 1 Then - 'PATH_EXTRACT_ATTACHMENTS = DTCONFIG.Rows(0).Item("PATH_EMAIL_TEMP") - 'PATH_ERROR = DTCONFIG.Rows(0).Item("PATH_EMAIL_ERRORS") - 'MAIL_BODY_FONT = DTCONFIG.Rows(0).Item("FONT_BODY") - 'WM_CON_STRING = DTCONFIG.Rows(0).Item("WM_CON_STRING") - 'TIMER_INTERVALL = DTCONFIG.Rows(0).Item("CHECK_INTERVALL_MINUTES") - End If - End If - DT_ECM_BASE_CONFIG = Return_Datatable("select * from TBDD_BASECONFIG") - Try - WM_DRIVE = DT_ECM_BASE_CONFIG.Rows(0).Item("WM_DRIVE") - Catch ex As Exception - Logger.Error("WM_DRIVE not part of DT_ECM_BASE_CONFIG: " & ex.Message) - WM_DRIVE = "W" - End Try - Logger.Debug("Database initialized") - Return True - Catch ex As Exception - Logger.Error(ex) - Logger.Warn("Unexpected Error in DatabaseInit: " & ex.Message) - Return False - End Try - End Function - - Public Function Return_Datatable(Select_anweisung As String) - Try - Dim SQLconnect As New SqlClient.SqlConnection - Dim SQLcommand As SqlClient.SqlCommand - SQLconnect.ConnectionString = connectionString - SQLconnect.Open() - SQLcommand = SQLconnect.CreateCommand - SQLcommand.CommandText = Select_anweisung - SQLcommand.CommandTimeout = 240 - - Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand) - - Dim dt As DataTable = New DataTable() - Logger.Debug("ReturnDatatable Command: " & Select_anweisung) - adapter1.Fill(dt) - SQLconnect.Close() - Return dt - Catch ex As Exception - Logger.Error(ex) - Logger.Warn("Unexpected Error in Return_Datatable: " & ex.Message) - Logger.Warn("SQL: " & Select_anweisung) - Return Nothing - End Try - End Function - Public Function Return_DatatableCS(Select_anweisung As String, CS As String) - Try - Dim SQLconnect As New SqlClient.SqlConnection - Dim SQLcommand As SqlClient.SqlCommand - SQLconnect.ConnectionString = CS - SQLconnect.Open() - SQLcommand = SQLconnect.CreateCommand - SQLcommand.CommandText = Select_anweisung - SQLcommand.CommandTimeout = 240 - - Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand) - - Dim dt As DataTable = New DataTable() - adapter1.Fill(dt) - SQLconnect.Close() - Return dt - Catch ex As Exception - Logger.Error(ex) - Logger.Warn("Unexpected Error in Return_DatatableCS: " & ex.Message) - Logger.Warn("SQL: " & Select_anweisung) - Return Nothing - End Try - End Function - Public Function Execute_non_Query(ExecuteCMD As String, Optional Userinput As Boolean = False) - Try - Dim SQLconnect As New SqlClient.SqlConnection - Dim SQLcommand As SqlClient.SqlCommand - SQLconnect.ConnectionString = connectionString - SQLconnect.Open() - SQLcommand = SQLconnect.CreateCommand - 'Update Last Created Record in Foo - SQLcommand.CommandText = ExecuteCMD - SQLcommand.ExecuteNonQuery() - SQLcommand.Dispose() - SQLconnect.Close() - Return True - Catch ex As Exception - Logger.Error(ex) - Logger.Warn("Unexpected Error in Execute_non_Query: " & ex.Message) - Logger.Warn("SQL: " & ExecuteCMD) - Return False - End Try - End Function - Public Function Execute_Scalar(cmdscalar As String) - Dim result - Try - Dim SQLconnect As New SqlClient.SqlConnection - Dim SQLcommand As SqlClient.SqlCommand - SQLconnect.ConnectionString = connectionString - SQLconnect.Open() - SQLcommand = SQLconnect.CreateCommand - 'Update Last Created Record in Foo - SQLcommand.CommandText = cmdscalar - result = SQLcommand.ExecuteScalar() - SQLcommand.Dispose() - SQLconnect.Close() - Return result - Catch ex As Exception - Logger.Error(ex) - Logger.Warn("Unexpected Error in Execute_Scalar: " & ex.Message) - Logger.Warn("SQL: " & cmdscalar) - Return Nothing - End Try - End Function -End Class diff --git a/App/DigitalData.EMLProfiler/ClassCurrent.vb b/App/EmailProfiler.Common/ClassCurrent.vb similarity index 97% rename from App/DigitalData.EMLProfiler/ClassCurrent.vb rename to App/EmailProfiler.Common/ClassCurrent.vb index 28f829d..4e716f7 100644 --- a/App/DigitalData.EMLProfiler/ClassCurrent.vb +++ b/App/EmailProfiler.Common/ClassCurrent.vb @@ -61,7 +61,6 @@ Public Class ClassCurrent Public Shared Property MessageError As Boolean = False Public Shared Property TEMP_FILES As List(Of String) = New List(Of String) - Public Shared Property TEMP_HTML_RESULTS As List(Of String) = New List(Of String) Public Shared Property CURRENT_DEBUG_LOCAL_EMAIL As String diff --git a/App/DigitalData.EMLProfiler/ClassConfig.vb b/App/EmailProfiler.Common/ClassDBConfig.vb similarity index 99% rename from App/DigitalData.EMLProfiler/ClassConfig.vb rename to App/EmailProfiler.Common/ClassDBConfig.vb index c0b350d..1146184 100644 --- a/App/DigitalData.EMLProfiler/ClassConfig.vb +++ b/App/EmailProfiler.Common/ClassDBConfig.vb @@ -2,7 +2,7 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Base -Public Class ClassConfig +Public Class ClassDBConfig Public Class Config Public Property PathError As String Public Property PathAttachments As String diff --git a/App/DigitalData.EMLProfiler/DigitalData.EMLProfiler.vbproj b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj similarity index 98% rename from App/DigitalData.EMLProfiler/DigitalData.EMLProfiler.vbproj rename to App/EmailProfiler.Common/EmailProfiler.Common.vbproj index b1e0c06..c265dbc 100644 --- a/App/DigitalData.EMLProfiler/DigitalData.EMLProfiler.vbproj +++ b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj @@ -106,9 +106,8 @@ - + - diff --git a/App/DigitalData.EMLProfiler/EmailStrings.vb b/App/EmailProfiler.Common/EmailStrings.vb similarity index 100% rename from App/DigitalData.EMLProfiler/EmailStrings.vb rename to App/EmailProfiler.Common/EmailStrings.vb diff --git a/App/DigitalData.EMLProfiler/MailContainer.vb b/App/EmailProfiler.Common/MailContainer.vb similarity index 100% rename from App/DigitalData.EMLProfiler/MailContainer.vb rename to App/EmailProfiler.Common/MailContainer.vb diff --git a/App/DigitalData.EMLProfiler/My Project/Application.Designer.vb b/App/EmailProfiler.Common/My Project/Application.Designer.vb similarity index 100% rename from App/DigitalData.EMLProfiler/My Project/Application.Designer.vb rename to App/EmailProfiler.Common/My Project/Application.Designer.vb diff --git a/App/DigitalData.EMLProfiler/My Project/Application.myapp b/App/EmailProfiler.Common/My Project/Application.myapp similarity index 100% rename from App/DigitalData.EMLProfiler/My Project/Application.myapp rename to App/EmailProfiler.Common/My Project/Application.myapp diff --git a/App/DigitalData.EMLProfiler/My Project/AssemblyInfo.vb b/App/EmailProfiler.Common/My Project/AssemblyInfo.vb similarity index 100% rename from App/DigitalData.EMLProfiler/My Project/AssemblyInfo.vb rename to App/EmailProfiler.Common/My Project/AssemblyInfo.vb diff --git a/App/DigitalData.EMLProfiler/My Project/Resources.Designer.vb b/App/EmailProfiler.Common/My Project/Resources.Designer.vb similarity index 100% rename from App/DigitalData.EMLProfiler/My Project/Resources.Designer.vb rename to App/EmailProfiler.Common/My Project/Resources.Designer.vb diff --git a/App/DigitalData.EMLProfiler/My Project/Resources.resx b/App/EmailProfiler.Common/My Project/Resources.resx similarity index 100% rename from App/DigitalData.EMLProfiler/My Project/Resources.resx rename to App/EmailProfiler.Common/My Project/Resources.resx diff --git a/App/DigitalData.EMLProfiler/My Project/Settings.Designer.vb b/App/EmailProfiler.Common/My Project/Settings.Designer.vb similarity index 100% rename from App/DigitalData.EMLProfiler/My Project/Settings.Designer.vb rename to App/EmailProfiler.Common/My Project/Settings.Designer.vb diff --git a/App/DigitalData.EMLProfiler/My Project/Settings.settings b/App/EmailProfiler.Common/My Project/Settings.settings similarity index 100% rename from App/DigitalData.EMLProfiler/My Project/Settings.settings rename to App/EmailProfiler.Common/My Project/Settings.settings diff --git a/App/DigitalData.EMLProfiler/app.config b/App/EmailProfiler.Common/app.config similarity index 100% rename from App/DigitalData.EMLProfiler/app.config rename to App/EmailProfiler.Common/app.config diff --git a/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb b/App/EmailProfiler.Common/clsEmail.IMAP.vb similarity index 100% rename from App/DigitalData.EMLProfiler/clsEmail.IMAP.vb rename to App/EmailProfiler.Common/clsEmail.IMAP.vb diff --git a/App/DigitalData.EMLProfiler/clsEncryption.vb b/App/EmailProfiler.Common/clsEncryption.vb similarity index 100% rename from App/DigitalData.EMLProfiler/clsEncryption.vb rename to App/EmailProfiler.Common/clsEncryption.vb diff --git a/App/DigitalData.EMLProfiler/clsWindream_Index.vb b/App/EmailProfiler.Common/clsWindream_Index.vb similarity index 100% rename from App/DigitalData.EMLProfiler/clsWindream_Index.vb rename to App/EmailProfiler.Common/clsWindream_Index.vb diff --git a/App/DigitalData.EMLProfiler/clsWindream_allgemein.vb b/App/EmailProfiler.Common/clsWindream_allgemein.vb similarity index 100% rename from App/DigitalData.EMLProfiler/clsWindream_allgemein.vb rename to App/EmailProfiler.Common/clsWindream_allgemein.vb diff --git a/App/DigitalData.EMLProfiler/clsWorkEmail.vb b/App/EmailProfiler.Common/clsWorkEmail.vb similarity index 94% rename from App/DigitalData.EMLProfiler/clsWorkEmail.vb rename to App/EmailProfiler.Common/clsWorkEmail.vb index f4a752e..e4a761d 100644 --- a/App/DigitalData.EMLProfiler/clsWorkEmail.vb +++ b/App/EmailProfiler.Common/clsWorkEmail.vb @@ -35,9 +35,7 @@ Public Class clsWorkEmail Private ReadOnly _Logger As Logger Private ReadOnly _LogConfig As LogConfig - 'Private ReadOnly _DB_MSSQL As clsDatabase Private ReadOnly _DB_MSSQL As MSSQLServer - Private ReadOnly _DB_FIREBIRD As Firebird Private ReadOnly _UseWindream As Boolean Private ReadOnly _windream As clsWindream_allgemein @@ -48,7 +46,7 @@ Public Class clsWorkEmail Private _worked_email As Boolean = False - Sub New(LogConf As LogConfig, ConStr As String, WmConStr As String, FB_DATASOURCE As String, FB_DATABASE As String, FB_USER As String, FB_PW As String, pUseWindream As Boolean, EmailAccountID As Integer, EmlProfPraefix As String) + Sub New(LogConf As LogConfig, ConStr As String, WmConStr As String, pUseWindream As Boolean, EmailAccountID As Integer, EmlProfPraefix As String) Try _Logger = LogConf.GetLogger _LogConfig = LogConf @@ -56,15 +54,13 @@ Public Class clsWorkEmail _DB_MSSQL = New MSSQLServer(LogConf, ConStr) _Logger.Debug("clsWorkmail _email initialized") _UseWindream = pUseWindream + If pUseWindream Then _windream = New clsWindream_allgemein(LogConf) _windream_index = New clsWindream_Index(LogConf) _windreamConnectionString = WmConStr End If - If FB_DATASOURCE <> String.Empty Then - _DB_FIREBIRD = New Firebird(LogConf, FB_DATASOURCE, FB_DATABASE, FB_USER, FB_PW) - End If _EmailAccountID = EmailAccountID SUBJECT_PRAFIX = EmlProfPraefix Catch ex As Exception @@ -125,13 +121,16 @@ Public Class clsWorkEmail _Logger.Debug("Subject: [{0}]", CURRENT_MAIL_SUBJECT) End If - _Logger.Debug($"Working on email from : {CURRENT_MAIL_FROM}...") + _Logger.Info($"Working on email from : {CURRENT_MAIL_FROM}...") + Dim osql = $"Select COALESCE(MAX(GUID),0) FROM TBEMLP_HISTORY WHERE EMAIL_MSGID = '{CURRENT_MAIL_MESSAGE_ID}'" Dim oHistoryID = _DB_MSSQL.GetScalarValue(osql) + If oHistoryID > 0 Then - _Logger.Debug($"Messsage with subject [{CURRENT_MAIL_SUBJECT}] from [{CURRENT_MAIL_FROM}] has already been worked!") + _Logger.Info($"Messsage with subject [{CURRENT_MAIL_SUBJECT}] from [{CURRENT_MAIL_FROM}] has already been worked!") Return True End If + Dim oTempMailExists As Boolean = SAVE2TEMP(CurrentMail) 'Checking wether Mail can be opened Dim oTempMailAccessible As Boolean = False @@ -152,7 +151,7 @@ Public Class clsWorkEmail Else _Logger.Debug("CommonEmail-Process-Sniffer") If COMMON_EMAIL_IN(CurrentMail) = True Then - INSERT_HISTORY_MSSQL() + InsertHistoryEntry() If CURRENT_ATTMT_COUNT = 0 Then _Logger.Info("### Mail contained no Attachments!! ###") Dim oBody = EmailStrings.EMAIL_NO_FERDS @@ -553,7 +552,6 @@ Public Class clsWorkEmail End Try End Function Private Function EXTRACT_BODY() - TEMP_HTML_RESULTS.Clear() Dim oDTFunctionRegex As DataTable = _DB_MSSQL.GetDatatable("SELECT * FROM TBDD_FUNCTION_REGEX WHERE UPPER(FUNCTION_NAME) IN (UPPER('EMAIL_PROFILER - RemoveHTMLText'),UPPER('EMAIL_PROFILER - RemoveHTMLText1'))") Dim oBodyText As String = "" @@ -654,8 +652,7 @@ Public Class clsWorkEmail End Function Private Function EXTRACT_ATTACHMENTS(pCurrentMail As MailContainer, pExtractPath As String, pErrorPath As String) _Logger.Debug("In EXTRACT_ATTACHMENTS...") - 'PATH_EXTRACT_ATTACHMENTS = pExtractPath - 'PATH_ERROR = pErrorPath + _Logger.Debug(String.Format("PATH_TEMP[{0}]", pExtractPath)) Dim oAttachmentCount As Integer oAttachmentCount = 0 @@ -710,8 +707,8 @@ Public Class clsWorkEmail Dim oFileLenth As Long = oFileInfo.Length If oFileLenth > 2 Then _Logger.Info(String.Format("Attachment saved to [{0}]", oAttachmentFilePath)) - INSERT_HISTORY_FB(CURRENT_MAIL_MESSAGE_ID, oAttachment.SafeFileName) - INSERT_HISTORY_ATTMT_MSSQL(CURRENT_MAIL_MESSAGE_ID, oAttachment.SafeFileName) + 'INSERT_HISTORY_FB(CURRENT_MAIL_MESSAGE_ID, oAttachment.SafeFileName) + InsertAttachmentHistoryEntry(CURRENT_MAIL_MESSAGE_ID, oAttachment.SafeFileName) oAttachmentCount += 1 Else _Logger.Warn($"##!! oFileLenth for AttachmentObjects is <2 !!##") @@ -758,7 +755,7 @@ Public Class clsWorkEmail End Try End Function - Private Function INSERT_HISTORY_MSSQL() As Boolean + Private Function InsertHistoryEntry() As Boolean If MessageError = False Then Dim ins = $"INSERT INTO TBEMLP_HISTORY (WORK_PROCESS,EMAIL_MSGID,EMAIL_SUBJECT,EMAIL_DATE,EMAIL_BODY,EMAIL_SUBSTRING1,EMAIL_SUBSTRING2,EMAIL_FROM,PROFILE_ID) VALUES " & $"('{CurrentMailProcessName}'," & @@ -776,32 +773,8 @@ Public Class clsWorkEmail Return False End If End Function - Private Function INSERT_HISTORY_FB(oGUID As String, ATTMT1 As String) As Boolean - If IsNothing(_DB_FIREBIRD) Then - _Logger.Info("INSERT_HISTORY_FB: _firebird is nothing ") - Return False - End If - Try - If MessageError = False Then - Dim ins = $"INSERT INTO TBEDM_EMAIL_PROFILER_HISTORY (WORK_PROCESS,EMAIL_MSGID,EMAIL_FROM,EMAIL_SUBJECT,EMAIL_DATETIME,EMAIL_BODY,EMAIL_SUBSTRING1,EMAIL_SUBSTRING2,EMAIL_ATTMT1) VALUES " & - $"('{CurrentMailProcessName}'," & - $"'{oGUID}'," & - $"'{CURRENT_MAIL_FROM}'," & - $"'{CURRENT_MAIL_SUBJECT}'," & - $"'{CURRENT_MAIL_MESSAGE.Date}'," & - $"'{CURRENT_MAIL_BODY_ALL}'," & - $"'{CURRENT_MAIL_BODY_ANSWER1}'," & - $"'{CURRENT_MAIL_BODY_Substr2}'," & - $"'{ATTMT1}')" - Return _DB_FIREBIRD.ExecuteNonQuery(ins) - End If - Catch ex As Exception - _Logger.Error(ex) - Return False - End Try - End Function - Private Function INSERT_HISTORY_ATTMT_MSSQL(oMSGID As String, ATTMT1 As String) + Private Function InsertAttachmentHistoryEntry(pMessageId As String, pFileName As String) As Boolean If IsNothing(_DB_MSSQL) Then _Logger.Info("INSERT_HISTORY_FB: _DB_MSSQL is nothing ") Return False @@ -809,19 +782,21 @@ Public Class clsWorkEmail Try If MessageError = False Then Dim ins = $"INSERT INTO TBEMLP_HISTORY_ATTACHMENT (WORK_PROCESS,EMAIL_MSGID,EMAIL_FROM,EMAIL_SUBJECT,EMAIL_DATETIME,EMAIL_BODY,EMAIL_ATTMT) VALUES " & - $"('{CurrentMailProcessName}'," & - $"'{oMSGID}'," & - $"'{CURRENT_MAIL_FROM}'," & - $"'{CURRENT_MAIL_SUBJECT}'," & - $"'{CURRENT_MAIL_MESSAGE.Date}'," & - $"'{CURRENT_MAIL_BODY_ALL}'," & - $"'{ATTMT1}')" + $"('{CurrentMailProcessName}'," & + $"'{pMessageId}'," & + $"'{CURRENT_MAIL_FROM}'," & + $"'{CURRENT_MAIL_SUBJECT}'," & + $"'{CURRENT_MAIL_MESSAGE.Date}'," & + $"'{CURRENT_MAIL_BODY_ALL}'," & + $"'{pFileName}')" _DB_MSSQL.ExecuteNonQuery(ins) End If + + Return True Catch ex As Exception _Logger.Error(ex) + Return False End Try - End Function Private Function WORK_POLL_STEPS() As Boolean @@ -884,7 +859,7 @@ Public Class clsWorkEmail Return False End Try End Function - Private Function WORK_INDEXING_STEPS() + Private Function WORK_INDEXING_STEPS() As Boolean Try For Each row As DataRow In DT_INDEXING_STEPS.Rows @@ -897,7 +872,7 @@ Public Class clsWorkEmail Next - + Return True Catch ex As Exception MessageError = True _Logger.Error(ex) @@ -1005,10 +980,10 @@ Public Class clsWorkEmail End Function Public Function REGEX_CHECK_DOC_ID(SearchString As String) Try - Dim regex As Regex = New Regex("\[DID#{1}([0-9]+)]{1}") + Dim oRegex As New Regex("\[DID#{1}([0-9]+)]{1}") _Logger.Debug("REGEX_String before replacing: '" & SearchString & "'") ' Regulären Ausdruck zum Auslesen der windream-Indexe definieren - Dim elements As MatchCollection = regex.Matches(SearchString) + Dim elements As MatchCollection = oRegex.Matches(SearchString) Dim result = "" For Each element As Match In elements result = element.Groups(1).Value @@ -1019,7 +994,6 @@ Public Class clsWorkEmail Catch ex As Exception MessageError = True _Logger.Error(ex) - 'clsLogger.AddError("Unexpected error: " & ex.Message, "REGEX_CHECK_DOC_ID") Return Nothing End Try End Function diff --git a/App/DigitalData.EMLProfiler/clsWorker.vb b/App/EmailProfiler.Common/clsWorker.vb similarity index 96% rename from App/DigitalData.EMLProfiler/clsWorker.vb rename to App/EmailProfiler.Common/clsWorker.vb index d07fe48..438ee92 100644 --- a/App/DigitalData.EMLProfiler/clsWorker.vb +++ b/App/EmailProfiler.Common/clsWorker.vb @@ -19,7 +19,7 @@ Public Class clsWorker Private ReadOnly _wrapper As clsEncryption Private ReadOnly _POLL_PROFILEID As Integer = 0 Private ReadOnly Eml_Limitation_Sender As String = "" - Sub New(EML_LIMITATION As String, pLogConfig As LogConfig, ConStr As String, WMConStr As String, POLL_PROFILEID As Integer, FB_DATASOURCE As String, FB_DATABASE As String, FB_USER As String, FB_PW As String, USE_WM As Boolean, EmailAccountID As Integer, EmlProfPraefix As String, Optional plocaleml As String = "") + Sub New(pLogConfig As LogConfig, ConStr As String, WMConStr As String, POLL_PROFILEID As Integer, USE_WM As Boolean, EmailAccountID As Integer, EmlProfPraefix As String, EML_LIMITATION As String, Optional plocaleml As String = "") Logger = pLogConfig.GetLogger _emailIMAP = New clsEmailIMAP(pLogConfig) _Database = New MSSQLServer(pLogConfig, ConStr) @@ -31,7 +31,7 @@ Public Class clsWorker _windream_index = New clsWindream_Index(pLogConfig) End If - _workmail = New clsWorkEmail(pLogConfig, ConStr, WMConStr, FB_DATASOURCE, FB_DATABASE, FB_USER, FB_PW, USE_WM, EmailAccountID, EmlProfPraefix) + _workmail = New clsWorkEmail(pLogConfig, ConStr, WMConStr, USE_WM, EmailAccountID, EmlProfPraefix) _wrapper = New clsEncryption("!35452didalog=", pLogConfig) _POLL_PROFILEID = POLL_PROFILEID CURRENT_DEBUG_LOCAL_EMAIL = plocaleml @@ -42,9 +42,9 @@ Public Class clsWorker For Each _file In TEMP_FILES Logger.Debug("Trying to delete temp file: [{0}]", _file) - If System.IO.File.Exists(_file) Then + If IO.File.Exists(_file) Then Try - System.IO.File.Delete(_file) + IO.File.Delete(_file) Catch ex As Exception Logger.Error(ex) Logger.Warn($"TempFileDelete - Could not delete the tempfile from TEMP_FILES: {ex.Message}") diff --git a/App/DigitalData.EMLProfiler/packages.config b/App/EmailProfiler.Common/packages.config similarity index 100% rename from App/DigitalData.EMLProfiler/packages.config rename to App/EmailProfiler.Common/packages.config diff --git a/App/EmailProfiler.Form/App.config b/App/EmailProfiler.Form/App.config new file mode 100644 index 0000000..6c4ac76 --- /dev/null +++ b/App/EmailProfiler.Form/App.config @@ -0,0 +1,68 @@ + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd + + + + + + + + + + + + False + + + + + + + + + + + + + sysdba + + + dd + + + False + + + NONE + + + + diff --git a/App/CONFIG_APP/CONFIG_APP.vbproj.bak b/App/EmailProfiler.Form/CONFIG_APP.vbproj.bak similarity index 100% rename from App/CONFIG_APP/CONFIG_APP.vbproj.bak rename to App/EmailProfiler.Form/CONFIG_APP.vbproj.bak diff --git a/App/EmailProfiler.Form/Config.vb b/App/EmailProfiler.Form/Config.vb new file mode 100644 index 0000000..764bf38 --- /dev/null +++ b/App/EmailProfiler.Form/Config.vb @@ -0,0 +1,11 @@ +Public Class Config + Public Property Debug As Boolean = False + Public Property EmailAccountId As Integer = 0 + Public Property EmailTitlePrefix As String = "EmailProfiler" + Public Property EmailSenderLimitation As String = "" + Public Property ConnectionString As String = "" + Public Property UseWindream As Boolean = False + + Public Property EmailTestReceiver As String = "" + Public Property EmailTestHTML As String = "" +End Class diff --git a/App/CONFIG_APP/CONFIG_APP.vbproj b/App/EmailProfiler.Form/EmailProfiler.Form.vbproj similarity index 91% rename from App/CONFIG_APP/CONFIG_APP.vbproj rename to App/EmailProfiler.Form/EmailProfiler.Form.vbproj index 808be90..598ceae 100644 --- a/App/CONFIG_APP/CONFIG_APP.vbproj +++ b/App/EmailProfiler.Form/EmailProfiler.Form.vbproj @@ -6,9 +6,9 @@ AnyCPU {CADEB4EE-C7EF-446D-8F18-69A89E65EBBD} WinExe - CONFIG_APP.My.MyApplication - CONFIG_APP - CONFIG_APP + EmailProfiler.Form.My.MyApplication + EmailProfiler.Form + EmailProfiler.Form 512 WindowsForms v4.6.2 @@ -22,7 +22,7 @@ true true bin\Debug\ - CONFIG_APP.xml + EmailProfiler.Form.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -32,7 +32,7 @@ true true bin\Release\ - CONFIG_APP.xml + EmailProfiler.Form.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -55,10 +55,14 @@ + + + ..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll @@ -103,6 +107,7 @@ + Form @@ -193,9 +198,9 @@ - + {9f748dcd-952e-40a0-9dad-65bf8a39b231} - DigitalData.EMLProfiler + EmailProfiler.Common diff --git a/App/CONFIG_APP/ModuleSettings.vb b/App/EmailProfiler.Form/ModuleSettings.vb similarity index 100% rename from App/CONFIG_APP/ModuleSettings.vb rename to App/EmailProfiler.Form/ModuleSettings.vb diff --git a/App/CONFIG_APP/My Project/Application.Designer.vb b/App/EmailProfiler.Form/My Project/Application.Designer.vb similarity index 96% rename from App/CONFIG_APP/My Project/Application.Designer.vb rename to App/EmailProfiler.Form/My Project/Application.Designer.vb index 6d02136..45a34ef 100644 --- a/App/CONFIG_APP/My Project/Application.Designer.vb +++ b/App/EmailProfiler.Form/My Project/Application.Designer.vb @@ -32,7 +32,7 @@ Namespace My _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.CONFIG_APP.frmMain + Me.MainForm = Global.EmailProfiler.Form.frmMain End Sub End Class End Namespace diff --git a/App/CONFIG_APP/My Project/Application.myapp b/App/EmailProfiler.Form/My Project/Application.myapp similarity index 100% rename from App/CONFIG_APP/My Project/Application.myapp rename to App/EmailProfiler.Form/My Project/Application.myapp diff --git a/App/CONFIG_APP/My Project/AssemblyInfo.vb b/App/EmailProfiler.Form/My Project/AssemblyInfo.vb similarity index 100% rename from App/CONFIG_APP/My Project/AssemblyInfo.vb rename to App/EmailProfiler.Form/My Project/AssemblyInfo.vb diff --git a/App/CONFIG_APP/My Project/Resources.Designer.vb b/App/EmailProfiler.Form/My Project/Resources.Designer.vb similarity index 98% rename from App/CONFIG_APP/My Project/Resources.Designer.vb rename to App/EmailProfiler.Form/My Project/Resources.Designer.vb index 2c0f7b9..22cdbd8 100644 --- a/App/CONFIG_APP/My Project/Resources.Designer.vb +++ b/App/EmailProfiler.Form/My Project/Resources.Designer.vb @@ -39,7 +39,7 @@ Namespace My.Resources Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("CONFIG_APP.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EmailProfiler.Form.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan diff --git a/App/CONFIG_APP/My Project/Resources.resx b/App/EmailProfiler.Form/My Project/Resources.resx similarity index 100% rename from App/CONFIG_APP/My Project/Resources.resx rename to App/EmailProfiler.Form/My Project/Resources.resx diff --git a/App/CONFIG_APP/My Project/Settings.Designer.vb b/App/EmailProfiler.Form/My Project/Settings.Designer.vb similarity index 97% rename from App/CONFIG_APP/My Project/Settings.Designer.vb rename to App/EmailProfiler.Form/My Project/Settings.Designer.vb index 888b1d5..8c0d39d 100644 --- a/App/CONFIG_APP/My Project/Settings.Designer.vb +++ b/App/EmailProfiler.Form/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -190,9 +190,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.CONFIG_APP.My.MySettings + Friend ReadOnly Property Settings() As Global.EmailProfiler.Form.My.MySettings Get - Return Global.CONFIG_APP.My.MySettings.Default + Return Global.EmailProfiler.Form.My.MySettings.Default End Get End Property End Module diff --git a/App/CONFIG_APP/My Project/Settings.settings b/App/EmailProfiler.Form/My Project/Settings.settings similarity index 100% rename from App/CONFIG_APP/My Project/Settings.settings rename to App/EmailProfiler.Form/My Project/Settings.settings diff --git a/App/EmailProfiler.Form/My Project/licenses.licx b/App/EmailProfiler.Form/My Project/licenses.licx new file mode 100644 index 0000000..7f629a5 --- /dev/null +++ b/App/EmailProfiler.Form/My Project/licenses.licx @@ -0,0 +1,2 @@ +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/App/CONFIG_APP/My Project/licenses.licx.bak b/App/EmailProfiler.Form/My Project/licenses.licx.bak similarity index 100% rename from App/CONFIG_APP/My Project/licenses.licx.bak rename to App/EmailProfiler.Form/My Project/licenses.licx.bak diff --git a/App/CONFIG_APP/MyDataset.Designer.vb b/App/EmailProfiler.Form/MyDataset.Designer.vb similarity index 99% rename from App/CONFIG_APP/MyDataset.Designer.vb rename to App/EmailProfiler.Form/MyDataset.Designer.vb index ce812ed..ae60be5 100644 --- a/App/CONFIG_APP/MyDataset.Designer.vb +++ b/App/EmailProfiler.Form/MyDataset.Designer.vb @@ -6105,7 +6105,7 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString + Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString + Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString + Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString + Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString + Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString + Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.CONFIG_APP.My.MySettings.Default.MyDatasetConnString + Me._connection.ConnectionString = Global.EmailProfiler.Form.My.MySettings.Default.MyDatasetConnString End Sub - - + - - + diff --git a/App/CONFIG_APP/MyDataset.xsd b/App/EmailProfiler.Form/MyDataset.xsd similarity index 84% rename from App/CONFIG_APP/MyDataset.xsd rename to App/EmailProfiler.Form/MyDataset.xsd index 781d57e..19836ef 100644 --- a/App/CONFIG_APP/MyDataset.xsd +++ b/App/EmailProfiler.Form/MyDataset.xsd @@ -4,7 +4,7 @@ - + @@ -602,162 +602,162 @@ SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, PORT, ACTIVE, A - + - + - - + + - + - - + + - - - - + + + + - - + + - + - + - - + + - + - - - - + + + + - + - + - + - + - + - + - - + + - - - + + + - - + + - - + + - - + + @@ -767,266 +767,266 @@ SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, PORT, ACTIVE, A - + - - - + + + - + - + - - - + + + - - + + - + - + - - - + + + - + - - - - + + + + - - + + - + - + - - + + - + - + - - + + - + - + - + - + - + - - + + - - - - + + + + - + - + - - + + - + - + - - + + - + - + - + - + - - - + + + - - + + - - - + + + - - + + @@ -1069,9 +1069,9 @@ SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, PORT, ACTIVE, A - - - + + + \ No newline at end of file diff --git a/App/CONFIG_APP/MyDataset.xss b/App/EmailProfiler.Form/MyDataset.xss similarity index 100% rename from App/CONFIG_APP/MyDataset.xss rename to App/EmailProfiler.Form/MyDataset.xss diff --git a/App/CONFIG_APP/Resources/Encrypt.png b/App/EmailProfiler.Form/Resources/Encrypt.png similarity index 100% rename from App/CONFIG_APP/Resources/Encrypt.png rename to App/EmailProfiler.Form/Resources/Encrypt.png diff --git a/App/CONFIG_APP/Resources/arrow_Down_16xMD.png b/App/EmailProfiler.Form/Resources/arrow_Down_16xMD.png similarity index 100% rename from App/CONFIG_APP/Resources/arrow_Down_16xMD.png rename to App/EmailProfiler.Form/Resources/arrow_Down_16xMD.png diff --git a/App/CONFIG_APP/Resources/arrow_right.png b/App/EmailProfiler.Form/Resources/arrow_right.png similarity index 100% rename from App/CONFIG_APP/Resources/arrow_right.png rename to App/EmailProfiler.Form/Resources/arrow_right.png diff --git a/App/CONFIG_APP/Resources/email_go.png b/App/EmailProfiler.Form/Resources/email_go.png similarity index 100% rename from App/CONFIG_APP/Resources/email_go.png rename to App/EmailProfiler.Form/Resources/email_go.png diff --git a/App/CONFIG_APP/Resources/folder_Closed_16xLG.png b/App/EmailProfiler.Form/Resources/folder_Closed_16xLG.png similarity index 100% rename from App/CONFIG_APP/Resources/folder_Closed_16xLG.png rename to App/EmailProfiler.Form/Resources/folder_Closed_16xLG.png diff --git a/App/CONFIG_APP/Resources/handdrawn_arrow_down.png b/App/EmailProfiler.Form/Resources/handdrawn_arrow_down.png similarity index 100% rename from App/CONFIG_APP/Resources/handdrawn_arrow_down.png rename to App/EmailProfiler.Form/Resources/handdrawn_arrow_down.png diff --git a/App/CONFIG_APP/Resources/key_16xLG.png b/App/EmailProfiler.Form/Resources/key_16xLG.png similarity index 100% rename from App/CONFIG_APP/Resources/key_16xLG.png rename to App/EmailProfiler.Form/Resources/key_16xLG.png diff --git a/App/CONFIG_APP/Resources/refresh_16xLG.png b/App/EmailProfiler.Form/Resources/refresh_16xLG.png similarity index 100% rename from App/CONFIG_APP/Resources/refresh_16xLG.png rename to App/EmailProfiler.Form/Resources/refresh_16xLG.png diff --git a/App/CONFIG_APP/Resources/save_16xMD.png b/App/EmailProfiler.Form/Resources/save_16xMD.png similarity index 100% rename from App/CONFIG_APP/Resources/save_16xMD.png rename to App/EmailProfiler.Form/Resources/save_16xMD.png diff --git a/App/CONFIG_APP/email_download_handdrawn.ico b/App/EmailProfiler.Form/email_download_handdrawn.ico similarity index 100% rename from App/CONFIG_APP/email_download_handdrawn.ico rename to App/EmailProfiler.Form/email_download_handdrawn.ico diff --git a/App/CONFIG_APP/frmMain.Designer.vb b/App/EmailProfiler.Form/frmMain.Designer.vb similarity index 85% rename from App/CONFIG_APP/frmMain.Designer.vb rename to App/EmailProfiler.Form/frmMain.Designer.vb index 6b29c33..1cc7e8f 100644 --- a/App/CONFIG_APP/frmMain.Designer.vb +++ b/App/EmailProfiler.Form/frmMain.Designer.vb @@ -1,6 +1,6 @@  Partial Class frmMain - Inherits System.Windows.Forms.Form + Inherits DevExpress.XtraEditors.XtraForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -86,18 +86,11 @@ Partial Class frmMain Me.tslblstatus = New System.Windows.Forms.ToolStripStatusLabel() Me.tslblRefresh = New System.Windows.Forms.ToolStripStatusLabel() Me.ToolStripStatusLabel1 = New System.Windows.Forms.ToolStripStatusLabel() - Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() - Me.tsbtnRunLocalMail = New System.Windows.Forms.ToolStripButton() - Me.tsbtnRunProfiles = New System.Windows.Forms.ToolStripButton() - Me.ToolStripProgressBar1 = New System.Windows.Forms.ToolStripProgressBar() - Me.ToolStripEmailAccountID = New System.Windows.Forms.ToolStripTextBox() - Me.ToolStripLabel5 = New System.Windows.Forms.ToolStripLabel() Me.TabControl1 = New System.Windows.Forms.TabControl() - Me.Profilkonfiguration = New System.Windows.Forms.TabPage() - Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.tabProfile = New System.Windows.Forms.TabPage() Me.GridControl4 = New DevExpress.XtraGrid.GridControl() Me.TBEMLP_POLL_PROFILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.MyDataset = New CONFIG_APP.MyDataset() + Me.MyDataset = New EmailProfiler.Form.MyDataset() Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colPROFILE_NAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.colCOMMENT1 = New DevExpress.XtraGrid.Columns.GridColumn() @@ -117,6 +110,12 @@ Partial Class frmMain Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton9 = New System.Windows.Forms.ToolStripButton() + Me.tsbtnRunLocalMail2 = New System.Windows.Forms.ToolStripButton() + Me.tsbtnRunProfiles2 = New System.Windows.Forms.ToolStripButton() + Me.ToolStripProgressBar2 = New System.Windows.Forms.ToolStripProgressBar() + Me.ToolStripEmailAccountID2 = New System.Windows.Forms.ToolStripTextBox() + Me.ToolStripLabel6 = New System.Windows.Forms.ToolStripLabel() + Me.ToolStripLabel7 = New System.Windows.Forms.ToolStripLabel() Me.POLL_TYPEComboBox = New System.Windows.Forms.ComboBox() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() @@ -128,7 +127,6 @@ Partial Class frmMain Me.txtSubjectExample = New System.Windows.Forms.TextBox() Me.Label9 = New System.Windows.Forms.Label() Me.NumericUpDown2 = New System.Windows.Forms.NumericUpDown() - Me.WM_IMPORTCheckBox = New System.Windows.Forms.CheckBox() Me.CHANGED_WHENTextBox1 = New System.Windows.Forms.TextBox() Me.CHANGED_WHOProcessTextBox = New System.Windows.Forms.TextBox() Me.ADDED_WHENTextBox1 = New System.Windows.Forms.TextBox() @@ -137,6 +135,7 @@ Partial Class frmMain Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.WM_PATHTextBox = New System.Windows.Forms.TextBox() Me.WM_FILE_NAMETextBox = New System.Windows.Forms.TextBox() + Me.WM_IMPORTCheckBox = New System.Windows.Forms.CheckBox() Me.STEP_NAMEComboBox = New System.Windows.Forms.ComboBox() Me.PROCESS_NAMEComboBox = New System.Windows.Forms.ComboBox() Me.GUIDProcessTextBox = New System.Windows.Forms.TextBox() @@ -237,7 +236,20 @@ Partial Class frmMain Me.ACTIVECheckBox = New System.Windows.Forms.CheckBox() Me.ADDED_WHENTextBox = New System.Windows.Forms.TextBox() Me.ADDED_WHOTextBox = New System.Windows.Forms.TextBox() - Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.tabConfig = New System.Windows.Forms.TabPage() + Me.GroupBox4 = New System.Windows.Forms.GroupBox() + Me.Button3 = New System.Windows.Forms.Button() + Me.btnTestRegEx = New System.Windows.Forms.Button() + Me.Label14 = New System.Windows.Forms.Label() + Me.txtResultRegEx = New System.Windows.Forms.TextBox() + Me.txthtmlEmail = New System.Windows.Forms.TextBox() + Me.GroupBox5 = New System.Windows.Forms.GroupBox() + Me.Button5 = New System.Windows.Forms.Button() + Me.txtRegex2 = New System.Windows.Forms.TextBox() + Me.Label13 = New System.Windows.Forms.Label() + Me.btnsaveRegex = New System.Windows.Forms.Button() + Me.txtRegex1 = New System.Windows.Forms.TextBox() + Me.Label8 = New System.Windows.Forms.Label() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.CHANGED_WHENTextBox4 = New System.Windows.Forms.TextBox() Me.TBEMLP_CONFIGBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -247,6 +259,7 @@ Partial Class frmMain Me.btnShowLogpath = New System.Windows.Forms.Button() Me.LOG_ERRORS_ONLYCheckBox = New System.Windows.Forms.CheckBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.txtConnectionString = New System.Windows.Forms.TextBox() Me.Label1 = New System.Windows.Forms.Label() Me.BtnConnect = New System.Windows.Forms.Button() Me.cmbDatenbank = New System.Windows.Forms.ComboBox() @@ -257,32 +270,7 @@ Partial Class frmMain Me.txtUser = New System.Windows.Forms.TextBox() Me.Label3 = New System.Windows.Forms.Label() Me.txtPasswort = New System.Windows.Forms.TextBox() - Me.TabPage1 = New System.Windows.Forms.TabPage() - Me.GridControl5 = New DevExpress.XtraGrid.GridControl() - Me.TBEMLP_HISTORYBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.GridView5 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colWORK_PROCESS = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colEMAIL_DATE = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colEMAIL_MSGID = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colEMAIL_SUBJECT = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colEMAIL_BODY = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colEMAIL_SUBSTRING1 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colEMAIL_SUBSTRING2 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colADDED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colCOMMENT2 = New DevExpress.XtraGrid.Columns.GridColumn() - Me.BindingNavigator5 = New System.Windows.Forms.BindingNavigator(Me.components) - Me.ToolStripLabel4 = New System.Windows.Forms.ToolStripLabel() - Me.ToolStripButton29 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton30 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripTextBox4 = New System.Windows.Forms.ToolStripTextBox() - Me.ToolStripSeparator11 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripButton31 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton32 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripButton34 = New System.Windows.Forms.ToolStripButton() - Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.tabEmail = New System.Windows.Forms.TabPage() Me.btnCheckIMAPObjects = New System.Windows.Forms.Button() Me.AUTH_TYPEComboBox = New System.Windows.Forms.ComboBox() Me.btntestImap = New System.Windows.Forms.Button() @@ -325,28 +313,17 @@ Partial Class frmMain Me.BindingNavigatorMoveLastItem1 = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripButton27 = New System.Windows.Forms.ToolStripButton() - Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.Button5 = New System.Windows.Forms.Button() - Me.txtRegex2 = New System.Windows.Forms.TextBox() - Me.Label13 = New System.Windows.Forms.Label() - Me.GroupBox4 = New System.Windows.Forms.GroupBox() - Me.Button3 = New System.Windows.Forms.Button() - Me.btnTestRegEx = New System.Windows.Forms.Button() - Me.Label14 = New System.Windows.Forms.Label() - Me.txtResultRegEx = New System.Windows.Forms.TextBox() - Me.txthtmlEmail = New System.Windows.Forms.TextBox() - Me.btnsaveRegex = New System.Windows.Forms.Button() - Me.txtRegex1 = New System.Windows.Forms.TextBox() - Me.Label8 = New System.Windows.Forms.Label() + Me.ToolStripButton28 = New System.Windows.Forms.ToolStripButton() + Me.TBEMLP_HISTORYBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() - Me.TBEMLP_POLL_PROFILESTableAdapter = New CONFIG_APP.MyDatasetTableAdapters.TBEMLP_POLL_PROFILESTableAdapter() - Me.TableAdapterManager = New CONFIG_APP.MyDatasetTableAdapters.TableAdapterManager() - Me.TBEMLP_POLL_PROCESSTableAdapter = New CONFIG_APP.MyDatasetTableAdapters.TBEMLP_POLL_PROCESSTableAdapter() - Me.TBEMLP_POLL_STEPSTableAdapter = New CONFIG_APP.MyDatasetTableAdapters.TBEMLP_POLL_STEPSTableAdapter() - Me.TBEMLP_POLL_INDEXING_STEPSTableAdapter = New CONFIG_APP.MyDatasetTableAdapters.TBEMLP_POLL_INDEXING_STEPSTableAdapter() - Me.TBDD_EMAIL_ACCOUNTTableAdapter = New CONFIG_APP.MyDatasetTableAdapters.TBDD_EMAIL_ACCOUNTTableAdapter() - Me.TBEMLP_HISTORYTableAdapter = New CONFIG_APP.MyDatasetTableAdapters.TBEMLP_HISTORYTableAdapter() - Me.TBEMLP_CONFIGTableAdapter = New CONFIG_APP.MyDatasetTableAdapters.TBEMLP_CONFIGTableAdapter() + Me.TBEMLP_POLL_PROFILESTableAdapter = New EmailProfiler.Form.MyDatasetTableAdapters.TBEMLP_POLL_PROFILESTableAdapter() + Me.TableAdapterManager = New EmailProfiler.Form.MyDatasetTableAdapters.TableAdapterManager() + Me.TBEMLP_POLL_PROCESSTableAdapter = New EmailProfiler.Form.MyDatasetTableAdapters.TBEMLP_POLL_PROCESSTableAdapter() + Me.TBEMLP_POLL_STEPSTableAdapter = New EmailProfiler.Form.MyDatasetTableAdapters.TBEMLP_POLL_STEPSTableAdapter() + Me.TBEMLP_POLL_INDEXING_STEPSTableAdapter = New EmailProfiler.Form.MyDatasetTableAdapters.TBEMLP_POLL_INDEXING_STEPSTableAdapter() + Me.TBDD_EMAIL_ACCOUNTTableAdapter = New EmailProfiler.Form.MyDatasetTableAdapters.TBDD_EMAIL_ACCOUNTTableAdapter() + Me.TBEMLP_HISTORYTableAdapter = New EmailProfiler.Form.MyDatasetTableAdapters.TBEMLP_HISTORYTableAdapter() + Me.TBEMLP_CONFIGTableAdapter = New EmailProfiler.Form.MyDatasetTableAdapters.TBEMLP_CONFIGTableAdapter() Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) GUIDLabel = New System.Windows.Forms.Label() @@ -408,9 +385,8 @@ Partial Class frmMain ARCHIVE_FOLDERLabel = New System.Windows.Forms.Label() AUTH_TYPELabel = New System.Windows.Forms.Label() Me.StatusStrip1.SuspendLayout() - Me.ToolStrip1.SuspendLayout() Me.TabControl1.SuspendLayout() - Me.Profilkonfiguration.SuspendLayout() + Me.tabProfile.SuspendLayout() CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBEMLP_POLL_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() @@ -442,25 +418,20 @@ Partial Class frmMain Me.BindingNavigator4.SuspendLayout() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() - Me.TabPage2.SuspendLayout() + Me.tabConfig.SuspendLayout() + Me.GroupBox4.SuspendLayout() + Me.GroupBox5.SuspendLayout() Me.GroupBox3.SuspendLayout() CType(Me.TBEMLP_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CHECK_INTERVALL_MINUTESNumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox1.SuspendLayout() - Me.TabPage1.SuspendLayout() - CType(Me.GridControl5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBEMLP_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.BindingNavigator5, System.ComponentModel.ISupportInitialize).BeginInit() - Me.BindingNavigator5.SuspendLayout() - Me.TabPage3.SuspendLayout() + Me.tabEmail.SuspendLayout() Me.ContextMenuStrip2.SuspendLayout() CType(Me.GridControl6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BindingNavigator6, System.ComponentModel.ISupportInitialize).BeginInit() Me.BindingNavigator6.SuspendLayout() - Me.TabPage4.SuspendLayout() - Me.GroupBox4.SuspendLayout() + CType(Me.TBEMLP_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GUIDLabel @@ -659,7 +630,7 @@ Partial Class frmMain KEYWORDS_BODYLabel.Name = "KEYWORDS_BODYLabel" KEYWORDS_BODYLabel.Size = New System.Drawing.Size(142, 13) KEYWORDS_BODYLabel.TabIndex = 7 - KEYWORDS_BODYLabel.Text = "Keywords (seperated via ;):" + KEYWORDS_BODYLabel.Text = "Keywords (separated via ;):" ' 'COMMENTLabel1 ' @@ -1009,107 +980,50 @@ Partial Class frmMain Me.ToolStripStatusLabel1.Name = "ToolStripStatusLabel1" Me.ToolStripStatusLabel1.Size = New System.Drawing.Size(0, 17) ' - 'ToolStrip1 - ' - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnRunLocalMail, Me.tsbtnRunProfiles, Me.ToolStripProgressBar1, Me.ToolStripEmailAccountID, Me.ToolStripLabel5}) - Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) - Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(1227, 25) - Me.ToolStrip1.TabIndex = 1 - Me.ToolStrip1.Text = "ToolStrip1" - ' - 'tsbtnRunLocalMail - ' - Me.tsbtnRunLocalMail.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.tsbtnRunLocalMail.Image = Global.CONFIG_APP.My.Resources.Resources.email_go - Me.tsbtnRunLocalMail.ImageTransparentColor = System.Drawing.Color.Magenta - Me.tsbtnRunLocalMail.Name = "tsbtnRunLocalMail" - Me.tsbtnRunLocalMail.Size = New System.Drawing.Size(133, 22) - Me.tsbtnRunLocalMail.Text = "Test with local email" - ' - 'tsbtnRunProfiles - ' - Me.tsbtnRunProfiles.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.tsbtnRunProfiles.Image = CType(resources.GetObject("tsbtnRunProfiles.Image"), System.Drawing.Image) - Me.tsbtnRunProfiles.ImageTransparentColor = System.Drawing.Color.Magenta - Me.tsbtnRunProfiles.Name = "tsbtnRunProfiles" - Me.tsbtnRunProfiles.Size = New System.Drawing.Size(137, 22) - Me.tsbtnRunProfiles.Text = "Run profile manually" - ' - 'ToolStripProgressBar1 - ' - Me.ToolStripProgressBar1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripProgressBar1.Name = "ToolStripProgressBar1" - Me.ToolStripProgressBar1.Size = New System.Drawing.Size(100, 22) - ' - 'ToolStripEmailAccountID - ' - Me.ToolStripEmailAccountID.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripEmailAccountID.Font = New System.Drawing.Font("Segoe UI", 9.0!) - Me.ToolStripEmailAccountID.Name = "ToolStripEmailAccountID" - Me.ToolStripEmailAccountID.Size = New System.Drawing.Size(100, 25) - ' - 'ToolStripLabel5 - ' - Me.ToolStripLabel5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripLabel5.Name = "ToolStripLabel5" - Me.ToolStripLabel5.Size = New System.Drawing.Size(95, 22) - Me.ToolStripLabel5.Text = "EmailAccountID:" - ' 'TabControl1 ' - Me.TabControl1.Controls.Add(Me.Profilkonfiguration) - Me.TabControl1.Controls.Add(Me.TabPage2) - Me.TabControl1.Controls.Add(Me.TabPage1) - Me.TabControl1.Controls.Add(Me.TabPage3) - Me.TabControl1.Controls.Add(Me.TabPage4) + Me.TabControl1.Controls.Add(Me.tabProfile) + Me.TabControl1.Controls.Add(Me.tabEmail) + Me.TabControl1.Controls.Add(Me.tabConfig) Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.TabControl1.Location = New System.Drawing.Point(0, 25) + Me.TabControl1.Location = New System.Drawing.Point(0, 0) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(1227, 560) + Me.TabControl1.Size = New System.Drawing.Size(1227, 585) Me.TabControl1.TabIndex = 2 ' - 'Profilkonfiguration + 'tabProfile ' - Me.Profilkonfiguration.AutoScroll = True - Me.Profilkonfiguration.Controls.Add(Me.TextBox1) - Me.Profilkonfiguration.Controls.Add(Me.GridControl4) - Me.Profilkonfiguration.Controls.Add(Me.ComboBox1) - Me.Profilkonfiguration.Controls.Add(Me.BindingNavigator1) - Me.Profilkonfiguration.Controls.Add(Me.POLL_TYPEComboBox) - Me.Profilkonfiguration.Controls.Add(Me.XtraTabControl1) - Me.Profilkonfiguration.Controls.Add(POLL_TYPELabel) - Me.Profilkonfiguration.Controls.Add(CHANGED_WHOLabel) - Me.Profilkonfiguration.Controls.Add(GUIDLabel) - Me.Profilkonfiguration.Controls.Add(Me.CHANGED_WHOProfilesTextBox) - Me.Profilkonfiguration.Controls.Add(Me.GUIDTextBox) - Me.Profilkonfiguration.Controls.Add(EMAIL_CONF_IDLabel) - Me.Profilkonfiguration.Controls.Add(PROFILE_NAMELabel) - Me.Profilkonfiguration.Controls.Add(CHANGED_WHENLabel) - Me.Profilkonfiguration.Controls.Add(Me.PROFILE_NAMETextBox) - Me.Profilkonfiguration.Controls.Add(COMMENTLabel) - Me.Profilkonfiguration.Controls.Add(Me.CHANGED_WHENTextBox) - Me.Profilkonfiguration.Controls.Add(Me.COMMENTTextBox) - Me.Profilkonfiguration.Controls.Add(ADDED_WHOLabel) - Me.Profilkonfiguration.Controls.Add(Me.ACTIVECheckBox) - Me.Profilkonfiguration.Controls.Add(Me.ADDED_WHENTextBox) - Me.Profilkonfiguration.Controls.Add(Me.ADDED_WHOTextBox) - Me.Profilkonfiguration.Controls.Add(ADDED_WHENLabel) - Me.Profilkonfiguration.Location = New System.Drawing.Point(4, 22) - Me.Profilkonfiguration.Name = "Profilkonfiguration" - Me.Profilkonfiguration.Padding = New System.Windows.Forms.Padding(3) - Me.Profilkonfiguration.Size = New System.Drawing.Size(1219, 534) - Me.Profilkonfiguration.TabIndex = 0 - Me.Profilkonfiguration.Text = "Profilkonfiguration" - Me.Profilkonfiguration.UseVisualStyleBackColor = True - ' - 'TextBox1 - ' - Me.TextBox1.Location = New System.Drawing.Point(267, 111) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(100, 21) - Me.TextBox1.TabIndex = 34 + Me.tabProfile.AutoScroll = True + Me.tabProfile.Controls.Add(Me.GridControl4) + Me.tabProfile.Controls.Add(Me.ComboBox1) + Me.tabProfile.Controls.Add(Me.BindingNavigator1) + Me.tabProfile.Controls.Add(Me.POLL_TYPEComboBox) + Me.tabProfile.Controls.Add(Me.XtraTabControl1) + Me.tabProfile.Controls.Add(POLL_TYPELabel) + Me.tabProfile.Controls.Add(CHANGED_WHOLabel) + Me.tabProfile.Controls.Add(GUIDLabel) + Me.tabProfile.Controls.Add(Me.CHANGED_WHOProfilesTextBox) + Me.tabProfile.Controls.Add(Me.GUIDTextBox) + Me.tabProfile.Controls.Add(EMAIL_CONF_IDLabel) + Me.tabProfile.Controls.Add(PROFILE_NAMELabel) + Me.tabProfile.Controls.Add(CHANGED_WHENLabel) + Me.tabProfile.Controls.Add(Me.PROFILE_NAMETextBox) + Me.tabProfile.Controls.Add(COMMENTLabel) + Me.tabProfile.Controls.Add(Me.CHANGED_WHENTextBox) + Me.tabProfile.Controls.Add(Me.COMMENTTextBox) + Me.tabProfile.Controls.Add(ADDED_WHOLabel) + Me.tabProfile.Controls.Add(Me.ACTIVECheckBox) + Me.tabProfile.Controls.Add(Me.ADDED_WHENTextBox) + Me.tabProfile.Controls.Add(Me.ADDED_WHOTextBox) + Me.tabProfile.Controls.Add(ADDED_WHENLabel) + Me.tabProfile.Location = New System.Drawing.Point(4, 22) + Me.tabProfile.Name = "tabProfile" + Me.tabProfile.Padding = New System.Windows.Forms.Padding(3) + Me.tabProfile.Size = New System.Drawing.Size(1219, 559) + Me.tabProfile.TabIndex = 0 + Me.tabProfile.Text = "Profilkonfiguration" + Me.tabProfile.UseVisualStyleBackColor = True ' 'GridControl4 ' @@ -1119,7 +1033,7 @@ Partial Class frmMain Me.GridControl4.Location = New System.Drawing.Point(3, 31) Me.GridControl4.MainView = Me.GridView4 Me.GridControl4.Name = "GridControl4" - Me.GridControl4.Size = New System.Drawing.Size(245, 127) + Me.GridControl4.Size = New System.Drawing.Size(245, 152) Me.GridControl4.TabIndex = 33 Me.GridControl4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4}) ' @@ -1148,8 +1062,8 @@ Partial Class frmMain Me.GridView4.OptionsView.EnableAppearanceEvenRow = True Me.GridView4.OptionsView.ShowAutoFilterRow = True Me.GridView4.OptionsView.ShowDetailButtons = False - Me.GridView4.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.ShowAlways Me.GridView4.OptionsView.ShowGroupPanel = False + Me.GridView4.OptionsView.ShowIndicator = False ' 'colPROFILE_NAME ' @@ -1191,7 +1105,7 @@ Partial Class frmMain Me.BindingNavigator1.CountItem = Me.BindingNavigatorCountItem Me.BindingNavigator1.CountItemFormat = "von {0} Email-Profilen" Me.BindingNavigator1.DeleteItem = Me.BindingNavigatorDeleteItem - Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.ToolStripButton1, Me.ToolStripButton9, Me.BindingNavigatorDeleteItem}) + Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.ToolStripButton1, Me.ToolStripButton9, Me.BindingNavigatorDeleteItem, Me.tsbtnRunLocalMail2, Me.tsbtnRunProfiles2, Me.ToolStripProgressBar2, Me.ToolStripEmailAccountID2, Me.ToolStripLabel6, Me.ToolStripLabel7}) Me.BindingNavigator1.Location = New System.Drawing.Point(3, 3) Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem @@ -1292,7 +1206,7 @@ Partial Class frmMain 'ToolStripButton1 ' Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton1.Image = Global.CONFIG_APP.My.Resources.Resources.save_16xMD + Me.ToolStripButton1.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton1.Name = "ToolStripButton1" Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22) @@ -1301,12 +1215,57 @@ Partial Class frmMain 'ToolStripButton9 ' Me.ToolStripButton9.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton9.Image = Global.CONFIG_APP.My.Resources.Resources.refresh_16xLG + Me.ToolStripButton9.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG Me.ToolStripButton9.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton9.Name = "ToolStripButton9" Me.ToolStripButton9.Size = New System.Drawing.Size(23, 22) Me.ToolStripButton9.Text = "Refresh" ' + 'tsbtnRunLocalMail2 + ' + Me.tsbtnRunLocalMail2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.tsbtnRunLocalMail2.Image = Global.EmailProfiler.Form.My.Resources.Resources.folder_Closed_16xLG + Me.tsbtnRunLocalMail2.ImageTransparentColor = System.Drawing.Color.Magenta + Me.tsbtnRunLocalMail2.Name = "tsbtnRunLocalMail2" + Me.tsbtnRunLocalMail2.Size = New System.Drawing.Size(133, 22) + Me.tsbtnRunLocalMail2.Text = "Test with local email" + Me.tsbtnRunLocalMail2.TextAlign = System.Drawing.ContentAlignment.TopLeft + ' + 'tsbtnRunProfiles2 + ' + Me.tsbtnRunProfiles2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.tsbtnRunProfiles2.Image = Global.EmailProfiler.Form.My.Resources.Resources.email_go + Me.tsbtnRunProfiles2.ImageTransparentColor = System.Drawing.Color.Magenta + Me.tsbtnRunProfiles2.Name = "tsbtnRunProfiles2" + Me.tsbtnRunProfiles2.Size = New System.Drawing.Size(137, 22) + Me.tsbtnRunProfiles2.Text = "Run profile manually" + ' + 'ToolStripProgressBar2 + ' + Me.ToolStripProgressBar2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.ToolStripProgressBar2.Name = "ToolStripProgressBar2" + Me.ToolStripProgressBar2.Size = New System.Drawing.Size(100, 22) + ' + 'ToolStripEmailAccountID2 + ' + Me.ToolStripEmailAccountID2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.ToolStripEmailAccountID2.Font = New System.Drawing.Font("Segoe UI", 9.0!) + Me.ToolStripEmailAccountID2.Name = "ToolStripEmailAccountID2" + Me.ToolStripEmailAccountID2.Size = New System.Drawing.Size(100, 25) + ' + 'ToolStripLabel6 + ' + Me.ToolStripLabel6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.ToolStripLabel6.Name = "ToolStripLabel6" + Me.ToolStripLabel6.Size = New System.Drawing.Size(0, 22) + ' + 'ToolStripLabel7 + ' + Me.ToolStripLabel7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.ToolStripLabel7.Name = "ToolStripLabel7" + Me.ToolStripLabel7.Size = New System.Drawing.Size(95, 22) + Me.ToolStripLabel7.Text = "EmailAccountID:" + ' 'POLL_TYPEComboBox ' Me.POLL_TYPEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROFILESBindingSource, "POLL_TYPE", True)) @@ -1323,7 +1282,7 @@ Partial Class frmMain Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.XtraTabControl1.AppearancePage.Header.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.XtraTabControl1.AppearancePage.Header.Options.UseFont = True - Me.XtraTabControl1.Location = New System.Drawing.Point(6, 164) + Me.XtraTabControl1.Location = New System.Drawing.Point(6, 189) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 Me.XtraTabControl1.Size = New System.Drawing.Size(1211, 359) @@ -1343,7 +1302,6 @@ Partial Class frmMain Me.XtraTabPage1.Controls.Add(Me.Label9) Me.XtraTabPage1.Controls.Add(Label7) Me.XtraTabPage1.Controls.Add(Me.NumericUpDown2) - Me.XtraTabPage1.Controls.Add(Me.WM_IMPORTCheckBox) Me.XtraTabPage1.Controls.Add(CHANGED_WHENLabel1) Me.XtraTabPage1.Controls.Add(Me.CHANGED_WHENTextBox1) Me.XtraTabPage1.Controls.Add(CHANGED_WHOLabel1) @@ -1378,7 +1336,7 @@ Partial Class frmMain Me.XtraTabPage1.Controls.Add(Me.BindingNavigator2) Me.XtraTabPage1.Controls.Add(Me.GridControl1) Me.XtraTabPage1.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[False] - Me.XtraTabPage1.ImageOptions.Image = Global.CONFIG_APP.My.Resources.Resources.arrow_Down_16xMD + Me.XtraTabPage1.ImageOptions.Image = Global.EmailProfiler.Form.My.Resources.Resources.arrow_Down_16xMD Me.XtraTabPage1.Name = "XtraTabPage1" Me.XtraTabPage1.Size = New System.Drawing.Size(1209, 331) Me.XtraTabPage1.Text = "Zugeordnete Prozesse" @@ -1430,7 +1388,7 @@ Partial Class frmMain Me.txtSubjectExample.BackColor = System.Drawing.SystemColors.Window Me.txtSubjectExample.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.txtSubjectExample.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer)) - Me.txtSubjectExample.Location = New System.Drawing.Point(874, 41) + Me.txtSubjectExample.Location = New System.Drawing.Point(820, 39) Me.txtSubjectExample.Name = "txtSubjectExample" Me.txtSubjectExample.ReadOnly = True Me.txtSubjectExample.Size = New System.Drawing.Size(304, 21) @@ -1439,7 +1397,7 @@ Partial Class frmMain 'Label9 ' Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(871, 25) + Me.Label9.Location = New System.Drawing.Point(817, 25) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(74, 13) Me.Label9.TabIndex = 87 @@ -1454,17 +1412,6 @@ Partial Class frmMain Me.NumericUpDown2.Size = New System.Drawing.Size(61, 21) Me.NumericUpDown2.TabIndex = 3 ' - 'WM_IMPORTCheckBox - ' - Me.WM_IMPORTCheckBox.BackColor = System.Drawing.Color.White - Me.WM_IMPORTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_POLL_PROCESSBindingSource, "WM_IMPORT", True)) - Me.WM_IMPORTCheckBox.Location = New System.Drawing.Point(885, 108) - Me.WM_IMPORTCheckBox.Name = "WM_IMPORTCheckBox" - Me.WM_IMPORTCheckBox.Size = New System.Drawing.Size(149, 24) - Me.WM_IMPORTCheckBox.TabIndex = 43 - Me.WM_IMPORTCheckBox.Text = "Windream Import" - Me.WM_IMPORTCheckBox.UseVisualStyleBackColor = False - ' 'CHANGED_WHENTextBox1 ' Me.CHANGED_WHENTextBox1.BackColor = System.Drawing.SystemColors.InactiveBorder @@ -1524,9 +1471,10 @@ Partial Class frmMain Me.GroupBox2.Controls.Add(Me.WM_PATHTextBox) Me.GroupBox2.Controls.Add(WM_FILE_NAMELabel) Me.GroupBox2.Controls.Add(Me.WM_FILE_NAMETextBox) - Me.GroupBox2.Location = New System.Drawing.Point(878, 114) + Me.GroupBox2.Controls.Add(Me.WM_IMPORTCheckBox) + Me.GroupBox2.Location = New System.Drawing.Point(820, 114) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(540, 110) + Me.GroupBox2.Size = New System.Drawing.Size(329, 110) Me.GroupBox2.TabIndex = 79 Me.GroupBox2.TabStop = False ' @@ -1546,6 +1494,17 @@ Partial Class frmMain Me.WM_FILE_NAMETextBox.Size = New System.Drawing.Size(312, 21) Me.WM_FILE_NAMETextBox.TabIndex = 11 ' + 'WM_IMPORTCheckBox + ' + Me.WM_IMPORTCheckBox.BackColor = System.Drawing.Color.White + Me.WM_IMPORTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_POLL_PROCESSBindingSource, "WM_IMPORT", True)) + Me.WM_IMPORTCheckBox.Location = New System.Drawing.Point(9, -5) + Me.WM_IMPORTCheckBox.Name = "WM_IMPORTCheckBox" + Me.WM_IMPORTCheckBox.Size = New System.Drawing.Size(149, 24) + Me.WM_IMPORTCheckBox.TabIndex = 43 + Me.WM_IMPORTCheckBox.Text = "Windream Import" + Me.WM_IMPORTCheckBox.UseVisualStyleBackColor = False + ' 'STEP_NAMEComboBox ' Me.STEP_NAMEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "STEP_NAME", True)) @@ -1634,10 +1593,10 @@ Partial Class frmMain 'COMMENT_PROFILESTextBox ' Me.COMMENT_PROFILESTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "COMMENT", True)) - Me.COMMENT_PROFILESTextBox.Location = New System.Drawing.Point(824, 244) + Me.COMMENT_PROFILESTextBox.Location = New System.Drawing.Point(820, 244) Me.COMMENT_PROFILESTextBox.Multiline = True Me.COMMENT_PROFILESTextBox.Name = "COMMENT_PROFILESTextBox" - Me.COMMENT_PROFILESTextBox.Size = New System.Drawing.Size(358, 61) + Me.COMMENT_PROFILESTextBox.Size = New System.Drawing.Size(329, 61) Me.COMMENT_PROFILESTextBox.TabIndex = 10 ' 'ACTIVECheckBox1 @@ -1775,7 +1734,7 @@ Partial Class frmMain 'ToolStripButton8 ' Me.ToolStripButton8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton8.Image = Global.CONFIG_APP.My.Resources.Resources.save_16xMD + Me.ToolStripButton8.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD Me.ToolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton8.Name = "ToolStripButton8" Me.ToolStripButton8.Size = New System.Drawing.Size(23, 22) @@ -1784,7 +1743,7 @@ Partial Class frmMain 'ToolStripButton10 ' Me.ToolStripButton10.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton10.Image = Global.CONFIG_APP.My.Resources.Resources.refresh_16xLG + Me.ToolStripButton10.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG Me.ToolStripButton10.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton10.Name = "ToolStripButton10" Me.ToolStripButton10.Size = New System.Drawing.Size(23, 22) @@ -1816,8 +1775,8 @@ Partial Class frmMain Me.GridView1.OptionsView.EnableAppearanceEvenRow = True Me.GridView1.OptionsView.ShowAutoFilterRow = True Me.GridView1.OptionsView.ShowDetailButtons = False - Me.GridView1.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.ShowAlways Me.GridView1.OptionsView.ShowGroupPanel = False + Me.GridView1.OptionsView.ShowIndicator = False ' 'colPROCESS_NAME ' @@ -1866,7 +1825,7 @@ Partial Class frmMain Me.XtraTabPage2.Controls.Add(Me.COMMENTTextBox1) Me.XtraTabPage2.Controls.Add(Me.ACTIVECheckBox2) Me.XtraTabPage2.Controls.Add(Me.GridControl2) - Me.XtraTabPage2.ImageOptions.Image = Global.CONFIG_APP.My.Resources.Resources.arrow_right + Me.XtraTabPage2.ImageOptions.Image = Global.EmailProfiler.Form.My.Resources.Resources.arrow_right Me.XtraTabPage2.Name = "XtraTabPage2" Me.XtraTabPage2.Size = New System.Drawing.Size(1209, 331) Me.XtraTabPage2.Text = "Verarbeitungs-Schritte" @@ -2031,7 +1990,7 @@ Partial Class frmMain 'ToolStripButton17 ' Me.ToolStripButton17.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton17.Image = Global.CONFIG_APP.My.Resources.Resources.save_16xMD + Me.ToolStripButton17.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD Me.ToolStripButton17.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton17.Name = "ToolStripButton17" Me.ToolStripButton17.Size = New System.Drawing.Size(23, 22) @@ -2040,7 +1999,7 @@ Partial Class frmMain 'ToolStripButton18 ' Me.ToolStripButton18.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton18.Image = Global.CONFIG_APP.My.Resources.Resources.refresh_16xLG + Me.ToolStripButton18.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG Me.ToolStripButton18.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton18.Name = "ToolStripButton18" Me.ToolStripButton18.Size = New System.Drawing.Size(23, 22) @@ -2157,7 +2116,7 @@ Partial Class frmMain Me.XtraTabPage3.Controls.Add(Me.CHANGED_WHENTextBox3) Me.XtraTabPage3.Controls.Add(Me.BindingNavigator4) Me.XtraTabPage3.Controls.Add(Me.GridControl3) - Me.XtraTabPage3.ImageOptions.Image = Global.CONFIG_APP.My.Resources.Resources.arrow_right + Me.XtraTabPage3.ImageOptions.Image = Global.EmailProfiler.Form.My.Resources.Resources.arrow_right Me.XtraTabPage3.Name = "XtraTabPage3" Me.XtraTabPage3.Size = New System.Drawing.Size(1209, 331) Me.XtraTabPage3.Text = "Indexing Steps" @@ -2368,7 +2327,7 @@ Partial Class frmMain 'ToolStripButton25 ' Me.ToolStripButton25.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton25.Image = Global.CONFIG_APP.My.Resources.Resources.save_16xMD + Me.ToolStripButton25.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD Me.ToolStripButton25.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton25.Name = "ToolStripButton25" Me.ToolStripButton25.Size = New System.Drawing.Size(23, 22) @@ -2377,7 +2336,7 @@ Partial Class frmMain 'ToolStripButton26 ' Me.ToolStripButton26.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton26.Image = Global.CONFIG_APP.My.Resources.Resources.refresh_16xLG + Me.ToolStripButton26.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG Me.ToolStripButton26.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton26.Name = "ToolStripButton26" Me.ToolStripButton26.Size = New System.Drawing.Size(23, 22) @@ -2504,17 +2463,162 @@ Partial Class frmMain Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(121, 21) Me.ADDED_WHOTextBox.TabIndex = 21 ' - 'TabPage2 + 'tabConfig ' - Me.TabPage2.Controls.Add(Me.GroupBox3) - Me.TabPage2.Controls.Add(Me.GroupBox1) - Me.TabPage2.Location = New System.Drawing.Point(4, 22) - Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(1219, 534) - Me.TabPage2.TabIndex = 1 - Me.TabPage2.Text = "Grundeinstellungen" - Me.TabPage2.UseVisualStyleBackColor = True + Me.tabConfig.Controls.Add(Me.GroupBox4) + Me.tabConfig.Controls.Add(Me.GroupBox5) + Me.tabConfig.Controls.Add(Me.GroupBox3) + Me.tabConfig.Controls.Add(Me.GroupBox1) + Me.tabConfig.Location = New System.Drawing.Point(4, 22) + Me.tabConfig.Name = "tabConfig" + Me.tabConfig.Padding = New System.Windows.Forms.Padding(3) + Me.tabConfig.Size = New System.Drawing.Size(1219, 559) + Me.tabConfig.TabIndex = 1 + Me.tabConfig.Text = "Grundeinstellungen" + Me.tabConfig.UseVisualStyleBackColor = True + ' + 'GroupBox4 + ' + Me.GroupBox4.Controls.Add(Me.Button3) + Me.GroupBox4.Controls.Add(Me.btnTestRegEx) + Me.GroupBox4.Controls.Add(Me.Label14) + Me.GroupBox4.Controls.Add(Me.txtResultRegEx) + Me.GroupBox4.Controls.Add(Me.txthtmlEmail) + Me.GroupBox4.Dock = System.Windows.Forms.DockStyle.Fill + Me.GroupBox4.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GroupBox4.Location = New System.Drawing.Point(3, 358) + Me.GroupBox4.Name = "GroupBox4" + Me.GroupBox4.Size = New System.Drawing.Size(1213, 198) + Me.GroupBox4.TabIndex = 69 + Me.GroupBox4.TabStop = False + Me.GroupBox4.Text = "Test RegEx" + Me.GroupBox4.Visible = False + ' + 'Button3 + ' + Me.Button3.Location = New System.Drawing.Point(9, 20) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(130, 23) + Me.Button3.TabIndex = 71 + Me.Button3.Text = "Load E-Mail Body" + Me.Button3.UseVisualStyleBackColor = True + ' + 'btnTestRegEx + ' + Me.btnTestRegEx.Location = New System.Drawing.Point(553, 49) + Me.btnTestRegEx.Name = "btnTestRegEx" + Me.btnTestRegEx.Size = New System.Drawing.Size(75, 44) + Me.btnTestRegEx.TabIndex = 70 + Me.btnTestRegEx.Text = "Test RegEx" + Me.btnTestRegEx.UseVisualStyleBackColor = True + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label14.Location = New System.Drawing.Point(656, 30) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(71, 13) + Me.Label14.TabIndex = 68 + Me.Label14.Text = "Result RegEx" + ' + 'txtResultRegEx + ' + Me.txtResultRegEx.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.txtResultRegEx.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtResultRegEx.Location = New System.Drawing.Point(659, 49) + Me.txtResultRegEx.Multiline = True + Me.txtResultRegEx.Name = "txtResultRegEx" + Me.txtResultRegEx.Size = New System.Drawing.Size(538, 178) + Me.txtResultRegEx.TabIndex = 69 + ' + 'txthtmlEmail + ' + Me.txthtmlEmail.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.txthtmlEmail.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.EmailProfiler.Form.My.MySettings.Default, "MyTestHTML", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.txthtmlEmail.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txthtmlEmail.Location = New System.Drawing.Point(9, 49) + Me.txthtmlEmail.Multiline = True + Me.txthtmlEmail.Name = "txthtmlEmail" + Me.txthtmlEmail.Size = New System.Drawing.Size(538, 178) + Me.txthtmlEmail.TabIndex = 67 + Me.txthtmlEmail.Text = Global.EmailProfiler.Form.My.MySettings.Default.MyTestHTML + ' + 'GroupBox5 + ' + Me.GroupBox5.Controls.Add(Me.Button5) + Me.GroupBox5.Controls.Add(Me.txtRegex2) + Me.GroupBox5.Controls.Add(Me.Label13) + Me.GroupBox5.Controls.Add(Me.btnsaveRegex) + Me.GroupBox5.Controls.Add(Me.txtRegex1) + Me.GroupBox5.Controls.Add(Me.Label8) + Me.GroupBox5.Dock = System.Windows.Forms.DockStyle.Top + Me.GroupBox5.Location = New System.Drawing.Point(3, 220) + Me.GroupBox5.Name = "GroupBox5" + Me.GroupBox5.Size = New System.Drawing.Size(1213, 138) + Me.GroupBox5.TabIndex = 62 + Me.GroupBox5.TabStop = False + Me.GroupBox5.Text = "Regular Expression" + ' + 'Button5 + ' + Me.Button5.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD + Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button5.Location = New System.Drawing.Point(1110, 31) + Me.Button5.Name = "Button5" + Me.Button5.Size = New System.Drawing.Size(82, 23) + Me.Button5.TabIndex = 77 + Me.Button5.Text = "Speichern" + Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button5.UseVisualStyleBackColor = True + ' + 'txtRegex2 + ' + Me.txtRegex2.Location = New System.Drawing.Point(603, 33) + Me.txtRegex2.Multiline = True + Me.txtRegex2.Name = "txtRegex2" + Me.txtRegex2.Size = New System.Drawing.Size(501, 89) + Me.txtRegex2.TabIndex = 76 + ' + 'Label13 + ' + Me.Label13.AutoSize = True + Me.Label13.Location = New System.Drawing.Point(600, 17) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(162, 13) + Me.Label13.TabIndex = 75 + Me.Label13.Text = "Regex Remove HTML-Context2:" + ' + 'btnsaveRegex + ' + Me.btnsaveRegex.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD + Me.btnsaveRegex.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnsaveRegex.Location = New System.Drawing.Point(515, 33) + Me.btnsaveRegex.Name = "btnsaveRegex" + Me.btnsaveRegex.Size = New System.Drawing.Size(82, 23) + Me.btnsaveRegex.TabIndex = 74 + Me.btnsaveRegex.Text = "Speichern" + Me.btnsaveRegex.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnsaveRegex.UseVisualStyleBackColor = True + ' + 'txtRegex1 + ' + Me.txtRegex1.Location = New System.Drawing.Point(9, 33) + Me.txtRegex1.Multiline = True + Me.txtRegex1.Name = "txtRegex1" + Me.txtRegex1.Size = New System.Drawing.Size(500, 89) + Me.txtRegex1.TabIndex = 73 + ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Location = New System.Drawing.Point(6, 17) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(162, 13) + Me.Label8.TabIndex = 72 + Me.Label8.Text = "Regex Remove HTML-Context1:" ' 'GroupBox3 ' @@ -2528,9 +2632,9 @@ Partial Class frmMain Me.GroupBox3.Controls.Add(Me.btnShowLogpath) Me.GroupBox3.Controls.Add(Me.LOG_ERRORS_ONLYCheckBox) Me.GroupBox3.Dock = System.Windows.Forms.DockStyle.Top - Me.GroupBox3.Location = New System.Drawing.Point(3, 103) + Me.GroupBox3.Location = New System.Drawing.Point(3, 142) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(1213, 161) + Me.GroupBox3.Size = New System.Drawing.Size(1213, 78) Me.GroupBox3.TabIndex = 61 Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Weiteres" @@ -2579,7 +2683,7 @@ Partial Class frmMain ' 'btnShowLogpath ' - Me.btnShowLogpath.Image = Global.CONFIG_APP.My.Resources.Resources.folder_Closed_16xLG + Me.btnShowLogpath.Image = Global.EmailProfiler.Form.My.Resources.Resources.folder_Closed_16xLG Me.btnShowLogpath.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnShowLogpath.Location = New System.Drawing.Point(9, 20) Me.btnShowLogpath.Name = "btnShowLogpath" @@ -2591,9 +2695,9 @@ Partial Class frmMain ' 'LOG_ERRORS_ONLYCheckBox ' - Me.LOG_ERRORS_ONLYCheckBox.Checked = Global.CONFIG_APP.My.MySettings.Default.DEBUG + Me.LOG_ERRORS_ONLYCheckBox.Checked = Global.EmailProfiler.Form.My.MySettings.Default.DEBUG Me.LOG_ERRORS_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_CONFIGBindingSource, "LOG_ERRORS_ONLY", True)) - Me.LOG_ERRORS_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.CONFIG_APP.My.MySettings.Default, "DEBUG", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.LOG_ERRORS_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.EmailProfiler.Form.My.MySettings.Default, "DEBUG", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) Me.LOG_ERRORS_ONLYCheckBox.Location = New System.Drawing.Point(138, 22) Me.LOG_ERRORS_ONLYCheckBox.Name = "LOG_ERRORS_ONLYCheckBox" Me.LOG_ERRORS_ONLYCheckBox.Size = New System.Drawing.Size(104, 23) @@ -2603,6 +2707,7 @@ Partial Class frmMain ' 'GroupBox1 ' + Me.GroupBox1.Controls.Add(Me.txtConnectionString) Me.GroupBox1.Controls.Add(Me.Label1) Me.GroupBox1.Controls.Add(Me.BtnConnect) Me.GroupBox1.Controls.Add(Me.cmbDatenbank) @@ -2616,11 +2721,19 @@ Partial Class frmMain Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Top Me.GroupBox1.Location = New System.Drawing.Point(3, 3) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(1213, 100) + Me.GroupBox1.Size = New System.Drawing.Size(1213, 139) Me.GroupBox1.TabIndex = 58 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Datenbankverbindung:" ' + 'txtConnectionString + ' + Me.txtConnectionString.Location = New System.Drawing.Point(9, 100) + Me.txtConnectionString.Name = "txtConnectionString" + Me.txtConnectionString.ReadOnly = True + Me.txtConnectionString.Size = New System.Drawing.Size(547, 21) + Me.txtConnectionString.TabIndex = 58 + ' 'Label1 ' Me.Label1.AutoSize = True @@ -2717,287 +2830,58 @@ Partial Class frmMain Me.txtPasswort.TabIndex = 50 Me.txtPasswort.UseSystemPasswordChar = True ' - 'TabPage1 + 'tabEmail ' - Me.TabPage1.Controls.Add(Me.GridControl5) - Me.TabPage1.Controls.Add(Me.BindingNavigator5) - Me.TabPage1.Location = New System.Drawing.Point(4, 22) - Me.TabPage1.Name = "TabPage1" - Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(1219, 534) - Me.TabPage1.TabIndex = 2 - Me.TabPage1.Text = "Verarbeitungs-History" - Me.TabPage1.UseVisualStyleBackColor = True - ' - 'GridControl5 - ' - Me.GridControl5.DataSource = Me.TBEMLP_HISTORYBindingSource - Me.GridControl5.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControl5.Location = New System.Drawing.Point(3, 28) - Me.GridControl5.MainView = Me.GridView5 - Me.GridControl5.Name = "GridControl5" - Me.GridControl5.Size = New System.Drawing.Size(1213, 503) - Me.GridControl5.TabIndex = 33 - Me.GridControl5.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView5}) - ' - 'TBEMLP_HISTORYBindingSource - ' - Me.TBEMLP_HISTORYBindingSource.DataMember = "TBEMLP_HISTORY" - Me.TBEMLP_HISTORYBindingSource.DataSource = Me.MyDataset - ' - 'GridView5 - ' - Me.GridView5.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan - Me.GridView5.Appearance.EvenRow.Options.UseBackColor = True - Me.GridView5.Appearance.FilterPanel.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.GridView5.Appearance.FilterPanel.Options.UseBackColor = True - Me.GridView5.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colWORK_PROCESS, Me.colEMAIL_DATE, Me.colEMAIL_MSGID, Me.colEMAIL_SUBJECT, Me.colEMAIL_BODY, Me.colEMAIL_SUBSTRING1, Me.colEMAIL_SUBSTRING2, Me.colADDED_WHEN, Me.colCOMMENT2}) - Me.GridView5.GridControl = Me.GridControl5 - Me.GridView5.Name = "GridView5" - Me.GridView5.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] - Me.GridView5.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] - Me.GridView5.OptionsBehavior.Editable = False - Me.GridView5.OptionsClipboard.AllowCopy = DevExpress.Utils.DefaultBoolean.[True] - Me.GridView5.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] - Me.GridView5.OptionsSelection.EnableAppearanceFocusedCell = False - Me.GridView5.OptionsSelection.EnableAppearanceFocusedRow = False - Me.GridView5.OptionsSelection.EnableAppearanceHideSelection = False - Me.GridView5.OptionsSelection.MultiSelect = True - Me.GridView5.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect - Me.GridView5.OptionsView.EnableAppearanceEvenRow = True - Me.GridView5.OptionsView.ShowAutoFilterRow = True - Me.GridView5.OptionsView.ShowDetailButtons = False - Me.GridView5.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.ShowAlways - Me.GridView5.OptionsView.ShowGroupPanel = False - ' - 'colGUID - ' - Me.colGUID.Caption = "ID" - Me.colGUID.FieldName = "GUID" - Me.colGUID.Name = "colGUID" - Me.colGUID.Visible = True - Me.colGUID.VisibleIndex = 0 - ' - 'colWORK_PROCESS - ' - Me.colWORK_PROCESS.Caption = "Process" - Me.colWORK_PROCESS.FieldName = "WORK_PROCESS" - Me.colWORK_PROCESS.Name = "colWORK_PROCESS" - Me.colWORK_PROCESS.Visible = True - Me.colWORK_PROCESS.VisibleIndex = 1 - ' - 'colEMAIL_DATE - ' - Me.colEMAIL_DATE.Caption = "Date Send" - Me.colEMAIL_DATE.FieldName = "EMAIL_DATE" - Me.colEMAIL_DATE.Name = "colEMAIL_DATE" - Me.colEMAIL_DATE.Visible = True - Me.colEMAIL_DATE.VisibleIndex = 2 - ' - 'colEMAIL_MSGID - ' - Me.colEMAIL_MSGID.Caption = "Message-ID" - Me.colEMAIL_MSGID.FieldName = "EMAIL_MSGID" - Me.colEMAIL_MSGID.Name = "colEMAIL_MSGID" - Me.colEMAIL_MSGID.Visible = True - Me.colEMAIL_MSGID.VisibleIndex = 3 - ' - 'colEMAIL_SUBJECT - ' - Me.colEMAIL_SUBJECT.Caption = "Subject" - Me.colEMAIL_SUBJECT.FieldName = "EMAIL_SUBJECT" - Me.colEMAIL_SUBJECT.Name = "colEMAIL_SUBJECT" - Me.colEMAIL_SUBJECT.Visible = True - Me.colEMAIL_SUBJECT.VisibleIndex = 4 - ' - 'colEMAIL_BODY - ' - Me.colEMAIL_BODY.Caption = "Body" - Me.colEMAIL_BODY.FieldName = "EMAIL_BODY" - Me.colEMAIL_BODY.Name = "colEMAIL_BODY" - Me.colEMAIL_BODY.Visible = True - Me.colEMAIL_BODY.VisibleIndex = 5 - ' - 'colEMAIL_SUBSTRING1 - ' - Me.colEMAIL_SUBSTRING1.Caption = "Substring1" - Me.colEMAIL_SUBSTRING1.FieldName = "EMAIL_SUBSTRING1" - Me.colEMAIL_SUBSTRING1.Name = "colEMAIL_SUBSTRING1" - Me.colEMAIL_SUBSTRING1.Visible = True - Me.colEMAIL_SUBSTRING1.VisibleIndex = 6 - ' - 'colEMAIL_SUBSTRING2 - ' - Me.colEMAIL_SUBSTRING2.Caption = "Substring2" - Me.colEMAIL_SUBSTRING2.FieldName = "EMAIL_SUBSTRING2" - Me.colEMAIL_SUBSTRING2.Name = "colEMAIL_SUBSTRING2" - Me.colEMAIL_SUBSTRING2.Visible = True - Me.colEMAIL_SUBSTRING2.VisibleIndex = 7 - ' - 'colADDED_WHEN - ' - Me.colADDED_WHEN.Caption = "Added When" - Me.colADDED_WHEN.FieldName = "ADDED_WHEN" - Me.colADDED_WHEN.Name = "colADDED_WHEN" - Me.colADDED_WHEN.Visible = True - Me.colADDED_WHEN.VisibleIndex = 8 - ' - 'colCOMMENT2 - ' - Me.colCOMMENT2.Caption = "Comment" - Me.colCOMMENT2.FieldName = "COMMENT" - Me.colCOMMENT2.Name = "colCOMMENT2" - Me.colCOMMENT2.Visible = True - Me.colCOMMENT2.VisibleIndex = 9 - ' - 'BindingNavigator5 - ' - Me.BindingNavigator5.AddNewItem = Nothing - Me.BindingNavigator5.BindingSource = Me.TBEMLP_HISTORYBindingSource - Me.BindingNavigator5.CountItem = Me.ToolStripLabel4 - Me.BindingNavigator5.CountItemFormat = "von {0} verarbeiteten Emails" - Me.BindingNavigator5.DeleteItem = Nothing - Me.BindingNavigator5.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton29, Me.ToolStripButton30, Me.ToolStripSeparator10, Me.ToolStripTextBox4, Me.ToolStripLabel4, Me.ToolStripSeparator11, Me.ToolStripButton31, Me.ToolStripButton32, Me.ToolStripSeparator12, Me.ToolStripButton34}) - Me.BindingNavigator5.Location = New System.Drawing.Point(3, 3) - Me.BindingNavigator5.MoveFirstItem = Me.ToolStripButton29 - Me.BindingNavigator5.MoveLastItem = Me.ToolStripButton32 - Me.BindingNavigator5.MoveNextItem = Me.ToolStripButton31 - Me.BindingNavigator5.MovePreviousItem = Me.ToolStripButton30 - Me.BindingNavigator5.Name = "BindingNavigator5" - Me.BindingNavigator5.PositionItem = Me.ToolStripTextBox4 - Me.BindingNavigator5.Size = New System.Drawing.Size(1213, 25) - Me.BindingNavigator5.TabIndex = 32 - Me.BindingNavigator5.Text = "BindingNavigator5" - ' - 'ToolStripLabel4 - ' - Me.ToolStripLabel4.Name = "ToolStripLabel4" - Me.ToolStripLabel4.Size = New System.Drawing.Size(153, 22) - Me.ToolStripLabel4.Text = "von {0} verarbeiteten Emails" - Me.ToolStripLabel4.ToolTipText = "Die Gesamtanzahl der Elemente." - ' - 'ToolStripButton29 - ' - Me.ToolStripButton29.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton29.Image = CType(resources.GetObject("ToolStripButton29.Image"), System.Drawing.Image) - Me.ToolStripButton29.Name = "ToolStripButton29" - Me.ToolStripButton29.RightToLeftAutoMirrorImage = True - Me.ToolStripButton29.Size = New System.Drawing.Size(23, 22) - Me.ToolStripButton29.Text = "Erste verschieben" - ' - 'ToolStripButton30 - ' - Me.ToolStripButton30.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton30.Image = CType(resources.GetObject("ToolStripButton30.Image"), System.Drawing.Image) - Me.ToolStripButton30.Name = "ToolStripButton30" - Me.ToolStripButton30.RightToLeftAutoMirrorImage = True - Me.ToolStripButton30.Size = New System.Drawing.Size(23, 22) - Me.ToolStripButton30.Text = "Vorherige verschieben" - ' - 'ToolStripSeparator10 - ' - Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(6, 25) - ' - 'ToolStripTextBox4 - ' - Me.ToolStripTextBox4.AccessibleName = "Position" - Me.ToolStripTextBox4.AutoSize = False - Me.ToolStripTextBox4.Font = New System.Drawing.Font("Segoe UI", 9.0!) - Me.ToolStripTextBox4.Name = "ToolStripTextBox4" - Me.ToolStripTextBox4.Size = New System.Drawing.Size(50, 23) - Me.ToolStripTextBox4.Text = "0" - Me.ToolStripTextBox4.ToolTipText = "Aktuelle Position" - ' - 'ToolStripSeparator11 - ' - Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(6, 25) - ' - 'ToolStripButton31 - ' - Me.ToolStripButton31.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton31.Image = CType(resources.GetObject("ToolStripButton31.Image"), System.Drawing.Image) - Me.ToolStripButton31.Name = "ToolStripButton31" - Me.ToolStripButton31.RightToLeftAutoMirrorImage = True - Me.ToolStripButton31.Size = New System.Drawing.Size(23, 22) - Me.ToolStripButton31.Text = "Nächste verschieben" - ' - 'ToolStripButton32 - ' - Me.ToolStripButton32.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton32.Image = CType(resources.GetObject("ToolStripButton32.Image"), System.Drawing.Image) - Me.ToolStripButton32.Name = "ToolStripButton32" - Me.ToolStripButton32.RightToLeftAutoMirrorImage = True - Me.ToolStripButton32.Size = New System.Drawing.Size(23, 22) - Me.ToolStripButton32.Text = "Letzte verschieben" - ' - 'ToolStripSeparator12 - ' - Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(6, 25) - ' - 'ToolStripButton34 - ' - Me.ToolStripButton34.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton34.Image = Global.CONFIG_APP.My.Resources.Resources.refresh_16xLG - Me.ToolStripButton34.ImageTransparentColor = System.Drawing.Color.Magenta - Me.ToolStripButton34.Name = "ToolStripButton34" - Me.ToolStripButton34.Size = New System.Drawing.Size(23, 22) - Me.ToolStripButton34.Text = "Refresh" - ' - 'TabPage3 - ' - Me.TabPage3.AutoScroll = True - Me.TabPage3.Controls.Add(Me.btnCheckIMAPObjects) - Me.TabPage3.Controls.Add(AUTH_TYPELabel) - Me.TabPage3.Controls.Add(Me.AUTH_TYPEComboBox) - Me.TabPage3.Controls.Add(Me.btntestImap) - Me.TabPage3.Controls.Add(ARCHIVE_FOLDERLabel) - Me.TabPage3.Controls.Add(Me.ARCHIVE_FOLDERTextBox) - Me.TabPage3.Controls.Add(PORT_INLabel) - Me.TabPage3.Controls.Add(Me.PORT_INTextBox) - Me.TabPage3.Controls.Add(Me.txtTestmail) - Me.TabPage3.Controls.Add(Me.Label12) - Me.TabPage3.Controls.Add(Me.btnsendtestmail) - Me.TabPage3.Controls.Add(Label11) - Me.TabPage3.Controls.Add(Me.txtnewpasswort) - Me.TabPage3.Controls.Add(Me.Button4) - Me.TabPage3.Controls.Add(GUIDLabel4) - Me.TabPage3.Controls.Add(Me.EMAILIDTextBox) - Me.TabPage3.Controls.Add(NAMELabel) - Me.TabPage3.Controls.Add(Me.NAMETextBox) - Me.TabPage3.Controls.Add(EMAIL_FROMLabel) - Me.TabPage3.Controls.Add(Me.EMAIL_FROMTextBox) - Me.TabPage3.Controls.Add(EMAIL_SMTPLabel) - Me.TabPage3.Controls.Add(Me.EMAIL_SMTPTextBox) - Me.TabPage3.Controls.Add(EMAIL_USERLabel) - Me.TabPage3.Controls.Add(Me.EMAIL_USERTextBox) - Me.TabPage3.Controls.Add(Me.EMAIL_PWTextBox) - Me.TabPage3.Controls.Add(PORTLabel) - Me.TabPage3.Controls.Add(Me.PORTTextBox) - Me.TabPage3.Controls.Add(Me.ACTIVECheckBox4) - Me.TabPage3.Controls.Add(ADDED_WHOLabel4) - Me.TabPage3.Controls.Add(Me.ADDED_WHOTextBox4) - Me.TabPage3.Controls.Add(ADDED_WHENLabel4) - Me.TabPage3.Controls.Add(Me.ADDED_WHENTextBox4) - Me.TabPage3.Controls.Add(CHANGED_WHOLabel5) - Me.TabPage3.Controls.Add(Me.CHANGED_WHOTextBox1) - Me.TabPage3.Controls.Add(CHANGED_WHENLabel5) - Me.TabPage3.Controls.Add(Me.CHANGED_WHENTextBox5) - Me.TabPage3.Controls.Add(Me.GridControl6) - Me.TabPage3.Controls.Add(Me.BindingNavigator6) - Me.TabPage3.Location = New System.Drawing.Point(4, 22) - Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(1219, 534) - Me.TabPage3.TabIndex = 3 - Me.TabPage3.Text = "EMail-Konto Konfiguration" - Me.TabPage3.UseVisualStyleBackColor = True + Me.tabEmail.AutoScroll = True + Me.tabEmail.Controls.Add(Me.btnCheckIMAPObjects) + Me.tabEmail.Controls.Add(AUTH_TYPELabel) + Me.tabEmail.Controls.Add(Me.AUTH_TYPEComboBox) + Me.tabEmail.Controls.Add(Me.btntestImap) + Me.tabEmail.Controls.Add(ARCHIVE_FOLDERLabel) + Me.tabEmail.Controls.Add(Me.ARCHIVE_FOLDERTextBox) + Me.tabEmail.Controls.Add(PORT_INLabel) + Me.tabEmail.Controls.Add(Me.PORT_INTextBox) + Me.tabEmail.Controls.Add(Me.txtTestmail) + Me.tabEmail.Controls.Add(Me.Label12) + Me.tabEmail.Controls.Add(Me.btnsendtestmail) + Me.tabEmail.Controls.Add(Label11) + Me.tabEmail.Controls.Add(Me.txtnewpasswort) + Me.tabEmail.Controls.Add(Me.Button4) + Me.tabEmail.Controls.Add(GUIDLabel4) + Me.tabEmail.Controls.Add(Me.EMAILIDTextBox) + Me.tabEmail.Controls.Add(NAMELabel) + Me.tabEmail.Controls.Add(Me.NAMETextBox) + Me.tabEmail.Controls.Add(EMAIL_FROMLabel) + Me.tabEmail.Controls.Add(Me.EMAIL_FROMTextBox) + Me.tabEmail.Controls.Add(EMAIL_SMTPLabel) + Me.tabEmail.Controls.Add(Me.EMAIL_SMTPTextBox) + Me.tabEmail.Controls.Add(EMAIL_USERLabel) + Me.tabEmail.Controls.Add(Me.EMAIL_USERTextBox) + Me.tabEmail.Controls.Add(Me.EMAIL_PWTextBox) + Me.tabEmail.Controls.Add(PORTLabel) + Me.tabEmail.Controls.Add(Me.PORTTextBox) + Me.tabEmail.Controls.Add(Me.ACTIVECheckBox4) + Me.tabEmail.Controls.Add(ADDED_WHOLabel4) + Me.tabEmail.Controls.Add(Me.ADDED_WHOTextBox4) + Me.tabEmail.Controls.Add(ADDED_WHENLabel4) + Me.tabEmail.Controls.Add(Me.ADDED_WHENTextBox4) + Me.tabEmail.Controls.Add(CHANGED_WHOLabel5) + Me.tabEmail.Controls.Add(Me.CHANGED_WHOTextBox1) + Me.tabEmail.Controls.Add(CHANGED_WHENLabel5) + Me.tabEmail.Controls.Add(Me.CHANGED_WHENTextBox5) + Me.tabEmail.Controls.Add(Me.GridControl6) + Me.tabEmail.Controls.Add(Me.BindingNavigator6) + Me.tabEmail.Location = New System.Drawing.Point(4, 22) + Me.tabEmail.Name = "tabEmail" + Me.tabEmail.Padding = New System.Windows.Forms.Padding(3) + Me.tabEmail.Size = New System.Drawing.Size(1219, 559) + Me.tabEmail.TabIndex = 3 + Me.tabEmail.Text = "EMail-Konto Konfiguration" + Me.tabEmail.UseVisualStyleBackColor = True ' 'btnCheckIMAPObjects ' - Me.btnCheckIMAPObjects.Image = Global.CONFIG_APP.My.Resources.Resources.arrow_right + Me.btnCheckIMAPObjects.Image = Global.EmailProfiler.Form.My.Resources.Resources.arrow_right Me.btnCheckIMAPObjects.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnCheckIMAPObjects.Location = New System.Drawing.Point(831, 203) Me.btnCheckIMAPObjects.Name = "btnCheckIMAPObjects" @@ -3020,7 +2904,7 @@ Partial Class frmMain ' 'btntestImap ' - Me.btntestImap.Image = Global.CONFIG_APP.My.Resources.Resources.email_go + Me.btntestImap.Image = Global.EmailProfiler.Form.My.Resources.Resources.email_go Me.btntestImap.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btntestImap.Location = New System.Drawing.Point(701, 203) Me.btntestImap.Name = "btntestImap" @@ -3049,12 +2933,12 @@ Partial Class frmMain 'txtTestmail ' Me.txtTestmail.BackColor = System.Drawing.SystemColors.Control - Me.txtTestmail.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.CONFIG_APP.My.MySettings.Default, "EmailTest_Receipiant", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + Me.txtTestmail.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.EmailProfiler.Form.My.MySettings.Default, "EmailTest_Receipiant", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) Me.txtTestmail.Location = New System.Drawing.Point(373, 258) Me.txtTestmail.Name = "txtTestmail" Me.txtTestmail.Size = New System.Drawing.Size(311, 21) Me.txtTestmail.TabIndex = 67 - Me.txtTestmail.Text = Global.CONFIG_APP.My.MySettings.Default.EmailTest_Receipiant + Me.txtTestmail.Text = Global.EmailProfiler.Form.My.MySettings.Default.EmailTest_Receipiant ' 'Label12 ' @@ -3067,7 +2951,7 @@ Partial Class frmMain ' 'btnsendtestmail ' - Me.btnsendtestmail.Image = Global.CONFIG_APP.My.Resources.Resources.email_go + Me.btnsendtestmail.Image = Global.EmailProfiler.Form.My.Resources.Resources.email_go Me.btnsendtestmail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnsendtestmail.Location = New System.Drawing.Point(701, 244) Me.btnsendtestmail.Name = "btnsendtestmail" @@ -3100,7 +2984,7 @@ Partial Class frmMain ' 'Button4 ' - Me.Button4.Image = Global.CONFIG_APP.My.Resources.Resources.key_16xLG + Me.Button4.Image = Global.EmailProfiler.Form.My.Resources.Resources.key_16xLG Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button4.Location = New System.Drawing.Point(930, 122) Me.Button4.Name = "Button4" @@ -3218,7 +3102,7 @@ Partial Class frmMain Me.GridControl6.Location = New System.Drawing.Point(3, 28) Me.GridControl6.MainView = Me.GridView6 Me.GridControl6.Name = "GridControl6" - Me.GridControl6.Size = New System.Drawing.Size(301, 503) + Me.GridControl6.Size = New System.Drawing.Size(301, 528) Me.GridControl6.TabIndex = 34 Me.GridControl6.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView6}) ' @@ -3270,7 +3154,7 @@ Partial Class frmMain Me.BindingNavigator6.BindingSource = Me.TBDD_EMAIL_ACCOUNTBindingSource Me.BindingNavigator6.CountItem = Me.BindingNavigatorCountItem1 Me.BindingNavigator6.DeleteItem = Me.BindingNavigatorDeleteItem1 - Me.BindingNavigator6.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem1, Me.BindingNavigatorMovePreviousItem1, Me.BindingNavigatorSeparator3, Me.BindingNavigatorPositionItem1, Me.BindingNavigatorCountItem1, Me.BindingNavigatorSeparator4, Me.BindingNavigatorMoveNextItem1, Me.BindingNavigatorMoveLastItem1, Me.BindingNavigatorSeparator5, Me.BindingNavigatorAddNewItem1, Me.ToolStripButton27, Me.BindingNavigatorDeleteItem1}) + Me.BindingNavigator6.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem1, Me.BindingNavigatorMovePreviousItem1, Me.BindingNavigatorSeparator3, Me.BindingNavigatorPositionItem1, Me.BindingNavigatorCountItem1, Me.BindingNavigatorSeparator4, Me.BindingNavigatorMoveNextItem1, Me.BindingNavigatorMoveLastItem1, Me.BindingNavigatorSeparator5, Me.BindingNavigatorAddNewItem1, Me.ToolStripButton27, Me.BindingNavigatorDeleteItem1, Me.ToolStripButton28}) Me.BindingNavigator6.Location = New System.Drawing.Point(3, 3) Me.BindingNavigator6.MoveFirstItem = Me.BindingNavigatorMoveFirstItem1 Me.BindingNavigator6.MoveLastItem = Me.BindingNavigatorMoveLastItem1 @@ -3371,155 +3255,25 @@ Partial Class frmMain 'ToolStripButton27 ' Me.ToolStripButton27.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton27.Image = Global.CONFIG_APP.My.Resources.Resources.save_16xMD + Me.ToolStripButton27.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD Me.ToolStripButton27.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton27.Name = "ToolStripButton27" Me.ToolStripButton27.Size = New System.Drawing.Size(23, 22) Me.ToolStripButton27.Text = "tsbtnEmailProfile_Save" ' - 'TabPage4 + 'ToolStripButton28 ' - Me.TabPage4.Controls.Add(Me.Button5) - Me.TabPage4.Controls.Add(Me.txtRegex2) - Me.TabPage4.Controls.Add(Me.Label13) - Me.TabPage4.Controls.Add(Me.GroupBox4) - Me.TabPage4.Controls.Add(Me.btnsaveRegex) - Me.TabPage4.Controls.Add(Me.txtRegex1) - Me.TabPage4.Controls.Add(Me.Label8) - Me.TabPage4.Location = New System.Drawing.Point(4, 22) - Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage4.Size = New System.Drawing.Size(1219, 534) - Me.TabPage4.TabIndex = 4 - Me.TabPage4.Text = "Regular Expression" - Me.TabPage4.UseVisualStyleBackColor = True + Me.ToolStripButton28.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripButton28.Image = CType(resources.GetObject("ToolStripButton28.Image"), System.Drawing.Image) + Me.ToolStripButton28.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton28.Name = "ToolStripButton28" + Me.ToolStripButton28.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton28.Text = "btnAktualisieren" ' - 'Button5 + 'TBEMLP_HISTORYBindingSource ' - Me.Button5.Image = Global.CONFIG_APP.My.Resources.Resources.save_16xMD - Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button5.Location = New System.Drawing.Point(1109, 25) - Me.Button5.Name = "Button5" - Me.Button5.Size = New System.Drawing.Size(82, 23) - Me.Button5.TabIndex = 71 - Me.Button5.Text = "Speichern" - Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button5.UseVisualStyleBackColor = True - ' - 'txtRegex2 - ' - Me.txtRegex2.Location = New System.Drawing.Point(602, 27) - Me.txtRegex2.Multiline = True - Me.txtRegex2.Name = "txtRegex2" - Me.txtRegex2.Size = New System.Drawing.Size(501, 89) - Me.txtRegex2.TabIndex = 70 - ' - 'Label13 - ' - Me.Label13.AutoSize = True - Me.Label13.Location = New System.Drawing.Point(599, 11) - Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(162, 13) - Me.Label13.TabIndex = 69 - Me.Label13.Text = "Regex Remove HTML-Context2:" - ' - 'GroupBox4 - ' - Me.GroupBox4.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.GroupBox4.Controls.Add(Me.Button3) - Me.GroupBox4.Controls.Add(Me.btnTestRegEx) - Me.GroupBox4.Controls.Add(Me.Label14) - Me.GroupBox4.Controls.Add(Me.txtResultRegEx) - Me.GroupBox4.Controls.Add(Me.txthtmlEmail) - Me.GroupBox4.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GroupBox4.Location = New System.Drawing.Point(8, 122) - Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(1203, 0) - Me.GroupBox4.TabIndex = 68 - Me.GroupBox4.TabStop = False - Me.GroupBox4.Text = "Test RegEx" - ' - 'Button3 - ' - Me.Button3.Location = New System.Drawing.Point(9, 20) - Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(130, 23) - Me.Button3.TabIndex = 71 - Me.Button3.Text = "Load E-Mail Body" - Me.Button3.UseVisualStyleBackColor = True - ' - 'btnTestRegEx - ' - Me.btnTestRegEx.Location = New System.Drawing.Point(553, 49) - Me.btnTestRegEx.Name = "btnTestRegEx" - Me.btnTestRegEx.Size = New System.Drawing.Size(75, 44) - Me.btnTestRegEx.TabIndex = 70 - Me.btnTestRegEx.Text = "Test RegEx" - Me.btnTestRegEx.UseVisualStyleBackColor = True - ' - 'Label14 - ' - Me.Label14.AutoSize = True - Me.Label14.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label14.Location = New System.Drawing.Point(656, 30) - Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(71, 13) - Me.Label14.TabIndex = 68 - Me.Label14.Text = "Result RegEx" - ' - 'txtResultRegEx - ' - Me.txtResultRegEx.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.txtResultRegEx.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtResultRegEx.Location = New System.Drawing.Point(659, 49) - Me.txtResultRegEx.Multiline = True - Me.txtResultRegEx.Name = "txtResultRegEx" - Me.txtResultRegEx.Size = New System.Drawing.Size(538, 0) - Me.txtResultRegEx.TabIndex = 69 - ' - 'txthtmlEmail - ' - Me.txthtmlEmail.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.txthtmlEmail.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.CONFIG_APP.My.MySettings.Default, "MyTestHTML", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) - Me.txthtmlEmail.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txthtmlEmail.Location = New System.Drawing.Point(9, 49) - Me.txthtmlEmail.Multiline = True - Me.txthtmlEmail.Name = "txthtmlEmail" - Me.txthtmlEmail.Size = New System.Drawing.Size(538, 0) - Me.txthtmlEmail.TabIndex = 67 - Me.txthtmlEmail.Text = Global.CONFIG_APP.My.MySettings.Default.MyTestHTML - ' - 'btnsaveRegex - ' - Me.btnsaveRegex.Image = Global.CONFIG_APP.My.Resources.Resources.save_16xMD - Me.btnsaveRegex.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnsaveRegex.Location = New System.Drawing.Point(514, 27) - Me.btnsaveRegex.Name = "btnsaveRegex" - Me.btnsaveRegex.Size = New System.Drawing.Size(82, 23) - Me.btnsaveRegex.TabIndex = 65 - Me.btnsaveRegex.Text = "Speichern" - Me.btnsaveRegex.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnsaveRegex.UseVisualStyleBackColor = True - ' - 'txtRegex1 - ' - Me.txtRegex1.Location = New System.Drawing.Point(8, 27) - Me.txtRegex1.Multiline = True - Me.txtRegex1.Name = "txtRegex1" - Me.txtRegex1.Size = New System.Drawing.Size(500, 89) - Me.txtRegex1.TabIndex = 64 - ' - 'Label8 - ' - Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(5, 11) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(162, 13) - Me.Label8.TabIndex = 63 - Me.Label8.Text = "Regex Remove HTML-Context1:" + Me.TBEMLP_HISTORYBindingSource.DataMember = "TBEMLP_HISTORY" + Me.TBEMLP_HISTORYBindingSource.DataSource = Me.MyDataset ' 'BackgroundWorker1 ' @@ -3540,7 +3294,7 @@ Partial Class frmMain Me.TableAdapterManager.TBEMLP_POLL_PROCESSTableAdapter = Nothing Me.TableAdapterManager.TBEMLP_POLL_PROFILESTableAdapter = Me.TBEMLP_POLL_PROFILESTableAdapter Me.TableAdapterManager.TBEMLP_POLL_STEPSTableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = CONFIG_APP.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + Me.TableAdapterManager.UpdateOrder = EmailProfiler.Form.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'TBEMLP_POLL_PROCESSTableAdapter ' @@ -3573,23 +3327,22 @@ Partial Class frmMain ' 'frmMain ' + Me.Appearance.Options.UseFont = True Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1227, 607) Me.Controls.Add(Me.TabControl1) - Me.Controls.Add(Me.ToolStrip1) Me.Controls.Add(Me.StatusStrip1) Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.IconOptions.Icon = CType(resources.GetObject("frmMain.IconOptions.Icon"), System.Drawing.Icon) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmMain.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.Name = "frmMain" Me.Text = "Konfiguration Email-Profiler" Me.StatusStrip1.ResumeLayout(False) Me.StatusStrip1.PerformLayout() - Me.ToolStrip1.ResumeLayout(False) - Me.ToolStrip1.PerformLayout() Me.TabControl1.ResumeLayout(False) - Me.Profilkonfiguration.ResumeLayout(False) - Me.Profilkonfiguration.PerformLayout() + Me.tabProfile.ResumeLayout(False) + Me.tabProfile.PerformLayout() CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBEMLP_POLL_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit() @@ -3629,43 +3382,35 @@ Partial Class frmMain Me.BindingNavigator4.PerformLayout() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() - Me.TabPage2.ResumeLayout(False) + Me.tabConfig.ResumeLayout(False) + Me.GroupBox4.ResumeLayout(False) + Me.GroupBox4.PerformLayout() + Me.GroupBox5.ResumeLayout(False) + Me.GroupBox5.PerformLayout() Me.GroupBox3.ResumeLayout(False) Me.GroupBox3.PerformLayout() CType(Me.TBEMLP_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CHECK_INTERVALL_MINUTESNumericUpDown, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() - Me.TabPage1.ResumeLayout(False) - Me.TabPage1.PerformLayout() - CType(Me.GridControl5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBEMLP_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.BindingNavigator5, System.ComponentModel.ISupportInitialize).EndInit() - Me.BindingNavigator5.ResumeLayout(False) - Me.BindingNavigator5.PerformLayout() - Me.TabPage3.ResumeLayout(False) - Me.TabPage3.PerformLayout() + Me.tabEmail.ResumeLayout(False) + Me.tabEmail.PerformLayout() Me.ContextMenuStrip2.ResumeLayout(False) CType(Me.GridControl6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BindingNavigator6, System.ComponentModel.ISupportInitialize).EndInit() Me.BindingNavigator6.ResumeLayout(False) Me.BindingNavigator6.PerformLayout() - Me.TabPage4.ResumeLayout(False) - Me.TabPage4.PerformLayout() - Me.GroupBox4.ResumeLayout(False) - Me.GroupBox4.PerformLayout() + CType(Me.TBEMLP_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub Friend WithEvents StatusStrip1 As StatusStrip - Friend WithEvents ToolStrip1 As ToolStrip Friend WithEvents TabControl1 As TabControl - Friend WithEvents Profilkonfiguration As TabPage - Friend WithEvents TabPage2 As TabPage + Friend WithEvents tabProfile As TabPage + Friend WithEvents tabConfig As TabPage Friend WithEvents GroupBox1 As GroupBox Friend WithEvents Label1 As Label Friend WithEvents BtnConnect As Button @@ -3678,9 +3423,7 @@ Partial Class frmMain Friend WithEvents Label3 As Label Friend WithEvents txtPasswort As TextBox Friend WithEvents tslblstatus As ToolStripStatusLabel - Friend WithEvents tsbtnRunProfiles As ToolStripButton Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker - Friend WithEvents ToolStripProgressBar1 As ToolStripProgressBar Friend WithEvents btnShowLogpath As Button Friend WithEvents MyDataset As MyDataset Friend WithEvents TBEMLP_POLL_PROFILESBindingSource As BindingSource @@ -3827,32 +3570,8 @@ Partial Class frmMain Friend WithEvents GroupBox3 As GroupBox Friend WithEvents tslblRefresh As ToolStripStatusLabel Friend WithEvents Label9 As Label - Friend WithEvents TabPage1 As TabPage - Friend WithEvents GridControl5 As DevExpress.XtraGrid.GridControl - Friend WithEvents GridView5 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents BindingNavigator5 As BindingNavigator - Friend WithEvents ToolStripLabel4 As ToolStripLabel - Friend WithEvents ToolStripButton29 As ToolStripButton - Friend WithEvents ToolStripButton30 As ToolStripButton - Friend WithEvents ToolStripSeparator10 As ToolStripSeparator - Friend WithEvents ToolStripTextBox4 As ToolStripTextBox - Friend WithEvents ToolStripSeparator11 As ToolStripSeparator - Friend WithEvents ToolStripButton31 As ToolStripButton - Friend WithEvents ToolStripButton32 As ToolStripButton - Friend WithEvents ToolStripSeparator12 As ToolStripSeparator - Friend WithEvents ToolStripButton34 As ToolStripButton Friend WithEvents TBEMLP_HISTORYBindingSource As BindingSource Friend WithEvents TBEMLP_HISTORYTableAdapter As MyDatasetTableAdapters.TBEMLP_HISTORYTableAdapter - Friend WithEvents colGUID As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colWORK_PROCESS As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colEMAIL_DATE As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colEMAIL_MSGID As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colEMAIL_SUBJECT As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colEMAIL_BODY As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colEMAIL_SUBSTRING1 As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colEMAIL_SUBSTRING2 As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colADDED_WHEN As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colCOMMENT2 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents txtSubjectExample As TextBox Friend WithEvents TBEMLP_CONFIGBindingSource As BindingSource Friend WithEvents TBEMLP_CONFIGTableAdapter As MyDatasetTableAdapters.TBEMLP_CONFIGTableAdapter @@ -3864,7 +3583,7 @@ Partial Class frmMain Friend WithEvents btnFBD_ErrorPath As Button Friend WithEvents btnFBD_DonwloadPath As Button Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog - Friend WithEvents TabPage3 As TabPage + Friend WithEvents tabEmail As TabPage Friend WithEvents BindingNavigator6 As BindingNavigator Friend WithEvents BindingNavigatorAddNewItem1 As ToolStripButton Friend WithEvents BindingNavigatorCountItem1 As ToolStripLabel @@ -3901,31 +3620,35 @@ Partial Class frmMain Friend WithEvents Label12 As Label Friend WithEvents btnsendtestmail As Button Friend WithEvents btntestImap As Button - Friend WithEvents tsbtnRunLocalMail As ToolStripButton - Friend WithEvents TabPage4 As TabPage - Friend WithEvents btnsaveRegex As Button - Friend WithEvents txtRegex1 As TextBox - Friend WithEvents Label8 As Label - Friend WithEvents GroupBox4 As GroupBox - Friend WithEvents Label14 As Label - Friend WithEvents txtResultRegEx As TextBox - Friend WithEvents txthtmlEmail As TextBox - Friend WithEvents btnTestRegEx As Button - Friend WithEvents Button3 As Button - Friend WithEvents txtRegex2 As TextBox - Friend WithEvents Label13 As Label - Friend WithEvents Button5 As Button Friend WithEvents PATH_ORIGINALTextBox As TextBox Friend WithEvents PORT_INTextBox As TextBox Friend WithEvents lblDownloadPath As Label - Friend WithEvents TextBox1 As TextBox Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents ARCHIVE_FOLDERTextBox As TextBox Friend WithEvents ToolStripStatusLabel1 As ToolStripStatusLabel - Friend WithEvents ToolStripLabel5 As ToolStripLabel - Friend WithEvents ToolStripEmailAccountID As ToolStripTextBox Friend WithEvents AUTH_TYPEComboBox As ComboBox Friend WithEvents btnCheckIMAPObjects As Button Friend WithEvents ContextMenuStrip2 As ContextMenuStrip Friend WithEvents PasswortAnzeigenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents tsbtnRunLocalMail2 As ToolStripButton + Friend WithEvents tsbtnRunProfiles2 As ToolStripButton + Friend WithEvents ToolStripProgressBar2 As ToolStripProgressBar + Friend WithEvents ToolStripEmailAccountID2 As ToolStripTextBox + Friend WithEvents ToolStripLabel6 As ToolStripLabel + Friend WithEvents ToolStripLabel7 As ToolStripLabel + Friend WithEvents txtConnectionString As TextBox + Friend WithEvents GroupBox5 As GroupBox + Friend WithEvents Button5 As Button + Friend WithEvents txtRegex2 As TextBox + Friend WithEvents Label13 As Label + Friend WithEvents btnsaveRegex As Button + Friend WithEvents txtRegex1 As TextBox + Friend WithEvents Label8 As Label + Friend WithEvents ToolStripButton28 As ToolStripButton + Friend WithEvents GroupBox4 As GroupBox + Friend WithEvents Button3 As Button + Friend WithEvents btnTestRegEx As Button + Friend WithEvents Label14 As Label + Friend WithEvents txtResultRegEx As TextBox + Friend WithEvents txthtmlEmail As TextBox End Class diff --git a/App/CONFIG_APP/frmMain.resx b/App/EmailProfiler.Form/frmMain.resx similarity index 96% rename from App/CONFIG_APP/frmMain.resx rename to App/EmailProfiler.Form/frmMain.resx index dc26424..5e8d26e 100644 --- a/App/CONFIG_APP/frmMain.resx +++ b/App/EmailProfiler.Form/frmMain.resx @@ -294,21 +294,6 @@ 1271, 17 - - 1388, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEISURBVDhPzVKxDoIwEOWjHBwNcZSEkcHBT3FicDFu6qCf - wMCfEBY1cXCTBUWB8ey7cI2tJTp6yUt5d/deS3te0zSkULZtO/Ks6GoMF+cAme4iKsqClMlMcgLf9/W3 - i3PzcDFgk/P1THVdz12NfVwbAOPViLJL5mzs44YBEK4nXJCTCD6EEiD2CZR4j0tVtUQElkGiLx0JiHEH - nRg7L/M8pziOWYAVBu8cdfSxgesVgiCgzWZLz8fTMABHHnX0cbOCMQfIRVFEt/LOgChNU14lJ7/UScxA - AQ3Y6Xg4saCqHryCI/+TwTf8uQFu2SUS6FdwhSroObCNwI056As1UKFq0JNooZtEz3sBIUpmhmW9bzQA - AAAASUVORK5CYII= - - 290, 56 @@ -321,10 +306,11 @@ 985, 56 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -336,7 +322,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -348,7 +334,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -359,7 +345,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -368,7 +354,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -377,7 +363,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -394,7 +380,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -406,7 +392,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -418,7 +404,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -429,7 +415,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -438,7 +424,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -447,7 +433,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -464,7 +450,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -476,7 +462,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -488,7 +474,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -499,7 +485,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -508,7 +494,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -517,7 +503,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -534,7 +520,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -546,7 +532,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -558,7 +544,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -569,7 +555,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -578,7 +564,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -587,56 +573,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - 239, 173 - - - 1297, 134 - - - 1143, 134 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -653,7 +590,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -665,7 +602,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -677,7 +614,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -688,7 +625,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -697,7 +634,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -706,7 +643,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -714,6 +651,27 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + 239, 173 + + + 1297, 134 + 17, 56 @@ -750,7 +708,7 @@ 235 - + AAABAAIAgIAAAAEAIAAoCAEAJgAAACAgAAABACAAqBAAAE4IAQAoAAAAgAAAAAABAAABACAAAAAAAAAA AQASCwAAEgsAAAAAAAAAAAAA////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// @@ -1951,6 +1909,26 @@ gsFsbGyeQ0NDfhoaGloHBwc5ISEhIAAAAAkAAAAA////AP///wD//////8AD///AA////D////gf///w D///4Af//8AD//+AAP//8A//+HAAAAAAAAAAAAABwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAAD4AAABw== + + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKUCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkVudmVsb3BlQ2xvc2UiPg0KICAgIDxwYXRoIGQ9Ik0x + NiwxNmwxMi02LjlWOWMwLTAuNS0wLjUtMS0xLTFINUM0LjUsOCw0LDguNSw0LDl2MC4xTDE2LDE2eiIg + Y2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJNMTYsMTguM0w0LDExLjRWMjNjMCwwLjUsMC41 + LDEsMSwxaDIyYzAuNSwwLDEtMC41LDEtMVYxMS40TDE2LDE4LjN6IiBjbGFzcz0iWWVsbG93IiAvPg0K + ICA8L2c+DQo8L3N2Zz4L \ No newline at end of file diff --git a/App/CONFIG_APP/frmMain.vb b/App/EmailProfiler.Form/frmMain.vb similarity index 76% rename from App/CONFIG_APP/frmMain.vb rename to App/EmailProfiler.Form/frmMain.vb index 8b33831..74d17f1 100644 --- a/App/CONFIG_APP/frmMain.vb +++ b/App/EmailProfiler.Form/frmMain.vb @@ -1,52 +1,44 @@ Imports System.ComponentModel -Imports System.Configuration Imports System.IO Imports System.Text.RegularExpressions Imports DigitalData.EMLProfiler Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Messaging -Imports NLog.Config +Imports DigitalData.Modules.Config Public Class frmMain - Private Logger As DigitalData.Modules.Logging.Logger - Private Shared LogConfig As LogConfig - 'Private _database As clsDatabase + Private Logger As Logger + Private LogConfig As LogConfig + Private ConfigManager As Configmanager(Of Config) Private _database As MSSQLServer Private _Encryption As clsEncryption Private _windream As clsWindream_allgemein - ' Private _email As clsEmail Private _emailIMAP As clsEmailIMAP Private _LoadInProgress As Boolean = True Private _RunwithLocalemail As Boolean = False Private _SQLServerConString As String Private _Worklist As List(Of String) - Private _limilab As DigitalData.Modules.Messaging.Limilab - Private _ConfigManager As ClassConfig - Private _Config As ClassConfig.Config - - Public Sub New() - - ' Dieser Aufruf ist für den Designer erforderlich. - InitializeComponent() - - ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - - End Sub + Private _limilab As Limilab + Private _ConfigManager As ClassDBConfig + Private _DBConfig As ClassDBConfig.Config Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load Try LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, My.Application.Info.CompanyName, My.Application.Info.ProductName) _limilab = New Limilab(LogConfig) + ConfigManager = New ConfigManager(Of Config)(LogConfig, Application.StartupPath) + Logger = LogConfig.GetLogger() - If My.Settings.DEBUG = True Then + If ConfigManager.Config.Debug = True Then Logger.Info("!! DEBUG is ACTIVE !!") End If - LogConfig.Debug = My.Settings.DEBUG + LogConfig.Debug = ConfigManager.Config.Debug InitDatabase() - ToolStripProgressBar1.Visible = False + ToolStripProgressBar2.Visible = False Logger.Debug($"AppConfig is located at: [{AppDomain.CurrentDomain.SetupInformation.ConfigurationFile}]") - If My.Settings.USE_WM Then + + If ConfigManager.Config.UseWindream Then _windream = New clsWindream_allgemein(LogConfig) End If @@ -63,7 +55,7 @@ Public Class frmMain Check_Steps() Active_Color() End If - If My.Settings.USE_WM Then + If ConfigManager.Config.UseWindream Then ObjektTypenEintragen() End If @@ -120,14 +112,14 @@ Public Class frmMain End Sub Sub Load_History() Try - Me.TBEMLP_HISTORYTableAdapter.Fill(Me.MyDataset.TBEMLP_HISTORY) + TBEMLP_HISTORYTableAdapter.Fill(MyDataset.TBEMLP_HISTORY) Catch ex As Exception MsgBox("Error in Load History: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Sub Sub Load_indexingSteps() Try - Me.TBEMLP_POLL_INDEXING_STEPSTableAdapter.Fill(Me.MyDataset.TBEMLP_POLL_INDEXING_STEPS) + TBEMLP_POLL_INDEXING_STEPSTableAdapter.Fill(MyDataset.TBEMLP_POLL_INDEXING_STEPS) Catch ex As Exception MsgBox("Unexpected Error in Load_indexingSteps: " & ex.Message, MsgBoxStyle.Critical) End Try @@ -135,10 +127,26 @@ Public Class frmMain Sub Load_Config() Try _LoadInProgress = True - Me.TBEMLP_CONFIGTableAdapter.Fill(Me.MyDataset.TBEMLP_CONFIG) + TBEMLP_CONFIGTableAdapter.Fill(MyDataset.TBEMLP_CONFIG) + + txtConnectionString.Text = _database.MaskedConnectionString Catch ex As Exception MsgBox("Unexpected Error in Load_Config: " & ex.Message, MsgBoxStyle.Critical) End Try + + Try + Dim osql = "SELECT * FROM TBDD_FUNCTION_REGEX WHERE UPPER(FUNCTION_NAME) IN (UPPER('EMAIL_PROFILER - RemoveHTMLText'),UPPER('EMAIL_PROFILER - RemoveHTMLText1'))" + Dim oDTFunctionRegex As DataTable = _database.GetDatatable(osql) + + If oDTFunctionRegex?.Rows.Count > 0 Then + txtRegex1.Text = oDTFunctionRegex.Rows(0).Item("REGEX") + txtRegex2.Text = oDTFunctionRegex.Rows(1).Item("REGEX") + txthtmlEmail.BackColor = Color.Wheat + End If + Catch ex As Exception + MsgBox("Error in Load Regex: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + _LoadInProgress = False End Sub Private Sub ObjektTypenEintragen() @@ -162,10 +170,9 @@ Public Class frmMain Public Function InitDatabase() Try - Dim dbResult As Boolean tslblstatus.BackColor = Color.Transparent - If My.Settings.MyConnectionString <> String.Empty Then - _SQLServerConString = My.Settings.MyConnectionString + If ConfigManager.Config.ConnectionString <> String.Empty Then + _SQLServerConString = ConfigManager.Config.ConnectionString If _SQLServerConString.Contains("LOGIT_DMS") Then _SQLServerConString.Replace("LOGIT_DMS", "DD_ECM") Logger.Debug($"Replaced wrong Database in ConString ... ") @@ -175,15 +182,13 @@ Public Class frmMain _database = New MSSQLServer(LogConfig, _SQLServerConString) Logger.Debug("Inititalizing Configuration") - _ConfigManager = New ClassConfig(LogConfig, _database) - _Config = _ConfigManager.GetConfig() + _ConfigManager = New ClassDBConfig(LogConfig, _database) + _DBConfig = _ConfigManager.GetConfig() - If _Config Is Nothing Then + If _DBConfig Is Nothing Then MsgBox("Configuration could not be loaded. Please check the Logfile.", MsgBoxStyle.Critical, Text) End If - '_database = New clsDatabase(MyLogger, My.Settings.MyConnectionString) - 'dbResult = _database.Init(My.Settings.MyConnectionString) Else MsgBox("No Databaseconnection configured. (First Start or Appdata not accessible)" & vbNewLine & "Basic-Config will be loaded.", MsgBoxStyle.Information) @@ -191,7 +196,7 @@ Public Class frmMain tslblstatus.Text = "Please add a connection!" tslblstatus.BackColor = Color.Red End If - If _database.DBInitialized = False Then + If _database?.DBInitialized = False Then MsgBox("Error in init database. (Connection failed) More information in the logfile.", MsgBoxStyle.Critical, Text) Return False Else @@ -224,7 +229,7 @@ Public Class frmMain Dim connection As New SqlClient.SqlConnection(con) 'csb.ConnectionString) connection.Open() MyConnectionString = con - My.Settings.Save() + ConfigManager.Save() Dim cmd As New SqlClient.SqlCommand("sp_databases", connection) cmd.CommandType = CommandType.StoredProcedure ' Ausführen und Ergebnis in einer ListBox anzeigen @@ -273,15 +278,15 @@ Public Class frmMain If result = MsgBoxResult.Yes Then 'Set the construction string MyConnectionString = con - My.Settings.MyConnectionString = MyConnectionString + ConfigManager.Config.ConnectionString = MyConnectionString _database = New MSSQLServer(LogConfig, MyConnectionString) - _ConfigManager = New ClassConfig(LogConfig, _database) + _ConfigManager = New ClassDBConfig(LogConfig, _database) 'csb.ConnectionString '_database.Init(MyConnectionString) - My.Settings.Save() + ConfigManager.Save() If chkbxUserAut.Checked = False Then Dim cipherText As String = _Encryption.EncryptData(Me.txtPasswort.Text) @@ -302,18 +307,17 @@ Public Class frmMain End Try End Sub - Private Sub BackgroundWorker1_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork + Private Sub BackgroundWorker1_DoWork(sender As Object, e As DoWorkEventArgs) Handles BackgroundWorker1.DoWork If _RunwithLocalemail = False Then LogConfig.Debug = True - Dim _work As New clsWorker(My.Settings.EML_LIMITATION_SENDER, LogConfig, _SQLServerConString, _Config.WindreamConnectionString, GUIDTextBox.Text, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, - My.Settings.USE_WM, ToolStripEmailAccountID.Text, "EmailProfilerTestClient") + Dim _work As New clsWorker(LogConfig, _SQLServerConString, _DBConfig.WindreamConnectionString, GUIDTextBox.Text, ConfigManager.Config.UseWindream, ToolStripEmailAccountID2.Text, "EmailProfilerTestClient", ConfigManager.Config.EmailSenderLimitation) _work.Start_WorkingProfiles() Else For Each ofile As String In _Worklist Logger.Info($"## Manual working on file {ofile} ... ") - Dim _work As New clsWorker(My.Settings.EML_LIMITATION_SENDER, LogConfig, _SQLServerConString, _Config.WindreamConnectionString, GUIDTextBox.Text, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, My.Settings.USE_WM, ToolStripEmailAccountID.Text, "EmailProfilerTestClient", ofile) + Dim _work As New clsWorker(LogConfig, _SQLServerConString, _DBConfig.WindreamConnectionString, GUIDTextBox.Text, ConfigManager.Config.UseWindream, ToolStripEmailAccountID2.Text, "EmailProfilerTestClient", ConfigManager.Config.EmailSenderLimitation, ofile) _work.Start_WorkingProfiles(True) Next @@ -321,11 +325,11 @@ Public Class frmMain Try 'Delete all Tempfiles For Each _file In ClassCurrent.TEMP_FILES - System.IO.File.Delete(_file) + File.Delete(_file) Next Try - Dim oDiTempPath As New IO.DirectoryInfo(System.IO.Path.GetTempPath) - Dim oaryFi As IO.FileInfo() = oDiTempPath.GetFiles() + Dim oDiTempPath As New DirectoryInfo(Path.GetTempPath) + Dim oaryFi As FileInfo() = oDiTempPath.GetFiles() For Each fi In oaryFi fi.Delete() @@ -342,72 +346,60 @@ Public Class frmMain Private Sub BackgroundWorker1_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles BackgroundWorker1.RunWorkerCompleted If e.Error IsNot Nothing Then - '' if BackgroundWorker terminated due to error - MessageBox.Show(e.Error.Message) - 'Label1.Text = "Error occurred!" - + MessageBox.Show(e.Error.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error) ElseIf e.Cancelled Then - '' otherwise if it was cancelled - MessageBox.Show("Task cancelled!") - ' Label1.Text = "Task Cancelled!" - + MessageBox.Show("Task cancelled!", Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) Else - '' otherwise it completed normally - MessageBox.Show("Manual Run completed!") - 'Label1.Text = "Error completed!" + MessageBox.Show("Manual Run completed!", Text, MessageBoxButtons.OK, MessageBoxIcon.Information) End If - tsbtnRunProfiles.Enabled = True - tsbtnRunLocalMail.Enabled = True - ToolStripProgressBar1.Visible = False + + tsbtnRunProfiles2.Enabled = True + tsbtnRunLocalMail2.Enabled = True + ToolStripProgressBar2.Visible = False End Sub - Private Sub tsbtnRunProfiles_Click(sender As Object, e As EventArgs) Handles tsbtnRunProfiles.Click - If IsNumeric(ToolStripEmailAccountID.Text) = False Then - MsgBox("Choose an email-Profile before running processes!", MsgBoxStyle.Exclamation) + Private Sub tsbtnRunProfiles_Click(sender As Object, e As EventArgs) Handles tsbtnRunProfiles2.Click + If IsNumeric(ToolStripEmailAccountID2.Text) = False Then + MsgBox("Choose an email-Profile before running processes!", MsgBoxStyle.Exclamation, Text) Exit Sub End If _RunwithLocalemail = False If Not BackgroundWorker1.IsBusy Then - tsbtnRunProfiles.Enabled = False - tsbtnRunLocalMail.Enabled = False - ToolStripProgressBar1.Visible = True + tsbtnRunProfiles2.Enabled = False + tsbtnRunLocalMail2.Enabled = False + ToolStripProgressBar2.Visible = True BackgroundWorker1.RunWorkerAsync() End If End Sub - Private Sub ToolStripButton28_Click(sender As Object, e As EventArgs) Handles tsbtnRunLocalMail.Click - If IsNumeric(ToolStripEmailAccountID.Text) = False Then + Private Sub ToolStripButton28_Click(sender As Object, e As EventArgs) Handles tsbtnRunLocalMail2.Click + If IsNumeric(ToolStripEmailAccountID2.Text) = False Then MsgBox("Choose an email-Profile before running processes!", MsgBoxStyle.Exclamation) Exit Sub End If - If Not BackgroundWorker1.IsBusy Then - Dim openFileDialog1 As New OpenFileDialog() - ' openFileDialog1.InitialDirectory = "c:\" - openFileDialog1.Filter = "Emails (*.eml)|*.eml|All files (*.*)|*.*" - openFileDialog1.FilterIndex = 2 - openFileDialog1.RestoreDirectory = True - openFileDialog1.Multiselect = True + If Not BackgroundWorker1.IsBusy Then + Dim openFileDialog1 As New OpenFileDialog With { + .Filter = "Emails (*.eml)|*.eml|All files (*.*)|*.*", + .FilterIndex = 2, + .RestoreDirectory = True, + .Multiselect = True + } If openFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then For Each oFile As String In openFileDialog1.FileNames - Dim oList As New List(Of String) - oList.Add(oFile) + Dim oList As New List(Of String) From {oFile} _Worklist = oList Next _RunwithLocalemail = True - tsbtnRunLocalMail.Enabled = False - tsbtnRunProfiles.Enabled = False - ToolStripProgressBar1.Visible = True + tsbtnRunLocalMail2.Enabled = False + tsbtnRunProfiles2.Enabled = False + ToolStripProgressBar2.Visible = True BackgroundWorker1.RunWorkerAsync() End If - - - End If - End Sub - Private Sub mWorker_ProgressChanged(ByVal sender As Object, ByVal e As System.ComponentModel.ProgressChangedEventArgs) Handles BackgroundWorker1.ProgressChanged - Me.ToolStripProgressBar1.Value = e.ProgressPercentage + Private Sub mWorker_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) Handles BackgroundWorker1.ProgressChanged + ToolStripProgressBar2.Value = e.ProgressPercentage End Sub Private Sub btnShowLogpath_Click(sender As Object, e As EventArgs) Handles btnShowLogpath.Click @@ -415,9 +407,9 @@ Public Class frmMain End Sub Private Sub TBEMLP_POLL_PROFILESBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) - Me.Validate() - Me.TBEMLP_POLL_PROFILESBindingSource.EndEdit() - Me.TableAdapterManager.UpdateAll(Me.MyDataset) + Validate() + TBEMLP_POLL_PROFILESBindingSource.EndEdit() + TableAdapterManager.UpdateAll(MyDataset) End Sub @@ -444,7 +436,7 @@ Public Class frmMain End Sub Private Sub WM_OBJEKTTYPEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles WM_OBJEKTTYPEComboBox.SelectedIndexChanged - If My.Settings.USE_WM Then + If ConfigManager.Config.UseWindream Then Load_Indexdata() End If @@ -455,22 +447,20 @@ Public Class frmMain If WM_OBJEKTTYPEComboBox.Text = String.Empty Then Exit Sub End If - Me.WM_VECTOR_LOGComboBox.Items.Clear() - Me.WM_IDX_BODY_TEXTComboBox.Items.Clear() + WM_VECTOR_LOGComboBox.Items.Clear() + WM_IDX_BODY_TEXTComboBox.Items.Clear() INDEXNAMEIndexStepsComboBox.Items.Clear() - Me.WM_VECTOR_LOGComboBox.Items.Add("") - Me.WM_IDX_BODY_TEXTComboBox.Items.Add("") + WM_VECTOR_LOGComboBox.Items.Add("") + WM_IDX_BODY_TEXTComboBox.Items.Add("") INDEXNAMEIndexStepsComboBox.Items.Add("") - 'Me.WM_REFERENCE_INDEXComboBox.Items.Clear() - 'Me.WM_REFERENCE_INDEXComboBox.Items.Add("") + Dim indexe = _windream.GetIndicesByObjecttype(WM_OBJEKTTYPEComboBox.Text) If indexe IsNot Nothing Then For Each index As String In indexe Me.WM_VECTOR_LOGComboBox.Items.Add(index) WM_IDX_BODY_TEXTComboBox.Items.Add(index) INDEXNAMEIndexStepsComboBox.Items.Add(index) - ' WM_REFERENCE_INDEXComboBox.Items.Add(index) Next End If End If @@ -569,15 +559,11 @@ Public Class frmMain Load_indexingSteps() End Sub - Private Sub XtraTabControl1_TabIndexChanged(sender As Object, e As EventArgs) Handles XtraTabControl1.TabIndexChanged - - End Sub - Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged Select Case XtraTabControl1.SelectedTabPageIndex Case 0 Check_Steps() - If My.Settings.USE_WM Then + If ConfigManager.Config.UseWindream Then Load_Indexdata() End If @@ -589,36 +575,17 @@ Public Class frmMain End Sub Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown - If My.Settings.USE_WM Then + If ConfigManager.Config.UseWindream Then Load_Indexdata() End If - End Sub Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged - tsbtnRunProfiles.Visible = False tslblRefresh.BackColor = Color.Transparent tslblRefresh.Text = "" - Select Case TabControl1.SelectedIndex - Case 0 - tsbtnRunProfiles.Visible = True - Case 1 - - Load_Config() - Case 2 - ' Load_History() - Case 4 - Try - Dim osql = "SELECT * FROM TBDD_FUNCTION_REGEX WHERE UPPER(FUNCTION_NAME) IN (UPPER('EMAIL_PROFILER - RemoveHTMLText'),UPPER('EMAIL_PROFILER - RemoveHTMLText1'))" - Dim oDTFunctionRegex As DataTable = _database.GetDatatable(osql) - txtRegex1.Text = oDTFunctionRegex.Rows(0).Item("REGEX") - txtRegex2.Text = oDTFunctionRegex.Rows(1).Item("REGEX") - txthtmlEmail.BackColor = Color.Wheat - Catch ex As Exception - MsgBox("Error in Load Regex: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - End Select - + If TabControl1.SelectedIndex = 2 Then + Load_Config() + End If End Sub Private Sub ACTIVECheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles ACTIVECheckBox.CheckedChanged @@ -649,19 +616,20 @@ Public Class frmMain End If End Sub - Private Sub ToolStripButton34_Click(sender As Object, e As EventArgs) Handles ToolStripButton34.Click + Private Sub ToolStripButton34_Click(sender As Object, e As EventArgs) Load_History() End Sub Private Sub LOG_ERRORS_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LOG_ERRORS_ONLYCheckBox.CheckedChanged If _LoadInProgress = True Then Exit Sub LogConfig.Debug = LOG_ERRORS_ONLYCheckBox.Checked - My.Settings.Save() + ConfigManager.Save() Dim upd = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',LOG_ERRORS_ONLY = '{LOG_ERRORS_ONLYCheckBox.Checked}' WHERE GUID = 1" _database.ExecuteNonQuery(upd) Load_Config() End Sub + Sub Save_Config() Try TBEMLP_CONFIGBindingSource.EndEdit() @@ -675,6 +643,7 @@ Public Class frmMain MsgBox("Error in Save_Config: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Sub + Sub Save_email_Profile() Try TBDD_EMAIL_ACCOUNTBindingSource.EndEdit() @@ -695,18 +664,6 @@ Public Class frmMain _database.ExecuteNonQuery(upd) Load_Config() End Sub - 'Private Function GetChildren(ByVal bodyParts As BodyPartCollection) As BodyPartCollection - - ' Dim children As New BodyPartCollection() - - ' For i As Integer = 0 To bodyParts.Count - 1 - ' children.Add(GetChildren(bodyParts(i).BodyParts)) - ' children.Add(bodyParts(i)) - ' Next - - ' Return children - 'End Function - Private Sub STEP_NAMEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles STEP_NAMEComboBox.SelectedIndexChanged Label9.Visible = False txtSubjectExample.Visible = False @@ -742,7 +699,7 @@ Public Class frmMain Private Sub btnsendtestmail_Click(sender As Object, e As EventArgs) Handles btnsendtestmail.Click If txtTestmail.Text <> String.Empty Then - My.Settings.Save() + ConfigManager.Save() Dim PWPlain = _Encryption.DecryptData(EMAIL_PWTextBox.Text) If _limilab.NewSMTPEmail(txtTestmail.Text, "Testmail", "This is the body (text will be replaced within profile)", EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text, PORTTextBox.Text, @@ -757,7 +714,7 @@ Public Class frmMain End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btntestImap.Click - My.Settings.Save() + ConfigManager.Save() Dim oSQL = $"SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE GUID = {EMAILIDTextBox.Text}" Dim oDT As DataTable = _database.GetDatatable(oSQL) If Not IsNothing(oDT) Then @@ -778,22 +735,22 @@ Public Class frmMain End If End If End Sub + Private Sub btnCheckIMAPObjects_Click(sender As Object, e As EventArgs) Handles btnCheckIMAPObjects.Click - Dim oListuids As New List(Of Long) - oListuids = _limilab.IMAPGetUnseenMessageIDs() + Dim oListuids As List(Of Long) = _limilab.IMAPGetUnseenMessageIDs() If IsNothing(oListuids) Then MsgBox("Something went wrong! - Check Your log.", MsgBoxStyle.Critical) Else _limilab.CloseImap() MsgBox($"IMAP-Folder contained [{oListuids.Count}] unseen Objects!", MsgBoxStyle.Information) End If - End Sub - Private Sub btnTestRegEx_Click(sender As Object, e As EventArgs) Handles btnTestRegEx.Click + + Private Sub btnTestRegEx_Click(sender As Object, e As EventArgs) txtResultRegEx.Text = "" Try - My.Settings.Save() + ConfigManager.Save() txtResultRegEx.BackColor = Color.WhiteSmoke ' Instantiate the regular expression object. Dim oReg As Regex = New Regex(txtRegex1.Text, RegexOptions.IgnoreCase) @@ -830,7 +787,7 @@ Public Class frmMain End Sub - Private Sub btnsaveRegex_Click_1(sender As Object, e As EventArgs) Handles btnsaveRegex.Click + Private Sub btnsaveRegex_Click_1(sender As Object, e As EventArgs) tslblRefresh.BackColor = Color.Transparent Dim upd = $"UPDATE TBDD_FUNCTION_REGEX SET REGEX = '{txtRegex1.Text}' WHERE UPPER(FUNCTION_NAME) = UPPER('EMAIL_PROFILER - RemoveHTMLText')" If _database.ExecuteNonQuery(upd) = True Then @@ -842,61 +799,7 @@ Public Class frmMain End If End Sub - Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click - 'Try - ' txthtmlEmail.Text = "" - ' txthtmlEmail.BackColor = Color.Wheat - ' Dim oOpenFileDialog1 As New OpenFileDialog() - - ' ' openFileDialog1.InitialDirectory = "c:\" - ' oOpenFileDialog1.Filter = "Emails (*.eml)|*.eml|All files (*.*)|*.*" - ' oOpenFileDialog1.FilterIndex = 2 - ' oOpenFileDialog1.RestoreDirectory = True - - ' If oOpenFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then - ' Dim oMsg_email As New Independentsoft.Email.Mime.Message(oOpenFileDialog1.FileName) - ' Dim oBodyText As String = "" - ' If IsNothing(oMsg_email.Body) Then - ' Dim oAllBodyParts As New BodyPartCollection() - ' oAllBodyParts.Add(oMsg_email.BodyParts) - ' oAllBodyParts.Add(GetChildren(oMsg_email.BodyParts)) - ' For Each bodyPart As BodyPart In oAllBodyParts - ' If bodyPart.ContentType IsNot Nothing AndAlso bodyPart.ContentType.Type = "text" AndAlso bodyPart.ContentType.SubType = "plain" Then - ' If oBodyText = String.Empty Then - ' Logger.Debug(String.Format("BODY1-Text is....#{0}", bodyPart.Body)) - ' oBodyText = bodyPart.Body - ' Else - ' Continue For - ' End If - ' ElseIf bodyPart.ContentType IsNot Nothing AndAlso bodyPart.ContentType.Type = "text" AndAlso bodyPart.ContentType.SubType = "html" Then - ' If oBodyText = String.Empty Then - ' oBodyText = bodyPart.Body - ' Logger.Debug(String.Format("bodyhtml....#{0}", bodyPart.Body)) - ' Else - ' Continue For - ' End If - ' Logger.Debug(String.Format("bodyhtml....#{0}", bodyPart.Body)) - ' End If - ' Next - ' If oBodyText = "" Then - ' MsgBox("No html-body extractable?!") - ' Else - ' txthtmlEmail.Text = oBodyText - ' txthtmlEmail.BackColor = Color.Yellow - ' End If - ' Else - ' txthtmlEmail.Text = oMsg_email.Body - ' txthtmlEmail.BackColor = Color.Yellow - ' End If - - ' End If - 'Catch ex As Exception - ' MsgBox(ex.Message, MsgBoxStyle.Critical) - 'End Try - - End Sub - - Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + Private Sub Button5_Click(sender As Object, e As EventArgs) tslblRefresh.BackColor = Color.Transparent Dim upd = $"UPDATE TBDD_FUNCTION_REGEX SET REGEX = '{txtRegex2.Text}' WHERE UPPER(FUNCTION_NAME) = UPPER('EMAIL_PROFILER - RemoveHTMLText1')" If _database.ExecuteNonQuery(upd) = True Then @@ -916,27 +819,11 @@ Public Class frmMain End If End Sub - Private Sub frmMain_ImeModeChanged(sender As Object, e As EventArgs) Handles Me.ImeModeChanged - - End Sub - - - - Private Sub COMMENTTextBox_Leave(sender As Object, e As EventArgs) Handles COMMENTTextBox.Leave - Try - Dim separatorIndex = COMMENTTextBox.Text.IndexOf(".") - TextBox1.Text = COMMENTTextBox.Text.Substring(separatorIndex, COMMENTTextBox.Text.Length - 1) - Catch ex As Exception - - End Try - - End Sub - Private Sub EMAILIDTextBox_TextChanged(sender As Object, e As EventArgs) Handles EMAILIDTextBox.TextChanged - If IsNumeric(EMAILIDTextBox) Then - ToolStripEmailAccountID.Text = EMAILIDTextBox.Text + If IsNumeric(EMAILIDTextBox.Text) Then + ToolStripEmailAccountID2.Text = EMAILIDTextBox.Text Else - ToolStripEmailAccountID.Text = "Choose Email-Config" + ToolStripEmailAccountID2.Text = "Choose Email-Config" End If btnCheckIMAPObjects.Visible = False End Sub @@ -955,12 +842,11 @@ Public Class frmMain Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged Try If ComboBox1.SelectedIndex <> -1 Then - ToolStripEmailAccountID.Text = ComboBox1.SelectedValue + ToolStripEmailAccountID2.Text = ComboBox1.SelectedValue End If Catch ex As Exception - + Logger.Error(ex) End Try - End Sub Private Sub PasswortAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PasswortAnzeigenToolStripMenuItem.Click @@ -972,4 +858,8 @@ Public Class frmMain MsgBox(ex.Message, MsgBoxStyle.Critical, "") End Try End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) + + End Sub End Class diff --git a/App/CONFIG_APP/packages.config b/App/EmailProfiler.Form/packages.config similarity index 100% rename from App/CONFIG_APP/packages.config rename to App/EmailProfiler.Form/packages.config diff --git a/App/EmailProfiler.Service/App.config b/App/EmailProfiler.Service/App.config new file mode 100644 index 0000000..e9324d4 --- /dev/null +++ b/App/EmailProfiler.Service/App.config @@ -0,0 +1,54 @@ + + + + +
+ + + + + + + + + + + + + + + + + + 172.24.12.41 + + + 172.24.12.41:E:\DB\Firebird\Databases\EDMI_TEMPLATE\EDMI_MASTER.FDB + + + sysdba + + + dd + + + False + + + False + + + 2 + + + EmailProfiler + + + NONE + + + Server=SDB01\DIGITALDATA;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnVyz+pQgGwwFrC6HCYzpmU3D2IL51z3wZ5odRZQbqYbM=; + + + + diff --git a/App/EmailProfiler.Service/Config.vb b/App/EmailProfiler.Service/Config.vb new file mode 100644 index 0000000..1d97ea6 --- /dev/null +++ b/App/EmailProfiler.Service/Config.vb @@ -0,0 +1,8 @@ +Public Class Config + Public Property Debug As Boolean = False + Public Property EmailAccountId As Integer = 0 + Public Property EmailTitlePrefix As String = "EmailProfiler" + Public Property EmailSenderLimitation As String = "" + Public Property ConnectionString As String = "" + Public Property UseWindream As Boolean = False +End Class diff --git a/App/SERV_EMAIL/SERV_EMAIL.vbproj b/App/EmailProfiler.Service/EmailProfiler.Service.vbproj similarity index 91% rename from App/SERV_EMAIL/SERV_EMAIL.vbproj rename to App/EmailProfiler.Service/EmailProfiler.Service.vbproj index 229c65a..33522c5 100644 --- a/App/SERV_EMAIL/SERV_EMAIL.vbproj +++ b/App/EmailProfiler.Service/EmailProfiler.Service.vbproj @@ -6,9 +6,9 @@ AnyCPU {1F3C569B-91DA-427F-8D81-BBCC556B11A4} WinExe - SERV_EMAIL.MyService - SERV_EMAIL - SERV_EMAIL + EmailProfiler.Service.MyService + EmailProfiler.Service + EmailProfiler.Service 512 Console v4.6.2 @@ -22,7 +22,7 @@ true true bin\Debug\ - SERV_EMAIL.xml + EmailProfiler.Service.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -32,7 +32,7 @@ true true bin\Release\ - SERV_EMAIL.xml + EmailProfiler.Service.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -51,6 +51,9 @@ ..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + + ..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + False ..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll @@ -93,6 +96,7 @@ + True Application.myapp @@ -150,9 +154,9 @@ - + {9f748dcd-952e-40a0-9dad-65bf8a39b231} - DigitalData.EMLProfiler + EmailProfiler.Common diff --git a/App/SERV_EMAIL/MailLicense.xml b/App/EmailProfiler.Service/MailLicense.xml similarity index 100% rename from App/SERV_EMAIL/MailLicense.xml rename to App/EmailProfiler.Service/MailLicense.xml diff --git a/App/SERV_EMAIL/My Project/Application.Designer.vb b/App/EmailProfiler.Service/My Project/Application.Designer.vb similarity index 100% rename from App/SERV_EMAIL/My Project/Application.Designer.vb rename to App/EmailProfiler.Service/My Project/Application.Designer.vb diff --git a/App/SERV_EMAIL/My Project/Application.myapp b/App/EmailProfiler.Service/My Project/Application.myapp similarity index 100% rename from App/SERV_EMAIL/My Project/Application.myapp rename to App/EmailProfiler.Service/My Project/Application.myapp diff --git a/App/SERV_EMAIL/My Project/AssemblyInfo.vb b/App/EmailProfiler.Service/My Project/AssemblyInfo.vb similarity index 100% rename from App/SERV_EMAIL/My Project/AssemblyInfo.vb rename to App/EmailProfiler.Service/My Project/AssemblyInfo.vb diff --git a/App/SERV_EMAIL/My Project/Resources.Designer.vb b/App/EmailProfiler.Service/My Project/Resources.Designer.vb similarity index 96% rename from App/SERV_EMAIL/My Project/Resources.Designer.vb rename to App/EmailProfiler.Service/My Project/Resources.Designer.vb index 015578b..3fb8ab9 100644 --- a/App/SERV_EMAIL/My Project/Resources.Designer.vb +++ b/App/EmailProfiler.Service/My Project/Resources.Designer.vb @@ -39,7 +39,7 @@ Namespace My.Resources Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("SERV_EMAIL.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EmailProfiler.Service.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan diff --git a/App/SERV_EMAIL/My Project/Resources.resx b/App/EmailProfiler.Service/My Project/Resources.resx similarity index 100% rename from App/SERV_EMAIL/My Project/Resources.resx rename to App/EmailProfiler.Service/My Project/Resources.resx diff --git a/App/SERV_EMAIL/My Project/Settings.Designer.vb b/App/EmailProfiler.Service/My Project/Settings.Designer.vb similarity index 97% rename from App/SERV_EMAIL/My Project/Settings.Designer.vb rename to App/EmailProfiler.Service/My Project/Settings.Designer.vb index a9af0a1..978c96a 100644 --- a/App/SERV_EMAIL/My Project/Settings.Designer.vb +++ b/App/EmailProfiler.Service/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -156,9 +156,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.SERV_EMAIL.My.MySettings + Friend ReadOnly Property Settings() As Global.EmailProfiler.Service.My.MySettings Get - Return Global.SERV_EMAIL.My.MySettings.Default + Return Global.EmailProfiler.Service.My.MySettings.Default End Get End Property End Module diff --git a/App/SERV_EMAIL/My Project/Settings.settings b/App/EmailProfiler.Service/My Project/Settings.settings similarity index 100% rename from App/SERV_EMAIL/My Project/Settings.settings rename to App/EmailProfiler.Service/My Project/Settings.settings diff --git a/App/SERV_EMAIL/MyService.Designer.vb b/App/EmailProfiler.Service/MyService.Designer.vb similarity index 100% rename from App/SERV_EMAIL/MyService.Designer.vb rename to App/EmailProfiler.Service/MyService.Designer.vb diff --git a/App/SERV_EMAIL/MyService.resx b/App/EmailProfiler.Service/MyService.resx similarity index 100% rename from App/SERV_EMAIL/MyService.resx rename to App/EmailProfiler.Service/MyService.resx diff --git a/App/EmailProfiler.Service/MyService.vb b/App/EmailProfiler.Service/MyService.vb new file mode 100644 index 0000000..8d0e175 --- /dev/null +++ b/App/EmailProfiler.Service/MyService.vb @@ -0,0 +1,130 @@ +Imports System.ComponentModel +Imports System.IO +Imports DigitalData.EMLProfiler +Imports DigitalData.Modules.Config +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging +Public Class MyService +#Region "+++++ variables +++++" + Private Worker As BackgroundWorker + Private WithEvents Timer As New Timers.Timer + + Private LogConfig As LogConfig + Private Logger As Logger + 'Private _database As clsDatabase + Private EmailWorker As clsWorkEmail + + Private DBConfigManager As ClassDBConfig + Private DBConfig As ClassDBConfig.Config + + Private ConfigManager As ConfigManager(Of Config) + Private Config As Config + + Private Database As MSSQLServer +#End Region + Protected Overrides Sub OnStart(args() As String) + Try + Dim oLogPath = Path.Combine(My.Application.Info.DirectoryPath, "Log") + LogConfig = New LogConfig(LogConfig.PathType.CustomPath, oLogPath, Nothing, "Digital Data", "DD EmailProfiler", 30) + Logger = LogConfig.GetLogger + + Logger.Info("Service started.") + + ConfigManager = New ConfigManager(Of Config)(LogConfig, My.Application.Info.DirectoryPath) + Config = ConfigManager.Config + + If Config.ConnectionString = String.Empty Then + Logger.Warn("No ConnectionString configured. Exiting.") + Else + If Config.Debug = True Then + LogConfig.Debug = True + Else + LogConfig.Debug = False + End If + + Database = New MSSQLServer(LogConfig, Config.ConnectionString) + Logger.Debug("Database initialized!") + + DBConfigManager = New ClassDBConfig(LogConfig, Database) + DBConfig = DBConfigManager.GetConfig() + + If DBConfig IsNot Nothing Then + Logger.Debug("DBConfig initialized!") + Else + Logger.Warn("Error while initializing DBConfig") + End If + + EmailWorker = New clsWorkEmail(LogConfig, Config.ConnectionString, DBConfig.WindreamConnectionString, + Config.UseWindream, Config.EmailAccountId, Config.EmailTitlePrefix) + Logger.Debug("Module Workmail initialized") + + If Database.DBInitialized = False Then + Logger.Warn("No Connection was established! Exiting.") + Else + '### Thread für das nachträgliche Setzen von Rechten generieren + Logger.Debug("Setting up Background Worker") + Worker = New BackgroundWorker With { + .WorkerReportsProgress = True, + .WorkerSupportsCancellation = True + } + AddHandler Worker.DoWork, AddressOf DoWork + AddHandler Worker.RunWorkerCompleted, AddressOf Worker_Completed + + ' Set the Interval + Timer.Interval = DBConfig.TimerInterval * 60000 + Timer.Enabled = True + Logger.Debug("Timer started.") + + ' Und den Durchlauf das erste Mal starten + Worker.RunWorkerAsync() + End If + End If + Catch ex As Exception + Logger.Warn("Unexpected error while starting.") + Logger.Error(ex) + End Try + End Sub + Public Sub Thread_Run() Handles Timer.Elapsed + Logger.Debug("Starting Worker..") + If Not Worker.IsBusy Then + Logger.Debug("Running Worker..") + Worker.RunWorkerAsync() + End If + End Sub + Public Sub DoWork(sender As Object, e As DoWorkEventArgs) + Try + Dim oProfileIdForPolling = 0 + + Dim oWorker As New clsWorker(LogConfig, + Config.ConnectionString, + DBConfig.WindreamConnectionString, + oProfileIdForPolling, + Config.UseWindream, + Config.EmailAccountId, + Config.EmailSenderLimitation, + Config.EmailTitlePrefix) + oWorker.Start_WorkingProfiles() + Catch ex As Exception + Logger.Error(ex) + End Try + End Sub + Protected Overrides Sub OnStop() + ' Hier Code zum Ausführen erforderlicher Löschvorgänge zum Beenden des Dienstes einfügen. + Logger.Info("## Service was stopped manually. ##") + End Sub + Private Sub Worker_Completed(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) 'Handles threadDateiimport.RunWorkerCompleted + 'This event fires when the DoWork event completes + Try + Dim result As String = "" + If e.Cancelled Then + EventLog.WriteEntry("DD EmailProfiler", "The thread was cancelled!", EventLogEntryType.Error) + Logger.Warn("## The thread was cancelled.") + ElseIf e.Error IsNot Nothing Then + EventLog.WriteEntry("DD EmailProfiler", "Unexpected error in thread!", EventLogEntryType.Error) + Logger.Warn("Unexpected error in thread: " & e.Error.Message) + End If + Catch ex As Exception + Logger.Error(ex) + End Try + End Sub +End Class diff --git a/App/SERV_EMAIL/ProjectInstaller.Designer.vb b/App/EmailProfiler.Service/ProjectInstaller.Designer.vb similarity index 94% rename from App/SERV_EMAIL/ProjectInstaller.Designer.vb rename to App/EmailProfiler.Service/ProjectInstaller.Designer.vb index 61793b4..8a8b8da 100644 --- a/App/SERV_EMAIL/ProjectInstaller.Designer.vb +++ b/App/EmailProfiler.Service/ProjectInstaller.Designer.vb @@ -19,7 +19,7 @@ 'Hinweis: Die folgende Prozedur ist für den Komponenten-Designer erforderlich. 'Das Bearbeiten ist mit dem Komponenten-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.ServiceProcessInstaller1 = New System.ServiceProcess.ServiceProcessInstaller() Me.ServiceInstaller1 = New System.ServiceProcess.ServiceInstaller() @@ -33,6 +33,7 @@ 'ServiceInstaller1 ' Me.ServiceInstaller1.Description = "Checks and works emails from configured profiles" + Me.ServiceInstaller1.DisplayName = "Digital Data Email Profiler" Me.ServiceInstaller1.ServiceName = "DD EmailProfiler" Me.ServiceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic ' diff --git a/App/SERV_EMAIL/ProjectInstaller.resx b/App/EmailProfiler.Service/ProjectInstaller.resx similarity index 99% rename from App/SERV_EMAIL/ProjectInstaller.resx rename to App/EmailProfiler.Service/ProjectInstaller.resx index e1b81e8..8b61d99 100644 --- a/App/SERV_EMAIL/ProjectInstaller.resx +++ b/App/EmailProfiler.Service/ProjectInstaller.resx @@ -121,7 +121,7 @@ 17, 56 - 197, 17 + 211, 52 False diff --git a/App/SERV_EMAIL/ProjectInstaller.vb b/App/EmailProfiler.Service/ProjectInstaller.vb similarity index 100% rename from App/SERV_EMAIL/ProjectInstaller.vb rename to App/EmailProfiler.Service/ProjectInstaller.vb diff --git a/App/SERV_EMAIL/packages.config b/App/EmailProfiler.Service/packages.config similarity index 100% rename from App/SERV_EMAIL/packages.config rename to App/EmailProfiler.Service/packages.config diff --git a/App/EMAIL_PROFILER.sln b/App/EmailProfiler.sln similarity index 78% rename from App/EMAIL_PROFILER.sln rename to App/EmailProfiler.sln index 70a4ff5..cd2adff 100644 --- a/App/EMAIL_PROFILER.sln +++ b/App/EmailProfiler.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31005.135 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33516.290 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SERV_EMAIL", "SERV_EMAIL\SERV_EMAIL.vbproj", "{1F3C569B-91DA-427F-8D81-BBCC556B11A4}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EmailProfiler.Service", "EmailProfiler.Service\EmailProfiler.Service.vbproj", "{1F3C569B-91DA-427F-8D81-BBCC556B11A4}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CONFIG_APP", "CONFIG_APP\CONFIG_APP.vbproj", "{CADEB4EE-C7EF-446D-8F18-69A89E65EBBD}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EmailProfiler.Form", "EmailProfiler.Form\EmailProfiler.Form.vbproj", "{CADEB4EE-C7EF-446D-8F18-69A89E65EBBD}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DigitalData.EMLProfiler", "DigitalData.EMLProfiler\DigitalData.EMLProfiler.vbproj", "{9F748DCD-952E-40A0-9DAD-65BF8A39B231}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EmailProfiler.Common", "EmailProfiler.Common\EmailProfiler.Common.vbproj", "{9F748DCD-952E-40A0-9DAD-65BF8A39B231}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "wisag_check_Att", "wisag_check_Att\wisag_check_Att.vbproj", "{CD67B0B9-A7DE-447D-9982-E7AC43481DDC}" EndProject diff --git a/App/SERV_EMAIL/App.config b/App/SERV_EMAIL/App.config deleted file mode 100644 index 9b23863..0000000 --- a/App/SERV_EMAIL/App.config +++ /dev/null @@ -1,54 +0,0 @@ - - - - -
- - - - - - - - - - 172.24.12.41 - - - 172.24.12.41:E:\DB\Firebird\Databases\EDMI_TEMPLATE\EDMI_MASTER.FDB - - - sysdba - - - dd - - - False - - - False - - - 2 - - - EmailProfiler - - - NONE - - - Server=SDB01\DIGITALDATA;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnVyz+pQgGwwFrC6HCYzpmU3D2IL51z3wZ5odRZQbqYbM=; - - - - - - - - - - - - diff --git a/App/SERV_EMAIL/MyService.vb b/App/SERV_EMAIL/MyService.vb deleted file mode 100644 index a42cb3b..0000000 --- a/App/SERV_EMAIL/MyService.vb +++ /dev/null @@ -1,112 +0,0 @@ -Imports System.ComponentModel -Imports System.IO -Imports DigitalData.EMLProfiler -Imports DigitalData.Modules.Database -Imports DigitalData.Modules.Logging -Public Class MyService -#Region "+++++ variables +++++" - Private _threadRunner As BackgroundWorker - Private LogConfig As LogConfig - Private Logger As Logger - 'Private _database As clsDatabase - Private _workmail As clsWorkEmail - - Private _ConfigManager As ClassConfig - Private _Config As ClassConfig.Config - - Private Database As MSSQLServer -#End Region - Public Sub New() - MyBase.New() - InitializeComponent() - End Sub - Protected Overrides Sub OnStart(ByVal args() As String) - ' Code zum Starten des Dienstes hier einfügen. Diese Methode sollte Vorgänge - ' ausführen, damit der Dienst gestartet werden kann. - Try - Dim oLogPath = Path.Combine(My.Application.Info.DirectoryPath, "Log") - LogConfig = New LogConfig(LogConfig.PathType.CustomPath, oLogPath, Nothing, "Digital Data", "DD EmailProfiler", 30) - Logger = LogConfig.GetLogger - - Logger.Info("## Service started ## ") - - If My.Settings.MyConnectionString = String.Empty Then - Logger.Warn("NO CONNECTIONSTRING CONFIGURED.") - Else - If My.Settings.DEBUG = True Then - Logger.Info("DEBUG ACTIVATED") - LogConfig.Debug = True - Else - LogConfig.Debug = False - End If - - Database = New MSSQLServer(LogConfig, My.Settings.MyConnectionString) - _ConfigManager = New ClassConfig(LogConfig, Database) - _Config = _ConfigManager.GetConfig() - - '_database = New clsDatabase(MyLogger, My.Settings.MyConnectionString) - Logger.Debug("_database and _email initialized") - _workmail = New clsWorkEmail(LogConfig, My.Settings.MyConnectionString, _Config.WindreamConnectionString, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, - My.Settings.USE_WM, My.Settings.EmailAccountID, My.Settings.EmailProfilerPraefix) - Logger.Debug("_workmail initialized") - - If Database.DBInitialized = False Then - Logger.Warn("ATTENTION: No Connection was established '" & My.Settings.MyConnectionString & "'!") - Else - '### Thread für das nachträgliche Setzen von Rechten generieren - _threadRunner = New BackgroundWorker With { - .WorkerReportsProgress = True, - .WorkerSupportsCancellation = True - } - AddHandler _threadRunner.DoWork, AddressOf RUN_THREAD - AddHandler _threadRunner.RunWorkerCompleted, AddressOf Thread1_Completed - '### Den Timer generieren - Dim Timer_Durchlauf As New System.Timers.Timer() - 'Das Event hinterlegen welches bei "Tick" ausgelöst wird - AddHandler Timer_Durchlauf.Elapsed, AddressOf Thread_Run - ' Set the Interval - Timer_Durchlauf.Interval = (_Config.TimerInterval * 60000) - Timer_Durchlauf.Enabled = True - Logger.Debug("...Timer started.") - ' Und den Durchlauf das erste Mal starten - _threadRunner.RunWorkerAsync() - End If - End If - Catch ex As Exception - Logger.Error(ex) - End Try - End Sub - Public Sub Thread_Run() - If Not _threadRunner.IsBusy Then - _threadRunner.RunWorkerAsync() - End If - End Sub - Public Sub RUN_THREAD(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs) - Try - Dim notcompleted As Boolean = False - Dim _work As New clsWorker(My.Settings.EML_LIMITATION_SENDER, LogConfig, My.Settings.MyConnectionString, _Config.WindreamConnectionString, 0, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, My.Settings.USE_WM, My.Settings.EmailAccountID, My.Settings.EmailProfilerPraefix) - _work.Start_WorkingProfiles() - Catch ex As Exception - Logger.Error(ex) - End Try - End Sub - Protected Overrides Sub OnStop() - ' Hier Code zum Ausführen erforderlicher Löschvorgänge zum Beenden des Dienstes einfügen. - Logger.Info("## Service was stopped manually. ##") - End Sub - Private Sub Thread1_Completed(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) 'Handles threadDateiimport.RunWorkerCompleted - 'This event fires when the DoWork event completes - Try - Dim result As String = "" - If e.Cancelled Then - EventLog.WriteEntry("DD EmailProfiler", "The thread was cancelled!", EventLogEntryType.Error) - Logger.Warn("## The thread was cancelled.") - ElseIf e.Error IsNot Nothing Then - EventLog.WriteEntry("DD EmailProfiler", "Unexpected error in thread!", EventLogEntryType.Error) - Logger.Warn("Unexpected error in thread: " & e.Error.Message) - End If - Catch ex As Exception - Logger.Error(ex) - End Try - End Sub -End Class