MS

app/DD-Record-Organiser/ClassInit.vb

@@ -134,9 +134,10 @@ Public Class ClassInit
                 'Me.Close()
                 Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
                 MsgBox(msg, MsgBoxStyle.Exclamation)
+                ClassHelper.InsertEssential_Log(0, "USER-ID", String.Format("User '{0}' not listed in Userconfiguration", USER_USERNAME))
                 Return False
             Else
-
+                Dim Right_RO As Boolean = False
                 USER_GUID = USER_DT.Rows(0).Item("GUID")
                 USERID_FK_INT_ECM = USER_DT.Rows(0).Item("USERID_FK_INT_ECM")
                 USER_WAN = USER_DT.Rows(0).Item("WAN_ENVIRONMENT") 'ClassDatabase.Execute_Scalar("SELECT WAN_ENVIRONMENT FROM TBDD_USER WHERE GUID = " & USER_GUID, False)
@@ -144,23 +145,17 @@ Public Class ClassInit
                 clsCURRENT.USER_LANGUAGE = USER_LANGUAGE
                 USER_DATE_FORMAT = USER_DT.Rows(0).Item("DATE_FORMAT")
                 USER_GENERAL_VIEWER = USER_DT.Rows(0).Item("GENERAL_VIEWER")
-                'USER_LANGUAGE = ClassDatabase.Execute_Scalar("SELECT LANGUAGE FROM TBDD_USER WHERE GUID = " & USER_GUID, False)
-                DT_CLIENT_USER = ClassDatabase.Return_Datatable("SELECT T.*, T1.LICENSE_PMO, T1.CLIENT_NAME FROM TBDD_CLIENT_USER T,TBDD_CLIENT T1 WHERE T.CLIENT_ID = T1.GUID AND T.USER_ID = " & USER_GUID, False)
-                If DT_CLIENT_USER.Rows.Count > 1 Then
-                    frmClientLogin.ShowDialog()
-                ElseIf DT_CLIENT_USER.Rows.Count = 1 Then
-                    CLIENT_SELECTED = DT_CLIENT_USER.Rows(0).Item("CLIENT_ID")
-                End If
-                If CLIENT_SELECTED = 99 Then
-                    Dim msg = String.Format("Die Mandantenanmeldung war nicht möglich." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
-
-                    If USER_LANGUAGE <> "de-DE" Then
-                        msg = String.Format("The client-login was not possible." & vbNewLine & "Please contact the admin.")
+                sql = String.Format("SELECT COUNT(T.GUID) FROM TBDD_USER_MODULES T, TBDD_MODULES T1 WHERE T.MODULE_ID = T1.GUID AND T1.NAME = 'Record-Organizer' AND T.USER_ID = {0}", USER_GUID)
+                Dim USER2MODULE = clsDatabase.Execute_Scalar(sql)
+                If Not IsNothing(USER2MODULE) Then
+                    If USER2MODULE = 1 Then
+                        Right_RO = True
                     End If
-                    MsgBox(msg, MsgBoxStyle.Exclamation)
-                    Return False
+                Else
+                    Right_RO = USER_DT.Rows(0).Item("MODULE_RECORD_ORG")
                 End If
-                Dim Right_RO As Boolean = USER_DT.Rows(0).Item("MODULE_RECORD_ORG")
+           
+
                 If Right_RO = False Then
                     ClassLogger.Add(" - User: " & USER_USERNAME & " nicht für Modul freigegben!", False)
                     'MsgBox("Achtung: Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
@@ -170,20 +165,38 @@ Public Class ClassInit
                         msg = String.Format("You are not authorized for using this module." & vbNewLine & "Please contact the admin.")
                     End If
                     MsgBox(msg, MsgBoxStyle.Exclamation)
+                    ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", "User not authorized for using Record-Organizer!")
                     Return False
                     'Me.Close()
                 Else
+                    'USER_LANGUAGE = ClassDatabase.Execute_Scalar("SELECT LANGUAGE FROM TBDD_USER WHERE GUID = " & USER_GUID, False)
+                    DT_CLIENT_USER = ClassDatabase.Return_Datatable("SELECT T.*, T1.LICENSE_PMO, T1.CLIENT_NAME FROM TBDD_CLIENT_USER T,TBDD_CLIENT T1 WHERE T.CLIENT_ID = T1.GUID AND T.USER_ID = " & USER_GUID, False)
+                    If DT_CLIENT_USER.Rows.Count > 1 Then
+                        frmClientLogin.ShowDialog()
+                    ElseIf DT_CLIENT_USER.Rows.Count = 1 Then
+                        CLIENT_SELECTED = DT_CLIENT_USER.Rows(0).Item("CLIENT_ID")
+                    End If
+                    If CLIENT_SELECTED = 99 Then
+                        Dim msg = String.Format("Die Mandantenanmeldung war nicht möglich." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
+
+                        If USER_LANGUAGE <> "de-DE" Then
+                            msg = String.Format("The client-login was not possible." & vbNewLine & "Please contact the admin.")
+                        End If
+                        MsgBox(msg, MsgBoxStyle.Exclamation)
+                        Return False
+                    End If
+
                     'Am System anmelden
                     ClassLicence.Refresh_Licence(CLIENT_SELECTED)
                     'Am System anmelden
                     sql = String.Format("UPDATE TBDD_USER SET LOGGED_IN = 1, LOGGED_WHERE = '{0}' WHERE GUID = {1}", Environment.MachineName, USER_GUID)
                     ClassDatabase.Execute_non_Query(sql)
-                    sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'RECORD_ORGANIZER'"
+                    sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'Record-Organizer'"
                     If ClassDatabase.Execute_non_Query(sql) = True Then
 
                     End If
 
-                    sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT) VALUES ({0},{1},'RECORD_ORGANIZER','{2}')", USER_GUID, CLIENT_SELECTED, My.Application.Info.Version.ToString)
+                    sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME) VALUES ({0},{1},'Record-Organizer','{2}','{3}')", USER_GUID, CLIENT_SELECTED, My.Application.Info.Version.ToString, Environment.MachineName)
                     ClassDatabase.Execute_non_Query(sql)
 
                     USER_IS_ADMIN = USER_DT.Rows(0).Item("RECORD_ADMIN")
@@ -196,13 +209,14 @@ Public Class ClassInit
                             End If
                         End If
                     Else
-                       
+
                     End If
                     If clsWindream.Create_Session = False Then
                         ClassLogger.Add("Could not create the login for windream!")
-                        ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session")
+                        ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", "Could not create a windream-session for user!")
+                        ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "ADDI will start anyway but be aware that searching and importing won't be possible!")
                     End If
-                    sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('RECORD_ORGANIZER') AND CLIENT_ID = {0}", CLIENT_SELECTED)
+                    sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED)
                     Dim anzahl = ClassDatabase.Execute_Scalar(sql, False)
                     USERS_LOGGED_IN = CInt(anzahl)
                     If LogErrorsOnly = False Then ClassLogger.Add(" >> User# logged in: " & anzahl.ToString, False)
@@ -219,7 +233,7 @@ Public Class ClassInit
                         ClassLogger.Add(" >> The number of logged Users (" & USERS_LOGGED_IN.ToString & ") exceeds the number of licenses (" & LICENSE_COUNT & ") ", False)
                         If USER_IS_ADMIN = False Then
                             'Anmeldung wieder herausnehmen
-                            sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'RECORD_ORGANIZER'"
+                            sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'Record-Organizer'"
                             ClassDatabase.Execute_non_Query(sql)
                             ClassLogger.Add(" - logged out the user", False)
                             Return False