From 93a36a5cc272f34c864add82c6b575da1ce18043 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Fri, 21 Dec 2018 11:24:28 +0100 Subject: [PATCH] MS ChangesLicenseDate --- app/DD_PM_WINDREAM/ClassInit.vb | 13 +++++++++++-- app/DD_PM_WINDREAM/frmLicense.vb | 7 +++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index b331ebe..0312b8a 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -1,4 +1,5 @@ Imports System.ComponentModel +Imports System.Globalization Imports DLLLicenseManager Public Class ClassInit @@ -64,8 +65,16 @@ Public Class ClassInit Else LICENSE_COUNT = 0 End If - If CDate(split(1)) <= CDate(Now.ToShortDateString) Then - MsgBox("Ihre Lizenz ist abgelaufen!" & vbNewLine & "Letztes Gültigkeitsdatum: " & split(1) & vbNewLine & "Die Lizenzanzahl wird auf 0 gesetzt" & vbNewLine & "Bitte setzen Sie sich mit Digital Data in Verbindung", MsgBoxStyle.Exclamation) + Dim oLicDateString As String = split(1) + Dim cultureInfo As System.Globalization.CultureInfo + cultureInfo = New System.Globalization.CultureInfo("de-DE") + cultureInfo.DateTimeFormat.ShortDatePattern = "dd.MM.yyyy" + + + Dim oLicDate As Date = Convert.ToDateTime(oLicDateString, cultureInfo) + Dim oMyDate As Date = Convert.ToDateTime(Now.ToShortDateString, cultureInfo) + If oLicDate <= oMyDate Then + MsgBox("Your license has expired!" & vbNewLine & "Last valid date: " & split(1) & vbNewLine & "Please contact Your sysadmin", MsgBoxStyle.Exclamation) LICENSE_EXPIRED = True LICENSE_COUNT = 0 End If diff --git a/app/DD_PM_WINDREAM/frmLicense.vb b/app/DD_PM_WINDREAM/frmLicense.vb index 8f84ae9..68a8d2a 100644 --- a/app/DD_PM_WINDREAM/frmLicense.vb +++ b/app/DD_PM_WINDREAM/frmLicense.vb @@ -1,4 +1,5 @@ -Imports DLLLicenseManager +Imports System.Globalization +Imports DLLLicenseManager Public Class frmLicense Public _lizenzManager As ClassLicenseManager Private Sub btnPW_check_Click(sender As System.Object, e As System.EventArgs) Handles btnPW_check.Click @@ -21,7 +22,9 @@ Public Class frmLicense Private Sub btnnewLicenses_Click(sender As System.Object, e As System.EventArgs) Handles btnnewLicenses.Click Try If Me.txtNewlizences.Text <> "" And txtProfile.Text <> "" Then - Dim result As String = Me._lizenzManager.EncodeLicenseKey(txtNewlizences.Text & "#" & dtp_Gültigkeit.Text & "#" & txtProfile.Text, "#DigitalData35452!#") + Dim dt As Date = CDate(dtp_Gültigkeit.Text) + Dim oDateddMMyyyy = dt.ToString("dd.MM.yyyy", CultureInfo.InvariantCulture) + Dim result As String = Me._lizenzManager.EncodeLicenseKey(txtNewlizences.Text & "#" & oDateddMMyyyy & "#" & txtProfile.Text, "#DigitalData35452!#") txtlicensekey.Text = result Me.TBPM_KONFIGURATIONTableAdapter.CmdUpdateLizenz(Environment.UserName, CStr(result)) Refresh_Licence(True)