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

Dokumentation/App.config

@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
     </configSections>
     <connectionStrings>
-        <add name="Dokumentation.My.MySettings.DokuConnectionString" connectionString="Data Source=sqlguide01.verag.ost.dmn;Initial Catalog=Doku;Integrated Security=True" providerName="System.Data.SqlClient" />
+        <add name="Dokumentation.My.MySettings.DokuConnectionString" connectionString="Data Source=sqlguide01.verag.ost.dmn;Initial Catalog=Doku;Integrated Security=True" providerName="System.Data.SqlClient"/>
     </connectionStrings>
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="itextsharp" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
+        <assemblyIdentity name="itextsharp" publicKeyToken="8354ae6d2174ddca" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.5.13.1" newVersion="5.5.13.1" />
+        <bindingRedirect oldVersion="0.0.0.0-5.5.13.1" newVersion="5.5.13.1"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral" />
+        <assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-6.3.10.0" newVersion="6.3.10.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.3.10.0" newVersion="6.3.10.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Dynamsoft.PDF" publicKeyToken="298ad97013b423eb" culture="neutral" />
+        <assemblyIdentity name="Dynamsoft.PDF" publicKeyToken="298ad97013b423eb" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.510" newVersion="8.0.0.510" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.510" newVersion="8.0.0.510"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="ChilkatDotNet47" publicKeyToken="eb5fc1fc52ef09bd" culture="neutral" />
+        <assemblyIdentity name="ChilkatDotNet47" publicKeyToken="eb5fc1fc52ef09bd" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-9.5.0.88" newVersion="9.5.0.88" />
+        <bindingRedirect oldVersion="0.0.0.0-9.5.0.88" newVersion="9.5.0.88"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Dynamsoft.Twain" publicKeyToken="298ad97013b423eb" culture="neutral" />
+        <assemblyIdentity name="Dynamsoft.Twain" publicKeyToken="298ad97013b423eb" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.510" newVersion="8.0.0.510" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.510" newVersion="8.0.0.510"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Dynamsoft.Forms.Viewer" publicKeyToken="298ad97013b423eb" culture="neutral" />
+        <assemblyIdentity name="Dynamsoft.Forms.Viewer" publicKeyToken="298ad97013b423eb" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.510" newVersion="8.0.0.510" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.510" newVersion="8.0.0.510"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Dynamsoft.ImageCore" publicKeyToken="298ad97013b423eb" culture="neutral" />
+        <assemblyIdentity name="Dynamsoft.ImageCore" publicKeyToken="298ad97013b423eb" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.510" newVersion="8.0.0.510" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.510" newVersion="8.0.0.510"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

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")
+    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")
-        Try
+        If debug = False Then
-            userPrincipalName = System.DirectoryServices.AccountManagement.UserPrincipal.Current.UserPrincipalName
+            Try
-            Name = System.DirectoryServices.AccountManagement.UserPrincipal.Current.Name
+                userPrincipalName = System.DirectoryServices.AccountManagement.UserPrincipal.Current.UserPrincipalName
-            Hostname = Environment.MachineName
+                Name = System.DirectoryServices.AccountManagement.UserPrincipal.Current.Name
-        Catch
+                Hostname = Environment.MachineName
-        End Try
+            Catch
-        Domäne = System.DirectoryServices.ActiveDirectory.Domain.GetCurrentDomain.ToString
+            End Try
-        BenutzeranmeldeName = Environment.UserDomainName & "\" & Environment.UserName
+            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
+        Try
-            Return ""
+            If result.Properties(Prop).Count = 0 Then
-        Else
+                Return ""
-            Return result.Properties(Prop)(0)
+            Else
-        End If
+                Return result.Properties(Prop)(0)
+            End If
+        Catch
+        End Try
 
     End Function
 

Dokumentation/Dokumentation.vbproj

@@ -11,7 +11,7 @@
     <AssemblyName>Dokumentation</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
     <IsWebBootstrapper>false</IsWebBootstrapper>
@@ -220,7 +220,8 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="VERAG_PROG_ALLGEMEIN">
+    <Reference Include="VERAG_PROG_ALLGEMEIN, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />

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 = ""
+        Dim debugtext As String = ""
-        Class1.LoggedOnUser.FillWithLoggedOnUser(True)
-        Class1.GroupUsers = uscntr_Benutzer.LoadAllGroupmembers()
-        'showusersinlist()
 
-        For Each usr As cBenutzer In Class1.GroupUsers
+        Try
-            'MsgBox(usr.msDSPrincipalName & vbCrLf & cSharedClasses.LoggedOnUser.msDSPrincipalName)
+            Class1.LoggedOnUser.FillWithLoggedOnUser(True)
-            If usr.msDSPrincipalName.ToString = Class1.LoggedOnUser.msDSPrincipalName.ToString Then
+            Class1.GroupUsers = uscntr_Benutzer.LoadAllGroupmembers()
-                ' MsgBox("Treffer!")
+            'showusersinlist()
-                Class1.LoggedOnUserRights = cBerechtigungen.ReadAll(Class1.LoggedOnUser.BenutzeranmeldeName)
+
-                gefunden = True
+            For Each usr As cBenutzer In Class1.GroupUsers
-                LoadUSRID()
+                'MsgBox(usr.msDSPrincipalName & vbCrLf & cSharedClasses.LoggedOnUser.msDSPrincipalName)
-                ShowMain()
+                If usr.msDSPrincipalName.ToString = Class1.LoggedOnUser.msDSPrincipalName.ToString Then
-                Me.Hide()
+                    ' MsgBox("Treffer!")
-                Exit For
+                    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
+    'Function getLDAPPAth(ByVal DomainName As String) As String
-        Select Case DomainName
+    '    Select Case DomainName
-            Case "VERAGOST"
+    '        Case "VERAGOST"
-            Case "VERAG-NCTS"
+    '        Case "VERAG-NCTS"
-            Case ""
+    '        Case ""
-        End Select
+    '    End Select
-    End Function
+    'End Function
 
     Function ShowMain(Optional ByVal MessageActivated As Boolean = True)
         Dim main As New Main

Dokumentation/My Project/Resources.Designer.vb

@@ -309,7 +309,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 0.0.1.96 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 0.0.1.98 ähnelt.
         '''</summary>
         Friend ReadOnly Property Version() As String
             Get

Dokumentation/My Project/Resources.resx

@@ -149,7 +149,7 @@
     <value>..\Resources\external-content.duckduckgo.com.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>0.0.1.96</value>
+    <value>0.0.1.98</value>
   </data>
   <data name="mstsc1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\mstsc1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

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

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

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