AppStd/EmailProfiler
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Big update: MessageID replaced with Hash of MessageID

Browse Source
This commit is contained in:
Jonathan Jenne
2023-07-03 16:35:24 +02:00
parent 2b21650c53
commit aa5a268e14
14 changed files with 523 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
App/CONFIG_APP/CONFIG_APP.vbproj
View File

@@ -59,6 +59,10 @@
<Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DigitalData.Modules.Database, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\wisag_check_Att\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Logging">
<HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference>

67
App/CONFIG_APP/frmMain.vb
View File

@@ -2,13 +2,15 @@
Imports System.IO
Imports System.Text.RegularExpressions
Imports DigitalData.EMLProfiler
Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Messaging
Public Class frmMain
Private Logger As DigitalData.Modules.Logging.Logger
Private Shared MyLogger As LogConfig
Private _database As clsDatabase
Private Shared LogConfig As LogConfig
'Private _database As clsDatabase
Private _database As MSSQLServer
Private _Encryption As clsEncryption
Private _windream As clsWindream_allgemein
' Private _email As clsEmail
@@ -18,7 +20,8 @@ Public Class frmMain
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()
@@ -31,22 +34,22 @@ Public Class frmMain
Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load
Try
MyLogger = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, My.Application.Info.CompanyName, My.Application.Info.ProductName)
_limilab = New Limilab(MyLogger)
Logger = MyLogger.GetLogger()
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)
Logger = LogConfig.GetLogger()
If My.Settings.DEBUG = True Then
Logger.Info("!! DEBUG is ACTIVE !!")
End If
MyLogger.Debug = My.Settings.DEBUG
LogConfig.Debug = My.Settings.DEBUG
InitDatabase()
ToolStripProgressBar1.Visible = False
Logger.Debug($"AppConfig is located at: [{AppDomain.CurrentDomain.SetupInformation.ConfigurationFile}]")
If My.Settings.USE_WM Then
_windream = New clsWindream_allgemein(MyLogger)
_windream = New clsWindream_allgemein(LogConfig)
End If
'_email = New clsEmail(MyLogger)
_emailIMAP = New clsEmailIMAP(MyLogger, _SQLServerConString)
_emailIMAP = New clsEmailIMAP(LogConfig)
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in FormLoad")
End Try
@@ -62,7 +65,7 @@ Public Class frmMain
ObjektTypenEintragen()
End If
_Encryption = New clsEncryption("!35452didalog=", MyLogger)
_Encryption = New clsEncryption("!35452didalog=", LogConfig)
End Sub
Private Function Set_ConnectionStrings()
Try
@@ -168,8 +171,15 @@ Public Class frmMain
Logger.Debug($"SQL-Server ConnString is [{_SQLServerConString}]")
_database = New clsDatabase(MyLogger, My.Settings.MyConnectionString)
dbResult = _database.Init(My.Settings.MyConnectionString)
_ConfigManager = New ClassConfig(LogConfig, _database)
_Config = _ConfigManager.GetConfig()
If _Config 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)
@@ -178,7 +188,7 @@ Public Class frmMain
tslblstatus.BackColor = Color.Red
End If
If dbResult = False Then
MsgBox("Error in init database. (Connection failed) More information in the logfile.", MsgBoxStyle.Critical)
MsgBox("Error in init database. (Connection failed) More information in the logfile.", MsgBoxStyle.Critical, Text)
Return False
Else
Return True
@@ -259,8 +269,13 @@ Public Class frmMain
'Set the construction string
MyConnectionString = con
My.Settings.MyConnectionString = MyConnectionString
_database = New MSSQLServer(LogConfig, MyConnectionString)
_ConfigManager = New ClassConfig(LogConfig, _database)
'csb.ConnectionString
_database.Init(MyConnectionString)
'_database.Init(MyConnectionString)
My.Settings.Save()
If chkbxUserAut.Checked = False Then
@@ -285,15 +300,15 @@ Public Class frmMain
Private Sub BackgroundWorker1_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork
If _RunwithLocalemail = False Then
MyLogger.Debug = True
Dim _work As New clsWorker(My.Settings.EML_LIMITATION_SENDER, MyLogger, _SQLServerConString, GUIDTextBox.Text, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW,
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")
_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, MyLogger, _SQLServerConString, 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(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)
_work.Start_WorkingProfiles(True)
Next
@@ -311,7 +326,7 @@ Public Class frmMain
fi.Delete()
Next
Catch ex As Exception
If MyLogger.Debug = True Then
If LogConfig.Debug = True Then
Logger.Warn($"Could not delete the tempfile: {ex.Message}")
End If
End Try
@@ -391,7 +406,7 @@ Public Class frmMain
End Sub
Private Sub btnShowLogpath_Click(sender As Object, e As EventArgs) Handles btnShowLogpath.Click
Process.Start(MyLogger.LogDirectory)
Process.Start(LogConfig.LogDirectory)
End Sub
Private Sub TBEMLP_POLL_PROFILESBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs)
@@ -590,7 +605,7 @@ Public Class frmMain
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.Return_Datatable(osql)
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
@@ -635,10 +650,10 @@ Public Class frmMain
Private Sub LOG_ERRORS_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LOG_ERRORS_ONLYCheckBox.CheckedChanged
If _LoadInProgress = True Then Exit Sub
MyLogger.Debug = LOG_ERRORS_ONLYCheckBox.Checked
LogConfig.Debug = LOG_ERRORS_ONLYCheckBox.Checked
My.Settings.Save()
Dim upd = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',LOG_ERRORS_ONLY = '{LOG_ERRORS_ONLYCheckBox.Checked}' WHERE GUID = 1"
_database.Execute_non_Query(upd)
_database.ExecuteNonQuery(upd)
Load_Config()
End Sub
@@ -672,7 +687,7 @@ Public Class frmMain
Private Sub CHECK_INTERVALL_MINUTESNumericUpDown_ValueChanged(sender As Object, e As EventArgs) Handles CHECK_INTERVALL_MINUTESNumericUpDown.ValueChanged
If _LoadInProgress = True Then Exit Sub
Dim upd = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',CHECK_INTERVALL_MINUTES = {CHECK_INTERVALL_MINUTESNumericUpDown.Value} WHERE GUID = 1"
_database.Execute_non_Query(upd)
_database.ExecuteNonQuery(upd)
Load_Config()
End Sub
'Private Function GetChildren(ByVal bodyParts As BodyPartCollection) As BodyPartCollection
@@ -739,7 +754,7 @@ Public Class frmMain
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btntestImap.Click
My.Settings.Save()
Dim oSQL = $"SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE GUID = {EMAILIDTextBox.Text}"
Dim oDT As DataTable = _database.Return_Datatable(oSQL)
Dim oDT As DataTable = _database.GetDatatable(oSQL)
If Not IsNothing(oDT) Then
If oDT.Rows.Count = 1 Then
@@ -813,7 +828,7 @@ Public Class frmMain
Private Sub btnsaveRegex_Click_1(sender As Object, e As EventArgs) Handles btnsaveRegex.Click
tslblRefresh.BackColor = Color.Transparent
Dim upd = $"UPDATE TBDD_FUNCTION_REGEX SET REGEX = '{txtRegex1.Text}' WHERE UPPER(FUNCTION_NAME) = UPPER('EMAIL_PROFILER - RemoveHTMLText')"
If _database.Execute_non_Query(upd) = True Then
If _database.ExecuteNonQuery(upd) = True Then
tslblRefresh.Text = "Regex1 saved - " & Now.ToString
tslblRefresh.BackColor = Color.Yellow
Else
@@ -879,7 +894,7 @@ Public Class frmMain
Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
tslblRefresh.BackColor = Color.Transparent
Dim upd = $"UPDATE TBDD_FUNCTION_REGEX SET REGEX = '{txtRegex2.Text}' WHERE UPPER(FUNCTION_NAME) = UPPER('EMAIL_PROFILER - RemoveHTMLText1')"
If _database.Execute_non_Query(upd) = True Then
If _database.ExecuteNonQuery(upd) = True Then
tslblRefresh.Text = "Regex2 saved - " & Now.ToString
tslblRefresh.BackColor = Color.Yellow
Else