Benutzerberechtigungen eingebaut
This commit is contained in:
@@ -35,7 +35,7 @@ Public Class Main
|
||||
|
||||
|
||||
Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
LblUhrzeit.Text = "Willkommen " & cSharedClasses.LoggedOnUser.Name
|
||||
LblUhrzeit.Text = "Willkommen " & Class1.LoggedOnUser.Name
|
||||
Class1.EnableDoubleBuffered(DgVMain)
|
||||
|
||||
|
||||
@@ -188,7 +188,16 @@ Public Class Main
|
||||
Catch ex As Exception
|
||||
MsgBox("DataadapterFill LstStandOrtLoad(): " & ex.Message)
|
||||
End Try
|
||||
LstStandort.SelectedItem = "Verag_SUB"
|
||||
|
||||
'MsgBox(LstStandort.Items.Count)
|
||||
If Class1.LoggedOnUser.Domäne = "verag.ost.dmn" Then
|
||||
LstStandort.SelectedItem = "Verag_SUB"
|
||||
' MsgBox("Hier")
|
||||
Else
|
||||
LstStandort.SelectedIndex = 0
|
||||
'MsgBox("Dort")
|
||||
End If
|
||||
|
||||
|
||||
Dim dsa As New DataSet()
|
||||
SQL.SQL2DS("select distinct Rubrik from tbl_allgemein", dsa)
|
||||
@@ -348,6 +357,21 @@ Public Class Main
|
||||
Suchparameter = "TYPE = '" & LstType.SelectedItem & "' AND (Type LIKE'" & suchbegriff & "'OR FQDN LIKE'" & suchbegriff & "'OR QINFO LIKE'" & suchbegriff & "'OR IPAdresse LIKE'" & suchbegriff & "'OR Modell LIKE'" & suchbegriff & "'OR Standort LIKE'" & suchbegriff & "')"
|
||||
End If
|
||||
|
||||
'''BERECHTIGUNGEN ABFRAGEN'''
|
||||
|
||||
Suchparameter &= "AND ("
|
||||
'For Each ber As cBerechtigungen In Class1.LoggedOnUserRights
|
||||
' If Not ber.Zugriff = "0" Then
|
||||
' Suchparameter &= "NWSTANDORT =" & ber.Standort & " OR "
|
||||
' End If
|
||||
'Next
|
||||
For Each ShownStandort In Class1.Standorte
|
||||
Suchparameter &= "NWSTANDORT ='" & ShownStandort & "' OR "
|
||||
Next
|
||||
Suchparameter = Suchparameter.Substring(0, Suchparameter.Length - 3)
|
||||
Suchparameter &= ")"
|
||||
|
||||
''''''''''''''''''''''''''''''''''''''''''''
|
||||
If Not ChkFreieHosts.Checked Then
|
||||
'AND (DHCP = '0' OR DHCP is Null)
|
||||
Suchparameter &= " and FQDN is not NULL"
|
||||
@@ -412,10 +436,12 @@ Public Class Main
|
||||
NetzwerkInfoAnzeige()
|
||||
Else
|
||||
Suchparameter = "(TITEL LIKE'" & suchbegriff & "'OR INFO LIKE'" & suchbegriff & "'OR LINK LIKE'" & suchbegriff & "')"
|
||||
Dim dataadapter As New SqlDataAdapter("select * from TbL_Allgemein where " & Suchparameter & "", con)
|
||||
con.Open()
|
||||
dataadapter.Fill(ds)
|
||||
con.Close()
|
||||
'Dim dataadapter As New SqlDataAdapter("select * from TbL_Allgemein where " & Suchparameter & "", con)
|
||||
'con.Open()
|
||||
'dataadapter.Fill(ds)
|
||||
'con.Close()
|
||||
SQL.SQL2DS("select * from TbL_Allgemein left join TbL_Berechtigungen on TbL_Allgemein.ID = TbL_Berechtigungen.Standort where ((Benutzeranmeldename = '" & Class1.LoggedOnUser.BenutzeranmeldeName & "' AND not Zugriff = '0') OR (Zugriff is null )) AND (Rubrik = '" & LstAllgemein.SelectedItem & "') AND " & Suchparameter & "", ds)
|
||||
|
||||
|
||||
dgvfill(ds, "Allgemein")
|
||||
' MsgBox("keine Wahl")
|
||||
@@ -557,6 +583,10 @@ Public Class Main
|
||||
.Columns("Link").Visible = False
|
||||
.Columns("LinkedWith").Visible = False
|
||||
.Columns("Titel").Width = 150
|
||||
.Columns("Zugriff").Visible = False
|
||||
.Columns("Standort").Visible = False
|
||||
.Columns("ID1").Visible = False
|
||||
.Columns("Benutzeranmeldename").Visible = False
|
||||
.Sort(DgVMain.Columns("Titel"), System.ComponentModel.ListSortDirection.Ascending)
|
||||
If ChKZugangsdaten.Checked = False Then
|
||||
.Columns("Benutzer").Visible = False
|
||||
@@ -758,7 +788,8 @@ Public Class Main
|
||||
frm.Panel1.Enabled = False : frm.PanFirewall.Enabled = False
|
||||
End If
|
||||
AddHandler frm.FormClosing, Function()
|
||||
|
||||
Me.BringToFront()
|
||||
dgvload_filter(Suchbegriff)
|
||||
End Function
|
||||
|
||||
frm.Show()
|
||||
@@ -768,11 +799,14 @@ Public Class Main
|
||||
Eintrag.ID = Class1.DBNull2emptyString(DgVMain.CurrentRow.Cells("ID").Value)
|
||||
Eintrag.rubrik = Class1.DBNull2emptyString(DgVMain.CurrentRow.Cells("Rubrik").Value)
|
||||
Eintrag.Titel = Class1.DBNull2emptyString(DgVMain.CurrentRow.Cells("Titel").Value)
|
||||
Eintrag.Berechtigung = Class1.DBNull2emptyString(DgVMain.CurrentRow.Cells("Zugriff").Value)
|
||||
Eintrag.getFromSQL()
|
||||
Dim frm As New frmAllgemeinEintrag
|
||||
frm.Eintrag = Eintrag
|
||||
|
||||
frm.Text = Eintrag.Titel
|
||||
frm.btnBerechtigungen.Enabled = Class1.LoggedOnUserisAdmin
|
||||
AddHandler frm.FormClosing, Function()
|
||||
Me.BringToFront()
|
||||
dgvload(Tabelle)
|
||||
LstAllgemein.SelectedItem = Eintrag.rubrik
|
||||
DgVMain.Rows(SelectedDGVIndex).Selected = True
|
||||
@@ -1059,23 +1093,18 @@ Public Class Main
|
||||
End Sub
|
||||
|
||||
Public Function CheckUpdate(starter As String)
|
||||
dbload()
|
||||
Dim RemoteVersion As String = ""
|
||||
LblVersion.Text = "Version: " & Version
|
||||
Try
|
||||
con.Close()
|
||||
conadmin.Open()
|
||||
cmdadmin.CommandText = "SELECT prog_aktuelleVersion FROM ADMIN.dbo.tblProgramme WHERE prog_codename= '" & My.Resources.Programmcode & "'"
|
||||
reader = cmdadmin.ExecuteReader()
|
||||
Do While reader.Read()
|
||||
RemoteVersion = reader("prog_aktuelleVersion")
|
||||
Loop
|
||||
reader.Close()
|
||||
conadmin.Close()
|
||||
Dim ds As New DataSet
|
||||
SQL.SQL2DS("SELECT prog_aktuelleVersion FROM ADMIN.dbo.tblProgramme WHERE prog_codename= '" & My.Resources.Programmcode & "'", ds)
|
||||
If ds.Tables(0).Rows.Count Then
|
||||
RemoteVersion = ds.Tables(0).Rows(0).Item(0).ToString
|
||||
End If
|
||||
Catch ex As Exception
|
||||
'reader.Close()
|
||||
MsgBox("Kann RemoteVersion nicht abfragen." & ex.Message)
|
||||
TimerUpdate.Enabled = False
|
||||
conadmin.Close()
|
||||
Exit Function
|
||||
End Try
|
||||
|
||||
@@ -1134,14 +1163,21 @@ Public Class Main
|
||||
|
||||
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnNeu.Click
|
||||
Neu = True
|
||||
Dim Eintrag As New EintragBearbeiten
|
||||
Dim frm As New frmAllgemeinEintrag
|
||||
frm.Text = "Neuer Eintrag"
|
||||
'Eintrag.Titel = Class1.DBNull2emptyString((DgVMain.CurrentRow.Cells("Titel").Value))
|
||||
If Class1.DBNull2emptyString((DgVMain.CurrentRow.Cells("Rubrik").Value)) = "" Then
|
||||
Eintrag.rubrik = Class1.DBNull2emptyString((DgVMain.Rows(0).Cells("Rubrik").Value))
|
||||
frm.Eintrag.rubrik = Class1.DBNull2emptyString((DgVMain.Rows(0).Cells("Rubrik").Value))
|
||||
Else
|
||||
Eintrag.rubrik = Class1.DBNull2emptyString((DgVMain.CurrentRow.Cells("Rubrik").Value))
|
||||
frm.Eintrag.rubrik = Class1.DBNull2emptyString((DgVMain.CurrentRow.Cells("Rubrik").Value))
|
||||
End If
|
||||
Eintrag.Show()
|
||||
AddHandler frm.FormClosing, Function()
|
||||
Me.BringToFront()
|
||||
dgvload(Tabelle)
|
||||
LstAllgemein.SelectedItem = frm.Eintrag.rubrik
|
||||
DgVMain.Rows(SelectedDGVIndex).Selected = True
|
||||
End Function
|
||||
frm.Show()
|
||||
End Sub
|
||||
|
||||
Private Sub TimerWillkommen_Tick(sender As Object, e As EventArgs) Handles TimerWillkommen.Tick
|
||||
@@ -1165,6 +1201,14 @@ Public Class Main
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub ToolStripMenuItemINFO_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItemINFO.Click
|
||||
Dim frm As New frmLeer
|
||||
frm.Text = "INFO"
|
||||
Dim usrcntrl As New uscntr_INFO
|
||||
|
||||
usrcntrl.Dock = DockStyle.Fill : frm.PanMain.Controls.Add(usrcntrl)
|
||||
frm.Show()
|
||||
End Sub
|
||||
|
||||
Private Sub ObjektLöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ObjektLöschenToolStripMenuItem.Click
|
||||
If Tabelle = "TbL_Netzwerkclients" Then
|
||||
|
||||
Reference in New Issue
Block a user