Merge branch 'master' of https://vcs.digitaldata.works/AppStd/EmailProfiler

Refactored GridView5 column formatting to only show relevant columns and improve maintainability. Added .Locked metadata to many controls in frmMain.resx to enforce read-only state in the designer. Restored SVG images for XtraTabPages and updated TrayLocation metadata for components.

App/EmailProfiler.Common/ClassCurrent.vb

@@ -46,7 +46,7 @@ Public Class ClassCurrent
     Public Shared Property TEMP_FILES As List(Of String) = New List(Of String)
 
     Public Shared Property TEMP_WORK_FILES As List(Of String) = New List(Of String)
-    Public Shared Property GDPictureLicense As String = "None"
+    Public Shared Property GDPictureLicense As String = ""
 
     Public Shared Property EmailAttachments As List(Of EmailAttachment) = New List(Of EmailAttachment)
 End Class

App/EmailProfiler.Common/Data/Config.vb

@@ -5,9 +5,13 @@ Public Class Config
     Public Property ConnectionString As String = ""
 
     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 UseWindream As Boolean = False
 
     ''' <summary>
@@ -23,6 +27,7 @@ Public Class Config
     Public Property InfoTemplateId As Integer = 0
 
     Public Property EmailTestReceiver As String = ""
+
     Public Property EmailTestHTML As String = ""
 
     ''' <summary>
@@ -31,4 +36,9 @@ Public Class Config
     ''' gelesen werden soll.
     ''' </summary>
     Public Property GDPictureVersion As String = ""
+    ''' <summary>
+    ''' Enthält die Lizenznummer des GDPicture Modules.
+    ''' Nur wenn nicht über die Datenbank zu holen!!.
+    ''' </summary>
+    Public Property GDPictureLicenseAsString As String = ""
 End Class

App/EmailProfiler.Common/Data/ConfigData.vb

@@ -1,39 +0,0 @@
-Imports DigitalData.Modules.Config.ConfigAttributes
-
-Public Class ConfigData
-    <ConnectionString>
-    Public Property ConnectionString As String = ""
-
-    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 UseWindream As Boolean = False
-
-    ''' <summary>
-    ''' GUID des EMail Templates das bei Ablehnungsmails verwendet wird.
-    ''' Siehe Tabelle DD_ECM.dbo.TBDD_EMAIL_TEMPLATE
-    ''' </summary>
-    Public Property RejectionTemplateId As Integer = 0
-
-    ''' <summary>
-    ''' GUID des EMail Templates das bei Info-Mails verwendet wird.
-    ''' Siehe Tabelle DD_ECM.dbo.TBDD_EMAIL_TEMPLATE
-    ''' </summary>
-    Public Property InfoTemplateId As Integer = 0
-
-    Public Property EmailTestReceiver As String = ""
-
-    Public Property EmailTestHTML As String = ""
-
-    ''' <summary>
-    ''' Enthält die Version des GDPicture Modules,
-    ''' für das der Lizenzschlüssel aus TBDD_3RD_PARTY_MODULES
-    ''' gelesen werden soll.
-    ''' </summary>
-    Public Property GDPictureVersion As String = ""
-End Class

App/EmailProfiler.Common/EmailProfiler.Common.vbproj

@@ -49,29 +49,99 @@
     <Reference Include="AE.Net.Mail, Version=1.7.10.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\AE.Net.Mail.1.7.10.0\lib\net45\AE.Net.Mail.dll</HintPath>
     </Reference>
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Base">
-      <HintPath>..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Language">
-      <HintPath>..\..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Messaging">
-      <HintPath>..\..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Patterns">
-      <HintPath>..\..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
     </Reference>
-    <Reference Include="GdPicture.NET.14, Version=14.2.90.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll</HintPath>
+      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Common, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Document, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Email, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Markdown, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Markdown.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Interop.WINDREAMLib">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
@@ -88,22 +158,95 @@
     <Reference Include="Mail">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NativeSDK.Exceptions, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\NativeSDK.Exceptions.dll</HintPath>
+    </Reference>
+    <Reference Include="NativeSDK.Settings, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\NativeSDK.Settings.dll</HintPath>
+    </Reference>
+    <Reference Include="NativeSDK.Settings.Edition, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\NativeSDK.Settings.Edition.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
+      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
+    </Reference>
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=8.0.0.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net.Http" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />
@@ -120,7 +263,7 @@
     <Compile Include="ClassDBConfig.vb" />
     <Compile Include="ClassCurrent.vb" />
     <Compile Include="clsEmail.IMAP.vb" />
-    <Compile Include="Data\ConfigData.vb" />
+    <Compile Include="Data\Config.vb" />
     <Compile Include="Data\EmailAttachment.vb" />
     <Compile Include="Enum\EmailStrings.vb" />
     <Compile Include="clsEncryption.vb" />
@@ -169,11 +312,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.21\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.21\build\net462\GdPicture.runtimes.windows.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets'))" />
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.21\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.21\build\net462\GdPicture.runtimes.windows.targets'))" />
   </Target>
 </Project>

App/EmailProfiler.Common/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.0.10.0")>
+<Assembly: AssemblyVersion("3.5.0.0")>
-<Assembly: AssemblyFileVersion("3.0.10.0")>
+<Assembly: AssemblyFileVersion("3.5.0.0")>

App/EmailProfiler.Common/app.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
     </configSections>
@@ -7,17 +7,17 @@
             <!-- Dieser Abschnitt definiert die Protokollierungskonfiguration für My.Application.Log -->
             <source name="DefaultSource" switchName="DefaultSwitch">
                 <listeners>
-                    <add name="FileLog"/>
+                    <add name="FileLog" />
                     <!-- Auskommentierung des nachfolgenden Abschnitts aufheben, um in das Anwendungsereignisprotokoll zu schreiben -->
                     <!--<add name="EventLog"/>-->
                 </listeners>
             </source>
         </sources>
         <switches>
-            <add name="DefaultSwitch" value="Information"/>
+            <add name="DefaultSwitch" value="Information" />
         </switches>
         <sharedListeners>
-            <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter"/>
+            <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter" />
             <!-- Auskommentierung des nachfolgenden Abschnitts aufheben und APPLICATION_NAME durch den Namen der Anwendung ersetzen, um in das Anwendungsereignisprotokoll zu schreiben -->
             <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
         </sharedListeners>
@@ -25,9 +25,45 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>

App/EmailProfiler.Common/clsWorkEmail.vb

@@ -55,7 +55,7 @@ Public Class clsWorkEmail
 
     Private _worked_email As Boolean = False
 
-    Sub New(LogConf As LogConfig, ConStr As String, WmConStr As String, pConfigData As ConfigData)
+    Sub New(LogConf As LogConfig, ConStr As String, WmConStr As String, pConfigData As Config)
         Try
             _Logger = LogConf.GetLogger
             _LogConfig = LogConf
@@ -77,12 +77,20 @@ Public Class clsWorkEmail
                 _windream_index = New clsWindream_Index(LogConf)
                 _windreamConnectionString = WmConStr
             End If
+            If pConfigData.GDPictureLicenseAsString = String.Empty Then
+                _Logger.Debug("clsWorkEmail - GDPicture local is empty ..switching to db-getting ...")
+                GDPictureLicense = ConfigDbFunct.GetProductLicense("GDPICTURE", pConfigData.GDPictureVersion, _LogConfig, ConStr)
+            Else
+                _Logger.Debug("")
+                _Logger.Debug(String.Format("clsWorkEmail - GDPicture License from local config [{0}]", pConfigData.GDPictureLicenseAsString))
+                _Logger.Debug("")
+                GDPictureLicense = pConfigData.GDPictureLicenseAsString
+            End If
 
-            GDPictureLicense = ConfigDbFunct.GetProductLicense("GDPICTURE", pConfigData.GDPictureVersion, _LogConfig, ConStr)
             If String.IsNullOrEmpty(GDPictureLicense) = False Then
                 _LicenseManager.RegisterKEY(GDPictureLicense)
             Else
-                _Logger.Error("clsWorkEmail() No value for GDPictureLicense found!")
+                _Logger.Error("clsWorkEmail() - No value for GDPictureLicense found")
             End If
 
             _EmailAccountID = pConfigData.EmailAccountId
@@ -101,7 +109,7 @@ Public Class clsWorkEmail
             'TODO: Move all of these CURRENT_MAIL vars into a business object of type mail container
             _CurrentMail = New MailContainer(pMailMessage, poUID)
 
-            _Logger.Debug($"Working on email from: {CURRENT_MAIL_FROM}...Subject: {pMailMessage.Subject}")
+            _Logger.Debug($"Working on email from: {_CurrentMail.SenderAddress}...Subject: {pMailMessage.Subject}")
             CURRENT_MAIL_BODY_ALL = ""
             CURRENT_MAIL_BODY_ANSWER1 = ""
             CURRENT_MAIL_BODY_Substr2 = ""
@@ -134,19 +142,19 @@ Public Class clsWorkEmail
             '
             'End If
 
-            If IsNothing(CURRENT_MAIL_SUBJECT) Then
+            If IsNothing(_CurrentMail.SubjectOriginal) Then
-                CURRENT_MAIL_SUBJECT = ""
+                CURRENT_MAIL_SUBJECT = String.Empty
+                _Logger.Warn("Subject was nothing!")
             Else
-                _Logger.Debug("Subject: [{0}]", CURRENT_MAIL_SUBJECT)
+                CURRENT_MAIL_SUBJECT = _CurrentMail.SubjectOriginal.ToUpper.EscapeForSQL()
+                _Logger.Debug("Fixed Subject: [{0}]", CURRENT_MAIL_SUBJECT)
             End If
 
-            _Logger.Info($"Working on email from : {CURRENT_MAIL_FROM}...")
-
             Dim oSql = $"Select COALESCE(MAX(GUID),0) FROM TBEMLP_HISTORY WHERE EMAIL_MSGID = '{_CurrentMail.MessageId}'"
             Dim oHistoryID = _DB_MSSQL.GetScalarValue(oSql)
 
             If oHistoryID > 0 And IS_LOCAL_TEST = False Then
-                _Logger.Info($"Message with subject [{CURRENT_MAIL_SUBJECT}] from [{CURRENT_MAIL_FROM}] has already been worked!")
+                _Logger.Info($"Message with subject [{_CurrentMail.SubjectOriginal}] from [{_CurrentMail.SenderAddress}] has already been worked!")
                 Return True
             End If
 
@@ -208,6 +216,7 @@ Public Class clsWorkEmail
 
                 _Logger.Debug("CommonEmail-Process-Sniffer")
 
+                ' Allgemeine Verarbeitung der EMail
                 Dim oCommonEmailResult = CommonEmail_IN(_CurrentMail)
 
                 If oCommonEmailResult = False Then
@@ -545,7 +554,6 @@ Public Class clsWorkEmail
             Dim TEMP_PROCESS_PROFILE_DT As DataTable = DT_POLL_PROCESS
             Dim PM_ROW As DataRow() = TEMP_PROCESS_PROFILE_DT.Select(oExpression)
             For Each row As DataRow In PM_ROW
-
                 Try
                     WM_REFERENCE_INDEX = row("WM_REFERENCE_INDEX")
                 Catch ex As Exception
@@ -562,8 +570,6 @@ Public Class clsWorkEmail
                 If Copy2HDD(pCurrentMail, row("COPY_2_HDD"), row("PATH_ORIGINAL"), row("PATH_EMAIL_ERRORS"), False) = True Then
                     ExtractBody(pCurrentMail)
                 End If
-
-
             Next
 
             If CURRENT_MAIL_SUBJECT.Contains("[PROCESSMANAGER][EA]") Then
@@ -944,7 +950,9 @@ Public Class clsWorkEmail
         Dim oAttachmentCount As Integer = 0     ' Anzahl gültige Anhänge
         Dim AttachmentPosition As Integer = 0   ' Position des Anhangs in der EMail
 
-        For Each oAttachment As MimeData In pCurrentMail.Mail.Attachments
+        Dim oAttachmentList As List(Of MimeData) = GetPurgedAttachmentList(pCurrentMail.Mail.Attachments, pAllowXMLReceipts)
+
+        For Each oAttachment As MimeData In oAttachmentList
             _Logger.Info("Working on Attachment [{0}]", oAttachment.SafeFileName)
 
             AttachmentPosition += 1
@@ -995,14 +1003,25 @@ Public Class clsWorkEmail
                     ' Verarbeite Embedded Attachments
                     WorkEmbeddedAttachments(oEmailAttachment, oGdPicturePDF)
 
+                    ' Prüfen ob es ungültige Anhänge gibt.
+                    Dim oEmbeddedAttachmentsNotValid As Boolean = EmailAttachments.
+                                                    Where(Function(att) att.EmbeddedFiles.Count > 0).
+                                                    Any(Function(emb) emb.EmbeddedFiles.Any(Function(ext) ext.IsAttachmentValid = False))
+
+                    If oEmbeddedAttachmentsNotValid = True Then
+
+                        MESSAGE_ERROR = True
+                        Continue For
+                    End If
+
                 Else
                     oAttachmentCount -= 1
                     CleanUpFilePath(oEmailAttachment.DestFilePath)
+                    UpdateAttachmentTableAfterError(oEmailAttachment.OrgFileName, pCurrentMail.MessageId, "PDF Structure corrupt")
                     oEmailAttachment.FileStatus = oStatus
                     oEmailAttachment.ErrorCodeValue = ErrorCode.NormalFileAttachmentCorrupt
                     oEmailAttachment.ErrorCodeComment = "PDF Structure corrupt"
                     oEmailAttachment.IsAttachmentValid = False
-
                     MESSAGE_ERROR = True
                     Continue For
                 End If
@@ -1027,6 +1046,47 @@ Public Class clsWorkEmail
 
     End Function
 
+
+    ''' <summary>
+    ''' Holt aus alle Anhängen diejenigen raus,
+    ''' die einen erlaubten Dateianhang haben
+    ''' </summary>
+    ''' <param name="pAttachmentList"></param>
+    ''' <param name="pAllowXMLReceipts"></param>
+    ''' <returns>Liste der Dateien, die wir verarbeiten wollen, nothing im Fehlerfall</returns>
+    Private Function GetPurgedAttachmentList(pAttachmentList As IMimeDataReadOnlyCollection, pAllowXMLReceipts As Boolean) As List(Of MimeData)
+
+        _Logger.Debug("GetPurgedAttachmentList()")
+        Try
+
+            Dim retValue As List(Of MimeData) = New List(Of MimeData)
+            Dim oIsValidExtension As Boolean = False
+
+            For Each oAttachment As MimeData In pAttachmentList
+                Dim lowerFilename = oAttachment.SafeFileName.ToLower
+
+                If pAllowXMLReceipts = True Then
+                    oIsValidExtension = _ValidFirstExtensions.Any(Function(ext) lowerFilename.EndsWith(ext))
+                Else
+                    oIsValidExtension = _ValidExtensions.Any(Function(ext) lowerFilename.EndsWith(ext))
+                End If
+
+                If oIsValidExtension = True Then
+                    retValue.Add(oAttachment)
+                End If
+            Next
+
+            _Logger.Debug("GetPurgedAttachmentList() retValue contains [{0}] attachments.", retValue.Count)
+
+            Return retValue
+
+        Catch ex As Exception
+            _Logger.Error(ex)
+        End Try
+
+        Return Nothing
+    End Function
+
     Private Sub WorkEmbeddedAttachments(pEmailAttachment As EmailAttachment, pGDPicturePDF As GdPicturePDF)
 
         Dim embeddedFileCount As Integer = pGDPicturePDF.GetEmbeddedFileCount()
@@ -1101,6 +1161,38 @@ Public Class clsWorkEmail
         End Try
     End Function
 
+    ''' <summary>
+    ''' Aktualisiert Datensätze in der Tabelle TBEMLP_HISTORY_ATTACHMENT
+    ''' wenn ein Fehler bei einem Attachment aufgetreten ist.
+    ''' </summary>
+    Private Sub UpdateAttachmentTableAfterError(pOrgFileName As String, pMessageID As String, pComment As String)
+
+        If String.IsNullOrEmpty(pOrgFileName) Then
+            _Logger.Info("Parameter [pOrgFileName] missing")
+            Return
+        End If
+
+        If String.IsNullOrEmpty(pMessageID) Then
+            _Logger.Info("Parameter [pMessageID] missing")
+            Return
+        End If
+
+        If pComment Is Nothing Then
+            pComment = "-"
+            Return
+        End If
+
+        Dim updateSQL As String = "UPDATE [DD_ECM].[dbo].[TBEMLP_HISTORY_ATTACHMENT] SET COMMENT = '@PARAM_COMMENT', EMAIL_ATTMT_INDEX = '-' WHERE EMAIL_MSGID = '@PARAM_MSGID' AND EMAIL_ATTMT = '@PARAM_ORGFILE';"
+
+        updateSQL = updateSQL.Replace("@PARAM_COMMENT", pComment)
+        updateSQL = updateSQL.Replace("@PARAM_MSGID", pMessageID)
+        updateSQL = updateSQL.Replace("@PARAM_ORGFILE", pOrgFileName)
+
+        _Logger.Info("Execute UPDATE-SQL: [{0}]", updateSQL)
+        _DB_MSSQL.ExecuteNonQuery(updateSQL)
+
+    End Sub
+
     ''' <summary>
     ''' Falls Datei bereits existiert, lösche sie jetzt
     ''' </summary>

App/EmailProfiler.Common/clsWorker.vb

@@ -24,7 +24,7 @@ Public Class clsWorker
 
     Private ReadOnly LocalEmlFile As String = ""
 
-    Sub New(pLogConfig As LogConfig, pConnectionString As String, pWindreamConnectionString As String, pPollProfileId As Integer, pConfigData As ConfigData, Optional pLocalEML As String = "")
+    Sub New(pLogConfig As LogConfig, pConnectionString As String, pWindreamConnectionString As String, pPollProfileId As Integer, pConfigData As Config, Optional pLocalEML As String = "")
         _Logger = pLogConfig.GetLogger
         'ClassEmailImap = New clsEmailIMAP(pLogConfig)
         _Fetcher = New MailFetcher(pLogConfig)

App/EmailProfiler.Common/packages.config

@@ -1,7 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AE.Net.Mail" version="1.7.10.0" targetFramework="net461" />
-  <package id="GdPicture" version="14.2.90" targetFramework="net462" />
+  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.2.90" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
+  <package id="GdPicture" version="14.3.21" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.21" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
+  <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
+  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
+  <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
+  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
+  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
+  <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
+  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
+  <package id="System.Management" version="8.0.0" targetFramework="net462" />
+  <package id="System.Memory" version="4.6.0" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
+  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="8.0.6" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>

App/EmailProfiler.Form/App.config

@@ -26,12 +26,6 @@
   </runtime>
   <userSettings>
     <EmailProfiler.Form.My.MySettings>
-      <setting name="MyConnectionString" serializeAs="String">
-        <value>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</value>
-      </setting>
-      <setting name="MyServer" serializeAs="String">
-        <value />
-      </setting>
       <setting name="EmailTest_Receipiant" serializeAs="String">
         <value />
       </setting>
@@ -45,6 +39,9 @@
   </userSettings>
   <applicationSettings>
     <EmailProfiler.Form.My.MySettings>
+      <setting name="MyConnectionString" serializeAs="String">
+        <value>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</value>
+      </setting>
       <setting name="FB_DATABASE" serializeAs="String">
         <value />
       </setting>

App/EmailProfiler.Form/Config.vb

@@ -1,29 +0,0 @@
-Imports DigitalData.Modules.Config.ConfigAttributes
-
-Public Class Config
-    <ConnectionString>
-    Public Property ConnectionString As String = ""
-
-    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 UseWindream As Boolean = False
-
-    ''' <summary>
-    ''' GUID des EMail Templates das bei Ablehnungsmails verwendet wird.
-    ''' Siehe Tabelle DD_ECM.dbo.TBDD_EMAIL_TEMPLATE
-    ''' </summary>
-    Public Property RejectionTemplateId As Integer = 0
-    Public Property InfoTemplateId As Integer = 0
-
-    Public Property EmailTestReceiver As String = ""
-    Public Property EmailTestHTML As String = ""
-
-    ''' <summary>
-    ''' Enthält die Version des GDPicture Modules,
-    ''' für das der Lizenzschlüssel aus TBDD_3RD_PARTY_MODULES
-    ''' gelesen werden soll.
-    ''' </summary>
-    Public Property GDPictureVersion As String = ""
-End Class

App/EmailProfiler.Form/EmailProfiler.Form.vbproj

@@ -60,31 +60,35 @@
     <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.GUIs.Common, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.GUIs.Common">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
-      <HintPath>..\..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Base, Version=1.3.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Base">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
-      <HintPath>..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Config, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Config">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
-      <HintPath>..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Database, Version=2.3.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Database">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
-      <HintPath>..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.6.3.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Logging">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
-      <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Messaging, Version=1.9.3.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Messaging">
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
+    </Reference>
+    <Reference Include="EmailProfiler.Common, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
+      <HintPath>..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
@@ -93,6 +97,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IdentityModel" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
@@ -119,7 +124,6 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Config.vb" />
     <Compile Include="frmMain.vb">
       <SubType>Form</SubType>
     </Compile>
@@ -151,6 +155,7 @@
     <Compile Include="MyDataset.vb">
       <DependentUpon>MyDataset.xsd</DependentUpon>
     </Compile>
+    <Compile Include="Settings.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="frmMain.resx">
@@ -206,19 +211,10 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="envelope.ico" />
-    <Content Include="MailLicense.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <None Include="Resources\email_go.png" />
     <None Include="Resources\key_16xLG.png" />
     <None Include="Resources\Encrypt.png" />
     <None Include="Resources\folder_Closed_16xLG.png" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\EmailProfiler.Common\EmailProfiler.Common.vbproj">
-      <Project>{9f748dcd-952e-40a0-9dad-65bf8a39b231}</Project>
-      <Name>EmailProfiler.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

App/EmailProfiler.Form/MailLicense.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<License>
-  <Id>4dc5ef40-f1a9-468b-994c-b7ed600ad878</Id>
-  <ProductName>Mail.dll</ProductName>
-  <SubscriptionUntil>2022-07-29</SubscriptionUntil>
-  <RegisteredTo>Digital Data GmbH</RegisteredTo>
-  <LicenseType>single developer</LicenseType>
-  <BuyerName>Digital Data GmbH</BuyerName>
-  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-    <SignedInfo>
-      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
-      <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-      <Reference URI="">
-        <Transforms>
-          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
-        </Transforms>
-        <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <DigestValue>75MRtl4ipYelIZYlpT8O7QDX9Zc=</DigestValue>
-      </Reference>
-    </SignedInfo>
-    <SignatureValue>Raxfkz6DfQVs/sMvH+F2nH0eHXD8FoUFSdP3t7AgBUdpABJQx86srlyuMSEhXPlc1THCqPouEVob4RsWnd9OXvTiPPSOUSK9zuNG6uz93KLAhpSD5PraAgBCF4jwZArlAp7aCNfZpHqQ3w6TRHS+CfravUU0AHHG3MZ1ZcRkGuo=</SignatureValue>
-  </Signature>
-</License>

App/EmailProfiler.Form/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("EmailProfiler Config")>
 <Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("3.0.2.0")>
+<Assembly: AssemblyTrademark("3.1.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.0.2.0")>
+<Assembly: AssemblyVersion("3.1.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

App/EmailProfiler.Form/My Project/Settings.Designer.vb

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
+'     Dieser Code wurde von einem Tool generiert.
-'     Runtime Version:4.0.30319.42000
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     the code is regenerated.
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -15,14 +15,14 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
         
         Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
         
-#Region "My.Settings Auto-Save Functionality"
+#Region "Automatische My.Settings-Speicherfunktion"
 #If _MyType = "WindowsForms" Then
     Private Shared addedHandler As Boolean
 
@@ -54,29 +54,14 @@ Namespace My
             End Get
         End Property
         
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security "& _ 
             "Info=True;User ID=sa;Password=dd")>  _
-        Public Property MyConnectionString() As String
+        Public ReadOnly Property MyConnectionString() As String
             Get
                 Return CType(Me("MyConnectionString"),String)
             End Get
-            Set
-                Me("MyConnectionString") = value
-            End Set
-        End Property
-        
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
-        Public Property MyServer() As String
-            Get
-                Return CType(Me("MyServer"),String)
-            End Get
-            Set
-                Me("MyServer") = value
-            End Set
         End Property
         
         <Global.System.Configuration.UserScopedSettingAttribute(),  _

App/EmailProfiler.Form/My Project/Settings.settings

@@ -2,12 +2,9 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
   <Profiles />
   <Settings>
-    <Setting Name="MyConnectionString" Type="System.String" Scope="User">
+    <Setting Name="MyConnectionString" Type="System.String" Scope="Application">
       <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</Value>
     </Setting>
-    <Setting Name="MyServer" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
     <Setting Name="EmailTest_Receipiant" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>

App/EmailProfiler.Form/My Project/licenses.licx

@@ -1,3 +1,4 @@
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+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
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

App/EmailProfiler.Form/Settings.vb

@@ -0,0 +1,11 @@
+
+Namespace My
+    
+    'Diese Klasse ermöglicht die Behandlung bestimmter Ereignisse der Einstellungsklasse:
+    ' Das SettingChanging-Ereignis wird ausgelöst, bevor der Wert einer Einstellung geändert wird.
+    ' Das PropertyChanged-Ereignis wird ausgelöst, nachdem der Wert einer Einstellung geändert wurde.
+    ' Das SettingsLoaded-Ereignis wird ausgelöst, nachdem die Einstellungswerte geladen wurden.
+    ' Das SettingsSaving-Ereignis wird ausgelöst, bevor die Einstellungswerte gespeichert werden.
+    Partial Friend NotInheritable Class MySettings
+    End Class
+End Namespace

App/EmailProfiler.Form/frmMain.vb

@@ -1,18 +1,21 @@
 Imports System.ComponentModel
 Imports System.IO
+Imports System.Net.Mail
 Imports System.Text.RegularExpressions
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement.Tab
+Imports DevExpress.XtraPrinting.Export
+Imports DigitalData.GUIs.Common
+Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Messaging
-Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Messaging.Mail
-Imports DigitalData.GUIs.Common
 Imports EmailProfiler.Common
 
 Public Class frmMain
     Private Logger As Logger
     Private LogConfig As LogConfig
-    Private ConfigManager As ConfigManager(Of ConfigData)
+    Private ConfigManager As ConfigManager(Of Config)
     Private _database As MSSQLServer
     Private _Encryption As clsEncryption
     Private _windream As clsWindream_allgemein
@@ -24,30 +27,55 @@ Public Class frmMain
     Private _DBConfig As ClassDBConfig.Config
     Private MyConnectionString As String
 
+    Private _MailSender As Mail.MailSender
+
     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 ConfigData)(LogConfig, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath)
-
             Logger = LogConfig.GetLogger()
+
+            _limilab = New Limilab(LogConfig)
+            Dim oUserAppDataPath As String = Application.UserAppDataPath
+            Dim oCommonAppDataPath = Application.CommonAppDataPath
+            Dim oStartupPath = Application.StartupPath
+
+            Dim oAppconfig As String = "AppConfig.xml"
+            Dim oAppConfigFilePath As String = Path.Combine(oStartupPath, oAppconfig)
+            If File.Exists(oAppConfigFilePath) Then
+                Logger.Info("Die Datei AppConfig.xml ist im StartUp-Path vorhanden.")
+                ' UserAppDataPath = StartupPath
+                oCommonAppDataPath = oStartupPath
+            Else
+                Logger.Info("Keine AppConfig.xml-Konfiguration!")
+            End If
+
+
+            ConfigManager = New ConfigManager(Of Config)(LogConfig, oUserAppDataPath, oCommonAppDataPath, oStartupPath)
+            ConfigManager.Save()
+            LogConfig.Debug = ConfigManager.Config.Debug
             If ConfigManager.Config.Debug = True Then
                 Logger.Info("!! DEBUG is ACTIVE !!")
             End If
-            LogConfig.Debug = ConfigManager.Config.Debug
+
             InitDatabase()
             ToolStripProgressBar2.Visible = False
             Logger.Debug($"AppConfig is located at: [{AppDomain.CurrentDomain.SetupInformation.ConfigurationFile}]")
+            Try
+                If ConfigManager.Config.UseWindream Then
+                    _windream = New clsWindream_allgemein(LogConfig)
+                End If
+            Catch ex As Exception
+                Logger.Error(ex)
+                ConfigManager.Save()
+            End Try
 
-            If ConfigManager.Config.UseWindream Then
-                _windream = New clsWindream_allgemein(LogConfig)
-            End If
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in FormLoad")
         End Try
 
         If Set_ConnectionStrings() Then
             Load_AllData()
+            LoadMonitoringIntoGrid()
             Check_Steps()
             Active_Color(ACTIVECheckBox)
             Active_Color(ACTIVECheckBox1)
@@ -55,9 +83,15 @@ Public Class frmMain
             Active_Color(ACTIVECheckBox3)
             Active_Color(ACTIVECheckBox4)
         End If
-        If ConfigManager.Config.UseWindream Then
+        Try
-            ObjektTypenEintragen()
+            If ConfigManager.Config.UseWindream Then
-        End If
+                ObjektTypenEintragen()
+            End If
+        Catch ex As Exception
+            Logger.Error(ex)
+            ConfigManager.Save()
+        End Try
+
 
         _Encryption = New clsEncryption("!35452didalog=", LogConfig)
     End Sub
@@ -94,6 +128,7 @@ Public Class frmMain
             Me.TBEMLP_POLL_INDEXING_STEPSTableAdapter.Fill(Me.MyDataset.TBEMLP_POLL_INDEXING_STEPS)
         Catch ex As Exception
             MsgBox("Unexpected Error in Load_AllData: " & ex.Message, MsgBoxStyle.Critical)
+            ConfigManager.Save()
         End Try
     End Sub
     Sub Load_Profiles()
@@ -165,11 +200,11 @@ Public Class frmMain
         Select Case AUTH_TYPEComboBox.Text
             Case "OAUTH2"
                 EMAIL_SMTPLabel.Text = "Anwendungs-ID (Client):"
-                EMAIL_PWLabel.Text = "Anwendungs-Geheimnnis:"
+                EMAIL_PWLabel.Text = "Geheimnis ID Value"
                 ARCHIVE_FOLDERLabel.Text = "Verzeichnis-ID (Mandant):"
             Case Else
                 EMAIL_SMTPLabel.Text = "Server:"
-                EMAIL_PWLabel.Text = "Neues Passwort:"
+                EMAIL_PWLabel.Text = "Passwort:"
                 ARCHIVE_FOLDERLabel.Text = "Archive Ordner:"
         End Select
     End Sub
@@ -332,6 +367,7 @@ Public Class frmMain
 
         ConfigManager.Config.EmailTitlePrefix = "EmailProfilerTestClient"
         ConfigManager.Config.EmailAccountId = ToolStripEmailAccountID2.Text
+        ConfigManager.Config.GDPictureVersion = "11.2024"
 
         If _RunwithLocalemail = False Then
 
@@ -445,7 +481,6 @@ Public Class frmMain
     Private Sub ToolStripButton10_Click(sender As Object, e As EventArgs) Handles ToolStripButton10.Click
         Load_Processes()
     End Sub
-
     Private Sub ToolStripButton8_Click(sender As Object, e As EventArgs) Handles ToolStripButton8.Click
         Try
             TBEMLP_POLL_PROCESSBindingSource.EndEdit()
@@ -652,8 +687,8 @@ Public Class frmMain
         If _LoadInProgress = True Then Exit Sub
         LogConfig.Debug = LOG_ERRORS_ONLYCheckBox.Checked
         ConfigManager.Save()
-        Dim upd = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',LOG_ERRORS_ONLY = '{LOG_ERRORS_ONLYCheckBox.Checked}' WHERE GUID = 1"
+        Dim upr = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',LOG_ERRORS_ONLY = '{LOG_ERRORS_ONLYCheckBox.Checked}' WHERE GUID = 1"
-        _database.ExecuteNonQuery(upd)
+        _database.ExecuteNonQuery(upr)
         Load_Config()
 
     End Sub
@@ -728,16 +763,48 @@ Public Class frmMain
     Private Sub btnsendtestmail_Click(sender As Object, e As EventArgs) Handles btnsendtestmail.Click
         If txtTestmail.Text <> String.Empty Then
             ConfigManager.Save()
+            My.Settings.Save()
+            Cursor = Cursors.WaitCursor
             Dim PWPlain = _Encryption.DecryptData(EMAIL_PWTextBox.Text)
+            'NEW
+            _MailSender = New Mail.MailSender(LogConfig)
+            Dim oDefault As Boolean = True
+            If CheckBoxEnableTls1_1.Checked Or CheckBoxEnableTls1_2.Checked Then
+                oDefault = False
+            End If
+            Dim oOptions As New Mail.MailSession.MailSessionOptions() With {
+                        .EnableTls1_1 = CheckBoxEnableTls1_1.Checked,
+                        .EnableTls1_2 = CheckBoxEnableTls1_2.Checked,
+                        .EnableDefault = oDefault
+                    }
+            Dim oResult As Mail.MailSession.SessionInfo = _MailSender.Connect(EMAIL_SMTPTextBox.Text, PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, oOptions)
 
-            If _limilab.NewSMTPEmail(txtTestmail.Text, "Testmail", "This is the body (text will be replaced within profile)", EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text, PORTTextBox.Text,
+            If oResult.Connected = False Then
-                                 EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, "frmMain-Test", "", "", True) = True Then
+                Cursor = Cursors.Default
-
+                MsgBox("Could not create a MailSession / connect to server. Please check the log.", MsgBoxStyle.Exclamation)
-
+                Exit Sub
+            End If
+            Dim oAddresses As List(Of String) = txtTestmail.Text.Split(";").ToList()
+            Dim oAddedWhen = Now
+            Dim oAttachments As New List(Of String)
+            Dim oBody As String = $"This is just a template body (text will be replaced within the run) - ProfileID: {EMAILIDTextBox.Text}"
+            Dim oMessageSent = _MailSender.SendMail(oAddresses, EMAIL_FROMTextBox.Text, "Testmail from EmailProfilerConfig", oBody, oAddedWhen, oAttachments, False)
+            Cursor = Cursors.Default
+            If oMessageSent = True Then
                 MsgBox("Email has been send successfully.", MsgBoxStyle.Information)
             Else
                 MsgBox("Could not send the testmail. Please check the log.", MsgBoxStyle.Exclamation)
             End If
+            'NEW END
+
+            'If _limilab.NewSMTPEmail(txtTestmail.Text, "Testmail", "This is the body (text will be replaced within profile)", EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text, PORTTextBox.Text,
+            '                     EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, "frmMain-Test", "", "", True) = True Then
+
+
+            '    MsgBox("Email has been send successfully.", MsgBoxStyle.Information)
+            'Else
+            '    MsgBox("Could not send the testmail. Please check the log.", MsgBoxStyle.Exclamation)
+            'End If
         End If
     End Sub
 
@@ -757,7 +824,6 @@ Public Class frmMain
                 Dim oUser = oRow.Item("EMAIL_USER")
                 Dim oAuthType = oRow.Item("AUTH_TYPE")
                 Dim oArchiveFolder = oRow.Item("ARCHIVE_FOLDER")
-
                 Dim oFetcher As New MailFetcher(LogConfig)
                 Dim oSession As MailSession.SessionInfo
 
@@ -961,4 +1027,63 @@ Public Class frmMain
             PATH_ORIGINALTextBox.Text = FolderBrowserDialog1.SelectedPath
         End If
     End Sub
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        ConfigManager.Save()
+    End Sub
+
+    Private Sub PATH_EMAIL_ERRORSTextBox_TextChanged(sender As Object, e As EventArgs) Handles PATH_EMAIL_ERRORSTextBox.TextChanged
+
+    End Sub
+
+    Private Sub PATH_ORIGINALTextBox_TextChanged(sender As Object, e As EventArgs) Handles PATH_ORIGINALTextBox.TextChanged
+
+    End Sub
+
+    Private Sub COMMENT_PROFILESTextBox_TextChanged(sender As Object, e As EventArgs) Handles COMMENT_PROFILESTextBox.TextChanged
+
+    End Sub
+
+    ' Loads the TBEMLP_HISTORY table into the monitoring grid and formats columns
+    Private Sub LoadMonitoringIntoGrid()
+        Try
+            ' Fill dataset table (adapter exists in designer)
+            Me.TBEMLP_HISTORYTableAdapter.Fill(Me.MyDataset.TBEMLP_HISTORY)
+
+            ' Bind the grid to the binding source defined in the designer
+            Me.gridMonitoring.DataSource = Me.TBEMLP_HISTORYBindingSource
+
+            ' Format columns on the view
+            Dim gv = TryCast(Me.GridView5, DevExpress.XtraGrid.Views.Grid.GridView)
+            If gv IsNot Nothing Then
+                gv.PopulateColumns()
+
+                ' Hide all columns first
+                For Each column As DevExpress.XtraGrid.Columns.GridColumn In gv.Columns
+                    column.Visible = False
+                Next
+
+                ' Show only the desired columns
+                Dim visibleColumns = New String() {"GUID", "EMAIL_MSGID", "EMAIL_FROM", "EMAIL_SUBJECT", "EMAIL_DATE", "ADDED_WHEN", "STATUS", "PROFILE_ID"}
+                For Each columnName In visibleColumns
+                    Dim column = gv.Columns.ColumnByFieldName(columnName)
+                    If column IsNot Nothing Then
+                        column.Visible = True
+                    End If
+                Next
+
+                ' Optionally format specific columns
+                If gv.Columns.ColumnByFieldName("EMAIL_DATE") IsNot Nothing Then
+                    gv.Columns("EMAIL_DATE").DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
+                    gv.Columns("EMAIL_DATE").DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"
+                End If
+
+                gv.OptionsView.ColumnAutoWidth = False
+                gv.BestFitColumns()
+            End If
+
+        Catch ex As Exception
+            If Logger IsNot Nothing Then Logger.Error(ex) Else Debug.WriteLine(ex.ToString())
+        End Try
+    End Sub
 End Class

App/EmailProfiler.Form/packages.config

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Identity.Client" version="4.55.0" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Abstractions" version="6.22.0" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="S22.Imap" version="3.6.0.0" targetFramework="net462" />
 </packages>

App/EmailProfiler.Service/EmailProfiler.Service.vbproj

@@ -48,21 +48,27 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DigitalData.Modules.Base">
+    <Reference Include="DigitalData.Modules.Base, Version=1.3.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Database, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Language">
+    <Reference Include="DigitalData.Modules.Config, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Logging">
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="EmailProfiler.Common">
+      <HintPath>..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="EmailProfiler.Common">
+      <HintPath>..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
@@ -96,7 +102,6 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Config.vb" />
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
@@ -158,11 +163,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\EmailProfiler.Common\EmailProfiler.Common.vbproj">
-      <Project>{9f748dcd-952e-40a0-9dad-65bf8a39b231}</Project>
-      <Name>EmailProfiler.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

App/EmailProfiler.Service/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("SERV_EMAIL")>
 <Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("3.0.5.0")>
+<Assembly: AssemblyTrademark("3.3.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.0.5.0")>
+<Assembly: AssemblyVersion("3.3.0.0")>
-<Assembly: AssemblyFileVersion("3.0.5.0")>
+<Assembly: AssemblyFileVersion("3.3.0.0")>

App/EmailProfiler.Service/MyService.vb

@@ -17,8 +17,8 @@ Public Class MyService
 
     Private _DBConfig As ClassDBConfig.Config
 
-    Private ConfigManager As ConfigManager(Of ConfigData)
+    Private ConfigManager As ConfigManager(Of Config)
-    Private _ConfigData As ConfigData
+    Private _ConfigData As Config
 
     Private Database As MSSQLServer
 #End Region
@@ -31,7 +31,7 @@ Public Class MyService
 
             Logger.Info("Service started.")
 
-            ConfigManager = New ConfigManager(Of ConfigData)(LogConfig, My.Application.Info.DirectoryPath)
+            ConfigManager = New ConfigManager(Of Config)(LogConfig, My.Application.Info.DirectoryPath)
             _ConfigData = ConfigManager.Config
 
             If _ConfigData.ConnectionString = String.Empty Then

App/EmailProfiler.sln

@@ -10,6 +10,9 @@ EndProject
 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}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9F748DCD-952E-40A0-9DAD-65BF8A39B231} = {9F748DCD-952E-40A0-9DAD-65BF8A39B231}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

App/wisag_check_Att/Form1.Designer.vb

@@ -98,14 +98,14 @@ Partial Class Form1
         '
         'BarButtonItem4
         '
-        Me.BarButtonItem4.Caption = "Extract PDF-Attachments"
+        Me.BarButtonItem4.Caption = "Extract Attachments from PDF-File"
         Me.BarButtonItem4.Id = 6
         Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem4.Name = "BarButtonItem4"
         '
         'btExtractMailAttachments
         '
-        Me.btExtractMailAttachments.Caption = "Extract Mail-Attachments"
+        Me.btExtractMailAttachments.Caption = "Extract Attachments from EML-File"
         Me.btExtractMailAttachments.Id = 7
         Me.btExtractMailAttachments.ImageOptions.SvgImage = CType(resources.GetObject("btExtractMailAttachments.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.btExtractMailAttachments.Name = "btExtractMailAttachments"

App/wisag_check_Att/Form1.vb

@@ -70,6 +70,12 @@ Public Class Form1
     Private Sub btRunEmailCheck_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btRunEmailCheck.ItemClick
         ' Check Email
         ListBox1.Items.Clear()
+
+        If bsifolderbrowser Is Nothing Or String.IsNullOrEmpty(bsifolderbrowser.Caption) Then
+            MsgBox("Es wurde kein input-Verzeichnis konfiguriert. Abbruch!", MsgBoxStyle.Information)
+            Return
+        End If
+
         Dim di As New DirectoryInfo(bsifolderbrowser.Caption)
         ' Get a reference to each file in that directory.
         Dim fiArr As FileInfo() = di.GetFiles()
@@ -281,7 +287,7 @@ Public Class Form1
 
         Dim connectionString As String = "Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd"
 
-        Dim oConfigData As ConfigData = New ConfigData() With {
+        Dim oConfigData As Config = New Config() With {
             .Debug = False,
             .GDPictureVersion = "11.2024",
             .UseWindream = False,

App/wisag_check_Att/TestClasses/ExtractAttachmentsFromEMLFile.vb

@@ -13,7 +13,7 @@ Public Class ExtractAttachmentsFromEMLFile
 
     End Sub
 
-    Public Sub CallWorkerProcess(pEMLFilename As String, pConfigData As ConfigData)
+    Public Sub CallWorkerProcess(pEMLFilename As String, pConfigData As Config)
 
         Dim oProfileIdForPolling = 1
         Dim oWorker As New clsWorker(_LogConfig,

App/wisag_check_Att/wisag_check_Att.vbproj

@@ -57,13 +57,16 @@
     <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="EmailProfiler.Common">
+      <HintPath>..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll</HintPath>
     </Reference>
     <Reference Include="GdPicture.NET.14, Version=14.2.90.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
       <HintPath>..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll</HintPath>
@@ -158,12 +161,6 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\EmailProfiler.Common\EmailProfiler.Common.vbproj">
-      <Project>{9F748DCD-952E-40A0-9DAD-65BF8A39B231}</Project>
-      <Name>EmailProfiler.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">