Remove license checks for Move and Rename module
Eliminated all dynamic license validation and management for the "Move and Rename" module. The feature is now always enabled regardless of license state. Cleaned up related variables, removed license manager initialization, and simplified module loading logic. Incremented version to 2.10.2.0.
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
Module ModuleSettings
|
Module ModuleSettings
|
||||||
Public LICENSE_MoveRename As Boolean
|
|
||||||
Public LICENSE_AD As Boolean
|
Public LICENSE_AD As Boolean
|
||||||
End Module
|
End Module
|
||||||
|
|||||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("2.10.1.0")>
|
<Assembly: AssemblyVersion("2.10.2.0")>
|
||||||
<Assembly: AssemblyFileVersion("2.9.9.0")>
|
<Assembly: AssemblyFileVersion("2.9.9.0")>
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ Public Class frmNIHauptseite
|
|||||||
Public debug As Boolean = True
|
Public debug As Boolean = True
|
||||||
Private Shared _Instance As frmNIHauptseite = Nothing
|
Private Shared _Instance As frmNIHauptseite = Nothing
|
||||||
Private _validModules()
|
Private _validModules()
|
||||||
Private licenseManager As ClassLicenseManager = Nothing
|
|
||||||
Public Shared _windream As ClassWindream_allgemein
|
Public Shared _windream As ClassWindream_allgemein
|
||||||
Private Const ConstWMEntityDocument = 1 ''WINDREAMLib.WMEntity.WMEntityDocument
|
Private Const ConstWMEntityDocument = 1 ''WINDREAMLib.WMEntity.WMEntityDocument
|
||||||
Private _singleProfileRun As String = ""
|
Private _singleProfileRun As String = ""
|
||||||
@@ -197,44 +196,6 @@ Public Class frmNIHauptseite
|
|||||||
' Return Nothing
|
' Return Nothing
|
||||||
' End Select
|
' End Select
|
||||||
'End Function
|
'End Function
|
||||||
'Public Sub LoadAllModules()
|
|
||||||
' Me._validModules = Nothing
|
|
||||||
|
|
||||||
' If Not My.Settings.licensekey = "" Then
|
|
||||||
' 'Me.licenseManager = New ClassLicenseManager = Nothing
|
|
||||||
' Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#", My.Settings.licensekey)
|
|
||||||
|
|
||||||
' Me.licenseManager.licenseString = Me.licenseManager.DecodeLicenseKey(My.Settings.licensekey)
|
|
||||||
' Me.licenseManager.licenseStringArray = Me.licenseManager.SplitLicenseString(Me.licenseManager.licenseString)
|
|
||||||
' Me.licenseManager.LoadLicenses()
|
|
||||||
|
|
||||||
' Dim i As Integer = 0
|
|
||||||
|
|
||||||
' If Me.licenseManager.Licenses.Licenses IsNot Nothing Then
|
|
||||||
' For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
|
|
||||||
' Dim expires As String = license.Expires.Date
|
|
||||||
' If IsExpired(license.Expires.Date) = False Then
|
|
||||||
' ' MsgBox(license.Modulename & vbNewLine & expires)
|
|
||||||
|
|
||||||
' Select Case license.Modulename.ToUpper
|
|
||||||
' Case "MOVEANDRENAME"
|
|
||||||
' LICENSE_MoveRename = True
|
|
||||||
' _Logger.Info("LICENSE MoveandRename aktiv")
|
|
||||||
' End Select
|
|
||||||
' i += 1
|
|
||||||
' Else
|
|
||||||
' Select Case license.Modulename
|
|
||||||
' Case "MOVEANDRENAME"
|
|
||||||
' LICENSE_MoveRename = False
|
|
||||||
' End Select
|
|
||||||
' i += 1
|
|
||||||
' End If
|
|
||||||
' 'Date.TryParse(expires, license.Expires)
|
|
||||||
|
|
||||||
' Next
|
|
||||||
' End If
|
|
||||||
' End If
|
|
||||||
'End Sub
|
|
||||||
Private Function IsExpired(ByVal _Date As Date)
|
Private Function IsExpired(ByVal _Date As Date)
|
||||||
If Date.Today > _Date Then
|
If Date.Today > _Date Then
|
||||||
Return True
|
Return True
|
||||||
@@ -1830,22 +1791,14 @@ Public Class frmNIHauptseite
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
'Move and Rename ausführen
|
'Move and Rename ausführen
|
||||||
If LICENSE_MoveRename = True And Not oUnexpectedError And unvollstaendig = False Then
|
If Not oUnexpectedError And unvollstaendig = False Then
|
||||||
Dim swMoveandrename As New ClassStopwatch("MoveandRename")
|
Dim swMoveandrename As New ClassStopwatch("MoveandRename")
|
||||||
oUnexpectedError = FNMoveRename(pMyWMDoc)
|
oUnexpectedError = FNMoveRename(pMyWMDoc)
|
||||||
|
|
||||||
Dim msg1 = swMoveandrename.Done
|
Dim msg1 = swMoveandrename.Done
|
||||||
If msg1 <> "" Then
|
If msg1 <> "" Then
|
||||||
Stopwatch1 += vbNewLine & $"{msg1}"
|
Stopwatch1 += vbNewLine & $"{msg1}"
|
||||||
|
|
||||||
End If
|
End If
|
||||||
Else
|
|
||||||
If LICENSE_MoveRename = True And oUnexpectedError = True Or unvollstaendig = True Then
|
|
||||||
_Logger.Info("MoveRename Yes but error_in_Indexierung = True Or unvollstaendig = True")
|
|
||||||
_Logger.Debug("MoveRename Yes but error_in_Indexierung = True Or unvollstaendig = True")
|
|
||||||
End If
|
|
||||||
|
|
||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
'Indexierung gegen die Indizes des Ordners
|
'Indexierung gegen die Indizes des Ordners
|
||||||
|
|||||||
@@ -10,10 +10,8 @@ Imports System.ComponentModel
|
|||||||
Public Class frmStart
|
Public Class frmStart
|
||||||
Private _MyLogger As LogConfig
|
Private _MyLogger As LogConfig
|
||||||
Private Shared _Logger As DigitalData.Modules.Logging.Logger
|
Private Shared _Logger As DigitalData.Modules.Logging.Logger
|
||||||
Public _validModules()
|
|
||||||
Public _company As String
|
Public _company As String
|
||||||
' Dim timediff As Integer = 0
|
' Dim timediff As Integer = 0
|
||||||
Private licenseManager As ClassLicenseManager = Nothing
|
|
||||||
'Private Sub timUhrzeit_Tick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles timUhrzeit.Tick
|
'Private Sub timUhrzeit_Tick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles timUhrzeit.Tick
|
||||||
' ' der Statusuhr die aktuelle Systemzeit zuweisen
|
' ' der Statusuhr die aktuelle Systemzeit zuweisen
|
||||||
' Me.Status_Clock.Text = CType(My.Computer.Clock.LocalTime, String)
|
' Me.Status_Clock.Text = CType(My.Computer.Clock.LocalTime, String)
|
||||||
@@ -230,13 +228,8 @@ Public Class frmStart
|
|||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If Not My.Settings.licensekey = "" Then
|
' Module laden
|
||||||
' Lizenz-Manager initialisieren
|
Me.LoadAllModules()
|
||||||
Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#", My.Settings.licensekey)
|
|
||||||
|
|
||||||
' alle vorhandenen Module laden
|
|
||||||
Me.LoadAllModules()
|
|
||||||
End If
|
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
_Logger.Error(ex)
|
_Logger.Error(ex)
|
||||||
@@ -327,23 +320,11 @@ Public Class frmStart
|
|||||||
Me.grbDI.Visible = False
|
Me.grbDI.Visible = False
|
||||||
Me.GBNachindexierung.Visible = False
|
Me.GBNachindexierung.Visible = False
|
||||||
Me.grbxMoRe.Visible = False
|
Me.grbxMoRe.Visible = False
|
||||||
LICENSE_MoveRename = False
|
|
||||||
LICENSE_AD = False
|
LICENSE_AD = False
|
||||||
End Sub
|
End Sub
|
||||||
Public Sub LoadAllModules()
|
Public Sub LoadAllModules()
|
||||||
Me._validModules = Nothing
|
|
||||||
|
|
||||||
LICENSE_AD = True
|
LICENSE_AD = True
|
||||||
LICENSE_MoveRename = True
|
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
Private Function IsExpired(ByVal _Date As Date)
|
|
||||||
If Date.Today > _Date Then
|
|
||||||
Return True
|
|
||||||
Else
|
|
||||||
Return False
|
|
||||||
End If
|
|
||||||
End Function
|
|
||||||
|
|
||||||
Private Sub FMStart_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown
|
Private Sub FMStart_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown
|
||||||
TimerNIRestart.Start()
|
TimerNIRestart.Start()
|
||||||
|
|||||||
Reference in New Issue
Block a user