Bugfixes, "Verbesserungen"
This commit is contained in:
@@ -5,13 +5,15 @@ Public Class NWEdit
|
||||
Private cmd As New SqlCommand
|
||||
Private reader As SqlDataReader
|
||||
|
||||
Public Netzwerkname As String
|
||||
Public NWStandort As String
|
||||
Public NWName As String
|
||||
Public NWAddress As String
|
||||
'Public Netzwerkname As String
|
||||
'Public NWStandort As String
|
||||
'Public NWName As String
|
||||
'Public NWAddress As String
|
||||
|
||||
Public Neu As Boolean = False
|
||||
|
||||
Property NW As New cNetzwerk
|
||||
|
||||
Private Function dbload()
|
||||
con.ConnectionString = Class1.DBConString
|
||||
cmd.Connection = con
|
||||
@@ -20,43 +22,60 @@ Public Class NWEdit
|
||||
Private Sub NetzwerkBearbeiten_Load(sender As Object, e As EventArgs) Handles MyBase.Load
|
||||
dbload()
|
||||
LblInfo.Text = ""
|
||||
|
||||
import()
|
||||
|
||||
If Class1.DebugMode = True Then
|
||||
PanDebug.Visible = True
|
||||
End If
|
||||
If Class1.Absender = "Main" Then
|
||||
NWStandort = Main.SenderStandort
|
||||
NWName = Main.SenderNetzwerk
|
||||
Netzwerkname = Main.SenderStandort & "_" & Main.SenderNetzwerk
|
||||
'NWStandort = Main.SenderStandort
|
||||
'NWName = Main.SenderNetzwerk
|
||||
'Netzwerkname = Main.SenderStandort & "_" & Main.SenderNetzwerk
|
||||
ElseIf Class1.Absender = "Standorthinzu" Then
|
||||
Netzwerkname = Standorthinzu.NeuerStandortNameIntern
|
||||
NWStandort = Standorthinzu.NeuerStandortName
|
||||
NWName = "Intern"
|
||||
NW.Netzwerkname = Standorthinzu.NeuerStandortNameIntern
|
||||
NW.NWStandort = Standorthinzu.NeuerStandortName
|
||||
NW.NetName = "Intern"
|
||||
ElseIf Class1.Absender = "Netzwerkhinzu" Then
|
||||
Netzwerkname = NetzwerkHinzu.NeuerNetzwerkNameIntern
|
||||
NWStandort = NetzwerkAdmin.LstStandort.SelectedItem
|
||||
NWName = NetzwerkHinzu.TxtName.Text
|
||||
NW.Netzwerkname = NetzwerkHinzu.NeuerNetzwerkNameIntern
|
||||
NW.NWStandort = NetzwerkAdmin.LstStandort.SelectedItem
|
||||
NW.NetName = NetzwerkHinzu.TxtName.Text
|
||||
Else
|
||||
MsgBox("Keine Daten")
|
||||
End If
|
||||
import()
|
||||
|
||||
SubnetMask2NWBits()
|
||||
LblVLANName.Text = "Standort: " & NWStandort & " Name: " & NWName & " ändern:"
|
||||
LblTest.Text = Netzwerkname
|
||||
LblVLANName.Text = "Standort: " & NW.NWStandort & " Name: " & NW.NetName '& " ändern:"
|
||||
LblTest.Text = NW.Netzwerkname
|
||||
' PanDebug.Visible = False
|
||||
End Sub
|
||||
|
||||
''---------------------------------------------------------------------------LADEN---------------------------------------------------------------------------''
|
||||
|
||||
Private Function import()
|
||||
Try
|
||||
con.Open()
|
||||
cmd.CommandText = "SELECT * FROM Tbl_Netzwerke WHERE Netzwerkname='" & Netzwerkname & "'"
|
||||
ausgabe_Netzwerk()
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.Message)
|
||||
End Try
|
||||
'Try
|
||||
' con.Open()
|
||||
' cmd.CommandText = "SELECT * FROM Tbl_Netzwerke WHERE Netzwerkname='" & Netzwerkname & "'"
|
||||
' ausgabe_Netzwerk()
|
||||
'Catch ex As Exception
|
||||
' MsgBox(ex.Message)
|
||||
'End Try
|
||||
|
||||
'con.Close()
|
||||
' NW.getNetzwerk(NWStandort, NWName)
|
||||
|
||||
TxtNetzwerk.Text = NW.Netzwerk
|
||||
TxtSubnet.Text = NW.Subnetz
|
||||
TxtGateway.Text = NW.Gateway
|
||||
TxtDHCPBereichStart.Text = NW.DHCPStart
|
||||
TxtDHCPBereichEnde.Text = NW.DHCPEnd
|
||||
TxtDHCPServer.Text = NW.DHCPServer
|
||||
TxtDNSServer.Text = NW.DNSServer
|
||||
TxtVLAN.Text = NW.VLAN
|
||||
TxtInfo.Text = NW.Info
|
||||
ChkDHCPAnzeigen.Checked = NW.DHCPAbfragen
|
||||
|
||||
|
||||
con.Close()
|
||||
If TxtNetzwerk.Text = "" Then
|
||||
Neu = True
|
||||
Else
|
||||
@@ -64,26 +83,26 @@ Public Class NWEdit
|
||||
End If
|
||||
End Function
|
||||
|
||||
Private Function ausgabe_Netzwerk()
|
||||
Try
|
||||
reader = cmd.ExecuteReader()
|
||||
Do While reader.Read()
|
||||
TxtNetzwerk.Text = reader("Netzwerk")
|
||||
TxtSubnet.Text = reader("Subnetz")
|
||||
TxtGateway.Text = reader("Gateway")
|
||||
TxtDHCPBereichStart.Text = reader("DHCPStart")
|
||||
TxtDHCPBereichEnde.Text = reader("DHCPEnd")
|
||||
TxtDHCPServer.Text = reader("DHCPServer")
|
||||
TxtDNSServer.Text = reader("DNSServer")
|
||||
TxtVLAN.Text = reader("VLAN")
|
||||
TxtInfo.Text = reader("Info")
|
||||
ChkDHCPAnzeigen.Checked = Class1.ReadNullAs0(reader, "DHCPAbfragen")
|
||||
Loop
|
||||
reader.Close()
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.Message)
|
||||
End Try
|
||||
End Function
|
||||
'Private Function ausgabe_Netzwerk()
|
||||
' Try
|
||||
' reader = cmd.ExecuteReader()
|
||||
' Do While reader.Read()
|
||||
' TxtNetzwerk.Text = reader("Netzwerk")
|
||||
' TxtSubnet.Text = reader("Subnetz")
|
||||
' TxtGateway.Text = reader("Gateway")
|
||||
' TxtDHCPBereichStart.Text = reader("DHCPStart")
|
||||
' TxtDHCPBereichEnde.Text = reader("DHCPEnd")
|
||||
' TxtDHCPServer.Text = reader("DHCPServer")
|
||||
' TxtDNSServer.Text = reader("DNSServer")
|
||||
' TxtVLAN.Text = reader("VLAN")
|
||||
' TxtInfo.Text = reader("Info")
|
||||
' ChkDHCPAnzeigen.Checked = Class1.ReadNullAs0(reader, "DHCPAbfragen")
|
||||
' Loop
|
||||
' reader.Close()
|
||||
' Catch ex As Exception
|
||||
' MsgBox(ex.Message)
|
||||
' End Try
|
||||
'End Function
|
||||
|
||||
|
||||
|
||||
@@ -109,7 +128,7 @@ Public Class NWEdit
|
||||
If Neu = False Then
|
||||
Try
|
||||
con.Open()
|
||||
cmd.CommandText = "UPDATE TBL_Netzwerke SET Netzwerk = '" & TxtNetzwerk.Text & "', Subnetz='" & TxtSubnet.Text & "', Gateway='" & TxtGateway.Text & "',DHCPAbfragen = '" & ChkDHCPAnzeigen.Checked & "', DHCPStart='" & TxtDHCPBereichStart.Text & "', DHCPEnd='" & TxtDHCPBereichEnde.Text & "', dhcpserver='" & TxtDHCPServer.Text & "', dnsserver='" & TxtDNSServer.Text & "', VLAN='" & TxtVLAN.Text & "', Info='" & TxtInfo.Text & "', NWAddress='" & NWAddress & "' WHERE Netzwerkname='" & Netzwerkname & "'"
|
||||
cmd.CommandText = "UPDATE TBL_Netzwerke SET Netzwerk = '" & TxtNetzwerk.Text & "', Subnetz='" & TxtSubnet.Text & "', Gateway='" & TxtGateway.Text & "',DHCPAbfragen = '" & ChkDHCPAnzeigen.Checked & "', DHCPStart='" & TxtDHCPBereichStart.Text & "', DHCPEnd='" & TxtDHCPBereichEnde.Text & "', dhcpserver='" & TxtDHCPServer.Text & "', dnsserver='" & TxtDNSServer.Text & "', VLAN='" & TxtVLAN.Text & "', Info='" & TxtInfo.Text & "', NWAddress='" & NW.NWAddress & "' WHERE Netzwerkname='" & NW.Netzwerkname & "'"
|
||||
cmd.ExecuteNonQuery()
|
||||
con.Close()
|
||||
Catch ex As Exception
|
||||
@@ -117,13 +136,13 @@ Public Class NWEdit
|
||||
End Try
|
||||
ElseIf Neu = True Then
|
||||
con.Open()
|
||||
cmd.CommandText = "Insert into TBL_Netzwerke (Netzwerkname, Netzwerk, Subnetz, Gateway, DHCPStart, DHCPEnd, DHCPServer, DNSServer, VLAN, Info, NWAddress) values ('" & Main.SenderNetzwerk & "', '" & TxtNetzwerk.Text & "', '" & TxtSubnet.Text & "','" & TxtGateway.Text & "', '" & TxtDHCPBereichStart.Text & "', '" & TxtDHCPBereichEnde.Text & "', '" & TxtDHCPServer.Text & "', '" & TxtDNSServer.Text & "', '" & TxtVLAN.Text & "', '" & TxtInfo.Text & "', '" & NWAddress & "')"
|
||||
cmd.CommandText = "Insert into TBL_Netzwerke (Netzwerkname, Netzwerk, Subnetz, Gateway, DHCPStart, DHCPEnd, DHCPServer, DNSServer, VLAN, Info, NWAddress) values ('" & Main.SenderNetzwerk & "', '" & TxtNetzwerk.Text & "', '" & TxtSubnet.Text & "','" & TxtGateway.Text & "', '" & TxtDHCPBereichStart.Text & "', '" & TxtDHCPBereichEnde.Text & "', '" & TxtDHCPServer.Text & "', '" & TxtDNSServer.Text & "', '" & TxtVLAN.Text & "', '" & TxtInfo.Text & "', '" & NW.NWAddress & "')"
|
||||
cmd.ExecuteNonQuery()
|
||||
con.Close()
|
||||
End If
|
||||
Try
|
||||
|
||||
Class1.Netzwerkfuellen(TxtNetzwerk.Text, TxtNWBits.Text, NWName, NWStandort)
|
||||
Class1.Netzwerkfuellen(TxtNetzwerk.Text, TxtNWBits.Text, NW.NetName, NW.NWStandort)
|
||||
DHCPFill(TxtDHCPBereichStart.Text, TxtDHCPBereichEnde.Text, TxtNetzwerk.Text)
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.Message)
|
||||
@@ -159,12 +178,12 @@ Public Class NWEdit
|
||||
|
||||
|
||||
Public Function NWAddressGenerieren()
|
||||
NWAddress = TxtNetzwerk.Text
|
||||
NW.NWAddress = TxtNetzwerk.Text
|
||||
Try
|
||||
Do
|
||||
NWAddress = NWAddress.Remove(NWAddress.Length - 1)
|
||||
NW.NWAddress = NW.NWAddress.Remove(NW.NWAddress.Length - 1)
|
||||
|
||||
Loop Until NWAddress.Last() = "."
|
||||
Loop Until NW.NWAddress.Last() = "."
|
||||
Catch ex As Exception
|
||||
MsgBox("Fehler beim Konvertieren der Netzwerkadresse.")
|
||||
End Try
|
||||
@@ -177,7 +196,7 @@ Public Class NWEdit
|
||||
|
||||
Dim host As Integer = Class1.IP2Host(TxtNetzwerk.Text)
|
||||
NWAddressGenerieren()
|
||||
TxtHostbereich.Text = NWAddress & host + 1 & " bis " & NWAddress & host + (2 ^ hostbits) - 2
|
||||
TxtHostbereich.Text = NW.NWAddress & host + 1 & " bis " & NW.NWAddress & host + (2 ^ hostbits) - 2
|
||||
End Function
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user