Update Chat; Umbau SMB auf pandorasbox.verag.ost.dmn

Dokumentation/Login/Login.vb

@@ -37,7 +37,7 @@ Public Class Login
     Public Function LoadUSRID()
         Dim ds As New DataSet
         cSQL.SQL2DS("select * from [ADMIN].dbo.tblMitarbeiter where mit_aliasad_domain = '" & Environment.UserDomainName & "' AND mit_AliasAD_Username = '" & Environment.UserName & "'", ds)
-        VERAG_PROG_ALLGEMEIN.cAllgemein.USRID = ds.Tables(0).Rows(0).Item("mit_id").ToString
+        VERAG_PROG_ALLGEMEIN.cAllgemein.USRID = ds.Tables(0).Rows(0).Item("mit_id")
         VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_DATA()
 
         'MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID)
@@ -54,8 +54,9 @@ Public Class Login
         Try
             Abfrage(userPrincipalName)
             ' LoadUSRID()
-        Catch
+        Catch ex As Exception
             'MsgBox("Fehler beim Anmelden!")
+            MsgBox("Loginfehler! Zeile 59" & vbCrLf & ex.Message & vbCrLf & userPrincipalName)
 
             PasswortabfrageLogin.Show()
         End Try
@@ -64,46 +65,41 @@ Public Class Login
     Public Function Abfrage(user As String, Optional ByVal txt As Boolean = False)
         Dim locGroups As List(Of String) = GetUserGroupMembership(user)
         Dim gefunden As Boolean = False
-        ' Dim debugtext As String = ""
-        Class1.LoggedOnUser.FillWithLoggedOnUser(True)
-        Class1.GroupUsers = uscntr_Benutzer.LoadAllGroupmembers()
-        'showusersinlist()
+        Dim debugtext As String = ""
 
-        For Each usr As cBenutzer In Class1.GroupUsers
-            'MsgBox(usr.msDSPrincipalName & vbCrLf & cSharedClasses.LoggedOnUser.msDSPrincipalName)
-            If usr.msDSPrincipalName.ToString = Class1.LoggedOnUser.msDSPrincipalName.ToString Then
-                ' MsgBox("Treffer!")
-                Class1.LoggedOnUserRights = cBerechtigungen.ReadAll(Class1.LoggedOnUser.BenutzeranmeldeName)
-                gefunden = True
-                LoadUSRID()
-                ShowMain()
-                Me.Hide()
-                Exit For
+        Try
+            Class1.LoggedOnUser.FillWithLoggedOnUser(True)
+            Class1.GroupUsers = uscntr_Benutzer.LoadAllGroupmembers()
+            'showusersinlist()
+
+            For Each usr As cBenutzer In Class1.GroupUsers
+                'MsgBox(usr.msDSPrincipalName & vbCrLf & cSharedClasses.LoggedOnUser.msDSPrincipalName)
+                If usr.msDSPrincipalName.ToString = Class1.LoggedOnUser.msDSPrincipalName.ToString Then
+                    ' MsgBox("Treffer!")
+                    Class1.LoggedOnUserRights = cBerechtigungen.ReadAll(Class1.LoggedOnUser.BenutzeranmeldeName)
+                    debugtext &= usr.msDSPrincipalName.ToString & vbCrLf
+                    gefunden = True
+                    LoadUSRID()
+                    ShowMain()
+                    Me.Hide()
+                    Exit For
+                End If
+            Next
+
+            If gefunden = True Then
+
+                Exit Function
+            Else
+                Me.WindowState = Me.WindowState.Normal
+                PanHilfe.Visible = True
+                MsgBox(debugtext
+                       )
+                If txt = True Then lblInfo.Text = "Benutzer ist nicht berechtigt!"
             End If
-        Next
+        Catch ex As Exception
+            MsgBox("Fehler Abfrage: " & ex.Message & debugtext)
+        End Try
 
-        'For Each group As String In locGroups
-        '    debugtext &= group & vbCrLf
-        '    If group = "CN=SG_Doku_User_FULL" Then
-        '        Class1.LoggedOnUser.FillWithLoggedOnUser(True)
-        '        Class1.LoggedOnUserRights = cBerechtigungen.ReadAll(Class1.LoggedOnUser.BenutzeranmeldeName)
-        '        gefunden = True
-        '        'Main.Show()
-        '        'Class1.GroupUsers = uscntr_Benutzer.LoadAllGroupmembers()
-        '        'showusersinlist()
-        '        ShowMain()
-        '        Me.Hide()
-        '    End If
-        'Next
-        ' MsgBox(debugtext)
-        If gefunden = True Then
-
-            Exit Function
-        Else
-            Me.WindowState = Me.WindowState.Normal
-            PanHilfe.Visible = True
-            If txt = True Then lblInfo.Text = "Benutzer ist nicht berechtigt!"
-        End If
 
     End Function
 
@@ -205,13 +201,13 @@ Public Class Login
         End If
     End Sub
 
-    Function getLDAPPAth(ByVal DomainName As String) As String
-        Select Case DomainName
-            Case "VERAGOST"
-            Case "VERAG-NCTS"
-            Case ""
-        End Select
-    End Function
+    'Function getLDAPPAth(ByVal DomainName As String) As String
+    '    Select Case DomainName
+    '        Case "VERAGOST"
+    '        Case "VERAG-NCTS"
+    '        Case ""
+    '    End Select
+    'End Function
 
     Function ShowMain(Optional ByVal MessageActivated As Boolean = True)
         Dim main As New Main