MS FNDD_LOGIN_USER_MODULE, Übersetzung etc
This commit is contained in:
@@ -8,6 +8,7 @@ Imports DigitalData.Modules.EDMI.API
|
||||
Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
|
||||
Imports System.Globalization
|
||||
Imports System.Threading
|
||||
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
|
||||
|
||||
Public Class ClassInit
|
||||
Public _lizenzManager As clsLicenseManager
|
||||
@@ -195,9 +196,9 @@ Public Class ClassInit
|
||||
End Function
|
||||
Public Function CheckModuleData()
|
||||
Try
|
||||
Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','CW',{1},'{2}')", USER_USERNAME, CLIENT_SELECTED, My.Settings.SYS_Override_Language)
|
||||
Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','CW',{1})", USER_USERNAME, CLIENT_SELECTED)
|
||||
Dim DT_CHECKUSER_MODULE As DataTable
|
||||
DT_CHECKUSER_MODULE = _DataASorDB.GetDatatable(oSql, "TBDD_USER_MODULE", $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'CW'", "", "")
|
||||
DT_CHECKUSER_MODULE = Database.GetDatatable(oSql)
|
||||
|
||||
If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
|
||||
Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True)
|
||||
@@ -215,12 +216,9 @@ Public Class ClassInit
|
||||
USER_SHORTNAME = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"), "")
|
||||
USER_EMAIL = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"), "")
|
||||
|
||||
If My.Settings.SYS_Override_Language <> String.Empty Then
|
||||
USER_LANGUAGE = My.Settings.SYS_Override_Language
|
||||
Logger.Info("Override Language [{0}] from Config will be used!", USER_LANGUAGE)
|
||||
Else
|
||||
USER_LANGUAGE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE"), "de-DE")
|
||||
End If
|
||||
|
||||
USER_LANGUAGE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE"), "de-DE")
|
||||
|
||||
|
||||
USER_DATE_FORMAT = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT"), "dd.MM.yyyy")
|
||||
USER_IN_MODULE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS"), False)
|
||||
@@ -362,8 +360,8 @@ Public Class ClassInit
|
||||
oSQL = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'Clipboard-Watcher'"
|
||||
Database.ExecuteNonQuery(oSQL)
|
||||
|
||||
oSQL = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME,LANGUAGE_OVERRIDE) VALUES
|
||||
({0},{1},'Clipboard-Watcher','{2}','{3}','{4}')", USER_ID, 0, My.Application.Info.Version.ToString, Environment.MachineName, My.Settings.SYS_Override_Language)
|
||||
oSQL = $"INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME) VALUES
|
||||
({USER_ID},1,'Clipboard-Watcher','{My.Application.Info.Version.ToString}','Environment.MachineName')"
|
||||
Database.ExecuteNonQuery(oSQL)
|
||||
|
||||
If USER_IS_ADMIN = True Then
|
||||
@@ -381,6 +379,9 @@ Public Class ClassInit
|
||||
|
||||
WD_UNICODE = Database.GetScalarValue("SELECT WD_UNICODE FROM TBCW_CONFIGURATION WHERE GUID = 1")
|
||||
GDPICTURE_LICENSE = Database.GetScalarValue("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'")
|
||||
oSQL = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WHERE ACTIVE = 1 ORDER BY LANG_CODE"
|
||||
|
||||
BASEDATA_DT_LANGUAGE = Database.GetDatatable(oSQL)
|
||||
|
||||
Logger.Debug(" >> Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString, False)
|
||||
If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then
|
||||
|
||||
Reference in New Issue
Block a user