MS ÄNDerungen wegen License

app/DD_Clipboard_Searcher/ClassInit.vb

@@ -42,7 +42,12 @@ Public Class ClassInit
 
         Try
             Database = New MSSQLServer(LogConfig, MyConnectionString)
-            Return True
+            If Database.DBInitialized = True Then
+                Return True
+            Else
+                Return False
+            End If
+
         Catch ex As Exception
             Logger.Error(ex)
             Return False
@@ -86,40 +91,46 @@ Public Class ClassInit
         End If
     End Function
     Public Shared Function CheckModuleData()
-        Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','CW',{1})", USER_USERNAME, CLIENT_SELECTED)
-        Dim DT_CHECKUSER_MODULE As DataTable = Database.GetDatatable(sql)
-        If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
-            Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True)
-            'ERROR_STATE = "NO USER"
-            MsgBox("Sorry - Something went wrong in getting Your rights." & vbNewLine & "Please contact the system administrator!", MsgBoxStyle.Exclamation)
+        Try
+            Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','CW',{1})", USER_USERNAME, CLIENT_SELECTED)
+            Dim DT_CHECKUSER_MODULE As DataTable = Database.GetDatatable(sql)
+            If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
+                Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True)
+                'ERROR_STATE = "NO USER"
+                MsgBox("Sorry - Something went wrong in getting Your rights." & vbNewLine & "Please contact the system administrator!", MsgBoxStyle.Exclamation)
+                Return False
+            End If
+            If DT_CHECKUSER_MODULE.Rows.Count = 1 Then
+                Logger.Info(">> Login Username: " & USER_USERNAME, False)
+                Logger.Info(">> Login time: " & Now.ToString, False)
+                USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID")
+                USER_SURNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"))
+                USER_PRENAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME"))
+                USER_SHORTNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"))
+                USER_EMAIL = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"))
+                USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")
+                USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT")
+
+                USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
+                USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
+
+
+                USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")
+                USERCOUNT_LOGGED_IN += 1
+                Return True
+            Else
+                Logger.Info(" - User '" & USER_USERNAME & "' not listed in Useradministration!", False)
+                'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
+                'Me.Close()
+                Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
+                MsgBox(msg, MsgBoxStyle.Exclamation)
+                Return False
+            End If
+        Catch ex As Exception
+            Logger.Error(ex)
             Return False
-        End If
-        If DT_CHECKUSER_MODULE.Rows.Count = 1 Then
-            Logger.Info(">> Login Username: " & USER_USERNAME, False)
-            Logger.Info(">> Login time: " & Now.ToString, False)
-            USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID")
-            USER_SURNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"))
-            USER_PRENAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME"))
-            USER_SHORTNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"))
-            USER_EMAIL = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"))
-            USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")
-            USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT")
+        End Try
 
-            USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
-            USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
-
-
-            USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")
-            USERCOUNT_LOGGED_IN += 1
-            Return True
-        Else
-            Logger.Info(" - User '" & USER_USERNAME & "' not listed in Useradministration!", False)
-            'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
-            'Me.Close()
-            Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
-            MsgBox(msg, MsgBoxStyle.Exclamation)
-            Return False
-        End If
     End Function
     Public Shared Function InitUserLogin(Optional _User As String = "")
         Try