From be743445e5d9f679a8f2cf148a4eaec742c1672b Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Mon, 13 May 2024 10:36:11 +0200 Subject: [PATCH] MS Common: Version 3.0.2 - GDPicture Licensing --- App/EmailProfiler.Common/ClassCurrent.vb | 2 +- App/EmailProfiler.Common/My Project/AssemblyInfo.vb | 6 +++--- App/EmailProfiler.Common/clsWorkEmail.vb | 4 ++++ App/EmailProfiler.Common/clsWorker.vb | 3 +++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/App/EmailProfiler.Common/ClassCurrent.vb b/App/EmailProfiler.Common/ClassCurrent.vb index 65925df..de94c92 100644 --- a/App/EmailProfiler.Common/ClassCurrent.vb +++ b/App/EmailProfiler.Common/ClassCurrent.vb @@ -51,6 +51,6 @@ 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" End Class diff --git a/App/EmailProfiler.Common/My Project/AssemblyInfo.vb b/App/EmailProfiler.Common/My Project/AssemblyInfo.vb index 6d48b9a..cafc84b 100644 --- a/App/EmailProfiler.Common/My Project/AssemblyInfo.vb +++ b/App/EmailProfiler.Common/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -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 202c473..9f7ce18 100644 --- a/App/EmailProfiler.Common/clsWorkEmail.vb +++ b/App/EmailProfiler.Common/clsWorkEmail.vb @@ -888,7 +888,11 @@ Public Class clsWorkEmail 'ToDo Konsistenz prüfen If oFileInfo.Extension.ToLower = ".pdf" Then Dim oPDFConsistent As Boolean = True + Dim oLicenseManager As New LicenseManager + oLicenseManager.RegisterKEY(GDPictureLicense) + Dim oGdPicturePDF As New GdPicturePDF() + ' Lic Dim oStatus As GdPictureStatus = oGdPicturePDF.LoadFromFile(oAttachmentFilePath, True) If oStatus <> GdPictureStatus.OK Then oPDFConsistent = False diff --git a/App/EmailProfiler.Common/clsWorker.vb b/App/EmailProfiler.Common/clsWorker.vb index 65f36a0..a1c1598 100644 --- a/App/EmailProfiler.Common/clsWorker.vb +++ b/App/EmailProfiler.Common/clsWorker.vb @@ -106,6 +106,9 @@ Public Class clsWorker Dim EmailAccountTable As DataTable = LoadEmailAccounts() Dim PollingProfileTable = LoadPollingProfiles(ProfileId) + Dim oSQLGDPicture = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE ACTIVE = 1" + GDPictureLicense = Database.GetScalarValue(oSQLGDPicture) + If IsNothing(PollingProfileTable) Then Logger.Warn("Error while fetching Polling Profiles. Exiting.") Exit Sub