From ce52218a5ec884ca98c2d1bfa58055ee2cd72723 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Fri, 17 May 2024 14:25:29 +0200 Subject: [PATCH 1/2] V 3.0.3.0 graphic extension behavior (png, jpeg) --- App/EmailProfiler.Common/My Project/AssemblyInfo.vb | 4 ++-- App/EmailProfiler.Common/clsWorkEmail.vb | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/App/EmailProfiler.Common/My Project/AssemblyInfo.vb b/App/EmailProfiler.Common/My Project/AssemblyInfo.vb index cafc84b..9770050 100644 --- a/App/EmailProfiler.Common/My Project/AssemblyInfo.vb +++ b/App/EmailProfiler.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/App/EmailProfiler.Common/clsWorkEmail.vb b/App/EmailProfiler.Common/clsWorkEmail.vb index 9f7ce18..cae790b 100644 --- a/App/EmailProfiler.Common/clsWorkEmail.vb +++ b/App/EmailProfiler.Common/clsWorkEmail.vb @@ -837,18 +837,19 @@ Public Class clsWorkEmail oATTFilename = oAttachment.SafeFileName.ToString.ToLower Dim oValidExtensions = New List(Of String) From {"pdf", "xls", "xlsx", "doc", "docx", "ppt", "pptx"} - Dim oGraphicExtensions = New List(Of String) From {"jpg", "bmp", "jpg", "gif", "xml"} + Dim oGraphicExtensions = New List(Of String) From {"jpg", "bmp", "jpg", "gif", "xml", "png", "jpeg"} Dim oValidExt = oValidExtensions.Any(Function(ext) oATTFilename.EndsWith(ext)) If oValidExt = False Then - _Logger.Info("Invalid FileExtension [{0}]", oATTFilename) + _Logger.Info("Potentially invalid fileExtension [{0}] ...", oATTFilename) Dim GraphicExt = oGraphicExtensions.Any(Function(ext) oATTFilename.EndsWith(ext)) If GraphicExt = False Then Dim oInfo = $"Consistency or extension of attached file {oATTFilename} is not ok." AddTrackingStatusMSSQL(CurrentMail.MessageId, oInfo, "PDF CONSISTENCY NOT OK", "Info GUI", "EML_PROF_EXTR_ATT1") AddToEmailQueueMSSQL(CurrentMail.MessageId, oInfo, "PDF CONSISTENCY NOT OK", _EmailAccountID, _InfoTemplateId, ErrorCode.PDFStructureCorrupt, oATTFilename, "") - + Else + _Logger.Info("..but graphic extension!") End If Continue For From ce06cffd08a44ad2287adaf5e7e6e63304d17ef6 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Thu, 24 Oct 2024 15:07:16 +0200 Subject: [PATCH 2/2] MS GD Picture --- .../EmailProfiler.Common.vbproj | 25 +++++++++++------ .../My Project/AssemblyInfo.vb | 4 +-- App/EmailProfiler.Common/packages.config | 2 ++ .../EmailProfiler.Form.vbproj | 28 +++++++++++-------- 4 files changed, 37 insertions(+), 22 deletions(-) diff --git a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj index 22446cc..546cf24 100644 --- a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj +++ b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj @@ -12,6 +12,8 @@ Windows v4.6.2 + + true @@ -48,25 +50,25 @@ ..\packages\AE.Net.Mail.1.7.10.0\lib\net45\AE.Net.Mail.dll - ..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll - ..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - ..\..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll + ..\..\..\2_DLL Projekte\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll - ..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll - ..\..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + ..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll - ..\..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + ..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll - - D:\ProgramFiles\GdPicture.net 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll + + ..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll @@ -162,4 +164,11 @@ + + + + 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}". + + + \ No newline at end of file diff --git a/App/EmailProfiler.Common/My Project/AssemblyInfo.vb b/App/EmailProfiler.Common/My Project/AssemblyInfo.vb index 9770050..d26ac99 100644 --- a/App/EmailProfiler.Common/My Project/AssemblyInfo.vb +++ b/App/EmailProfiler.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/App/EmailProfiler.Common/packages.config b/App/EmailProfiler.Common/packages.config index e4e7cf5..047a6c0 100644 --- a/App/EmailProfiler.Common/packages.config +++ b/App/EmailProfiler.Common/packages.config @@ -1,5 +1,7 @@  + + \ No newline at end of file diff --git a/App/EmailProfiler.Form/EmailProfiler.Form.vbproj b/App/EmailProfiler.Form/EmailProfiler.Form.vbproj index 7f3cfba..b7f1bdb 100644 --- a/App/EmailProfiler.Form/EmailProfiler.Form.vbproj +++ b/App/EmailProfiler.Form/EmailProfiler.Form.vbproj @@ -60,25 +60,29 @@ - + False - ..\..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll + ..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll - + False - ..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll - - ..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + + False + ..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - - ..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + + False + ..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - - ..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + False + ..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll - - ..\..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + + False + ..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll