From 7c03ab197b85860b6f9394ade4bfe17290dc4775 Mon Sep 17 00:00:00 2001 From: ms Date: Wed, 18 Dec 2024 14:13:51 +0100 Subject: [PATCH] Update Chat; Umbau SMB auf pandorasbox.verag.ost.dmn --- Dokumentation/App.config | 34 +++---- Dokumentation/Classes/cBenutzer.vb | 53 +++++++---- Dokumentation/Dokumentation.vbproj | 5 +- Dokumentation/Login/Login.vb | 88 +++++++++---------- .../My Project/Resources.Designer.vb | 2 +- Dokumentation/My Project/Resources.resx | 2 +- Dokumentation/SMB.Designer.vb | 28 +++--- Dokumentation/SMB.vb | 10 ++- Dokumentation/uscntr_Telefon.Designer.vb | 9 +- 9 files changed, 123 insertions(+), 108 deletions(-) diff --git a/Dokumentation/App.config b/Dokumentation/App.config index 4958309..1c7649f 100644 --- a/Dokumentation/App.config +++ b/Dokumentation/App.config @@ -1,42 +1,42 @@ - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/Dokumentation/Classes/cBenutzer.vb b/Dokumentation/Classes/cBenutzer.vb index 97aef54..a19cc27 100644 --- a/Dokumentation/Classes/cBenutzer.vb +++ b/Dokumentation/Classes/cBenutzer.vb @@ -20,19 +20,35 @@ Public Class cBenutzer - Function FillWithLoggedOnUser(Optional ByVal dcabfrage As Boolean = False, Optional ByVal LDAPa As String = "") '"LDAP://DC=VERAG,DC=OST,DC=DMN") - Try - userPrincipalName = System.DirectoryServices.AccountManagement.UserPrincipal.Current.UserPrincipalName - Name = System.DirectoryServices.AccountManagement.UserPrincipal.Current.Name - Hostname = Environment.MachineName - Catch - End Try - Domäne = System.DirectoryServices.ActiveDirectory.Domain.GetCurrentDomain.ToString - BenutzeranmeldeName = Environment.UserDomainName & "\" & Environment.UserName + Function FillWithLoggedOnUser(Optional ByVal dcabfrage As Boolean = False, Optional ByVal LDAPa As String = "", Optional ByVal debug As Boolean = False) '"LDAP://DC=VERAG,DC=OST,DC=DMN") + If debug = False Then + Try + userPrincipalName = System.DirectoryServices.AccountManagement.UserPrincipal.Current.UserPrincipalName + Name = System.DirectoryServices.AccountManagement.UserPrincipal.Current.Name + Hostname = Environment.MachineName + Catch + End Try + Domäne = System.DirectoryServices.ActiveDirectory.Domain.GetCurrentDomain.ToString + BenutzeranmeldeName = Environment.UserDomainName & "\" & Environment.UserName + + If dcabfrage = True Then + 'Class1.DebugText = userPrincipalName & LDAPa + FillFromDC(userPrincipalName, "userPrincipalName", LDAPa) + End If + Else + Try + userPrincipalName = "hoeferm@imex.local" + Domäne = "imex.local" + BenutzeranmeldeName = "imex\hoeferm" + + If dcabfrage = True Then + 'Class1.DebugText = userPrincipalName & LDAPa + FillFromDC(userPrincipalName, "userPrincipalName", LDAPa) + End If + Catch ex As Exception + MsgBox(ex.Message) + End Try - If dcabfrage = True Then - 'Class1.DebugText = userPrincipalName & LDAPa - FillFromDC(userPrincipalName, "userPrincipalName", LDAPa) End If End Function @@ -129,11 +145,14 @@ Public Class cBenutzer Function blablabla(result As DirectoryServices.SearchResult, Prop As String) As String - If result.Properties(Prop).Count = 0 Then - Return "" - Else - Return result.Properties(Prop)(0) - End If + Try + If result.Properties(Prop).Count = 0 Then + Return "" + Else + Return result.Properties(Prop)(0) + End If + Catch + End Try End Function diff --git a/Dokumentation/Dokumentation.vbproj b/Dokumentation/Dokumentation.vbproj index ac5f8dc..a0b63e4 100644 --- a/Dokumentation/Dokumentation.vbproj +++ b/Dokumentation/Dokumentation.vbproj @@ -11,7 +11,7 @@ Dokumentation 512 WindowsForms - v4.7.2 + v4.8 true true false @@ -220,7 +220,8 @@ - + + False ..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll diff --git a/Dokumentation/Login/Login.vb b/Dokumentation/Login/Login.vb index de8e8a8..d8ce7e7 100644 --- a/Dokumentation/Login/Login.vb +++ b/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 diff --git a/Dokumentation/My Project/Resources.Designer.vb b/Dokumentation/My Project/Resources.Designer.vb index f8efadb..7b62509 100644 --- a/Dokumentation/My Project/Resources.Designer.vb +++ b/Dokumentation/My Project/Resources.Designer.vb @@ -309,7 +309,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.96 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.98 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Dokumentation/My Project/Resources.resx b/Dokumentation/My Project/Resources.resx index 2802da0..9de6e1c 100644 --- a/Dokumentation/My Project/Resources.resx +++ b/Dokumentation/My Project/Resources.resx @@ -149,7 +149,7 @@ ..\Resources\external-content.duckduckgo.com.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 0.0.1.96 + 0.0.1.98 ..\Resources\mstsc1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Dokumentation/SMB.Designer.vb b/Dokumentation/SMB.Designer.vb index 00d6c28..de0625e 100644 --- a/Dokumentation/SMB.Designer.vb +++ b/Dokumentation/SMB.Designer.vb @@ -26,8 +26,8 @@ Partial Class SMB Me.dgv = New System.Windows.Forms.DataGridView() Me.dgvcms = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.SitzungBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.Refresh = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.counter = New System.Windows.Forms.Label() + Me.Button1 = New System.Windows.Forms.Button() CType(Me.dgv, System.ComponentModel.ISupportInitialize).BeginInit() Me.dgvcms.SuspendLayout() Me.SuspendLayout() @@ -56,19 +56,6 @@ Partial Class SMB Me.SitzungBeendenToolStripMenuItem.Size = New System.Drawing.Size(162, 22) Me.SitzungBeendenToolStripMenuItem.Text = "Sitzung beenden" ' - 'Refresh - ' - Me.Refresh.allowBorder = False - Me.Refresh.FlatAppearance.BorderSize = 0 - Me.Refresh.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Refresh.ForeColor = System.Drawing.Color.Black - Me.Refresh.Location = New System.Drawing.Point(1217, 852) - Me.Refresh.Name = "Refresh" - Me.Refresh.Size = New System.Drawing.Size(75, 23) - Me.Refresh.TabIndex = 1 - Me.Refresh.Text = "Refresh" - Me.Refresh.UseVisualStyleBackColor = True - ' 'counter ' Me.counter.AutoSize = True @@ -78,13 +65,22 @@ Partial Class SMB Me.counter.TabIndex = 2 Me.counter.Text = "counter" ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(1119, 851) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 23) + Me.Button1.TabIndex = 3 + Me.Button1.Text = "Refresh" + Me.Button1.UseVisualStyleBackColor = True + ' 'SMB ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1304, 887) + Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.counter) - Me.Controls.Add(Me.Refresh) Me.Controls.Add(Me.dgv) Me.Name = "SMB" Me.Text = "SMB" @@ -96,8 +92,8 @@ Partial Class SMB End Sub Friend WithEvents dgv As DataGridView - Friend WithEvents Refresh As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents counter As Label Friend WithEvents dgvcms As ContextMenuStrip Friend WithEvents SitzungBeendenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents Button1 As Button End Class diff --git a/Dokumentation/SMB.vb b/Dokumentation/SMB.vb index 381c6b6..4ba0a39 100644 --- a/Dokumentation/SMB.vb +++ b/Dokumentation/SMB.vb @@ -12,7 +12,7 @@ Public Class SMB End Sub Function LoadSitzungen() - Dim ps = cExtProgramme.RunRemotePSScript("stor10", "veragost\administrator", "+d#XisdBbSt!", "C:\Tools\SMBOpenFiles.ps1", True) + Dim ps = cExtProgramme.RunRemotePSScript("pandorasbox.verag.ost.dmn", "administrator@verag.ost.dmn", "+d#XisdBbSt!", "C:\Tools\SMBOpenFiles.ps1", True) cSMB.obj2DS(ps, ds, "SMB") End Function @@ -34,7 +34,7 @@ Public Class SMB End Function - Private Sub Refresh_Click(sender As Object, e As EventArgs) Handles Refresh.Click + Private Sub Refresh_Click(sender As Object, e As EventArgs) ds.Reset() LoadSitzungen() LoadDGV() @@ -47,5 +47,9 @@ Public Class SMB End Sub - + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + ds.Reset() + LoadSitzungen() + LoadDGV() + End Sub End Class \ No newline at end of file diff --git a/Dokumentation/uscntr_Telefon.Designer.vb b/Dokumentation/uscntr_Telefon.Designer.vb index 3a818bf..66d98e6 100644 --- a/Dokumentation/uscntr_Telefon.Designer.vb +++ b/Dokumentation/uscntr_Telefon.Designer.vb @@ -285,8 +285,6 @@ Partial Class uscntr_Telefon Me.PerformLayout() End Sub - - Friend WithEvents FlatButton1 As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents Label2 As Label Friend WithEvents TbLNotfallKontakteBindingSource As BindingSource Friend WithEvents DokuDataSet As DokuDataSet @@ -294,8 +292,6 @@ Partial Class uscntr_Telefon Friend WithEvents TbLNotfallKontakteBindingSource1 As BindingSource Friend WithEvents ComboBox1 As ComboBox Friend WithEvents Label3 As Label - Friend WithEvents btn_IT_Start_Weiterleitung As VERAG_PROG_ALLGEMEIN.FlatButton - Friend WithEvents btn_IT_Stop_Weiterleitung As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents Label1 As Label Friend WithEvents Label4 As Label Friend WithEvents CheckBox1 As CheckBox @@ -305,7 +301,10 @@ Partial Class uscntr_Telefon Friend WithEvents lbl_Zoll_Pascom As Label Friend WithEvents Label8 As Label Friend WithEvents lbl_Zoll_Datenbank As Label - Friend WithEvents btn_Zoll_weiter_setzen As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents Label10 As Label Friend WithEvents tb_Zoll_Notrufnummer As TextBox + Friend WithEvents FlatButton1 As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btn_IT_Start_Weiterleitung As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btn_IT_Stop_Weiterleitung As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btn_Zoll_weiter_setzen As VERAG_PROG_ALLGEMEIN.FlatButton End Class