diff --git a/Dokumentation/Classes/Class1.vb b/Dokumentation/Classes/Class1.vb index cdd49ad..7c1286f 100644 --- a/Dokumentation/Classes/Class1.vb +++ b/Dokumentation/Classes/Class1.vb @@ -21,8 +21,10 @@ Public Class Class1 Public Shared DebugText As String = "" Public Shared GroupUsers As List(Of cBenutzer) Public Shared dtSuchergebnis As DataTable + Public Shared TeamviewerToken As String = "6920997-rtea7sZy35Ujw2Erm3OP" Public Shared HostList As New List(Of String) + Public Shared TerminalServerList As New List(Of String) Public Shared Sub EnableDoubleBuffered(ByVal dgv As DataGridView) @@ -33,6 +35,7 @@ Public Class Class1 End Sub Public Shared Function CheckDebug() + Dim Debugoverride As Boolean = True 'wenn True dann Override auf Produktiv! Dim Startparameter As String = "" Dim i As Integer For Each s As String In Environment.GetCommandLineArgs @@ -45,15 +48,13 @@ Public Class Class1 i += 1 Next - If Main.sAppPath Like "*\bin\Debug" Or Startparameter = "debug" Then + If (Main.sAppPath Like "*\bin\Debug" Or Startparameter = "debug") And Debugoverride = False Then DebugMode = True Class1.DBConString = "Server=DEVELOPER.verag.ost.dmn\DEVSQL;Initial Catalog=Doku;User ID=sa;Password=BmWr501956;Connection Timeout=5;" Class1.FilePath = "\\192.168.0.253\backup\temp_Sebastian\DokuTest" Else - 'Class1.DBConString = "Server=192.168.0.94\SQLEXPRESS;Initial Catalog=Doku;User ID=sa;Password=BmWr501956;Connection Timeout=5;" Class1.DBConString = "Server=buchhaltung.verag.ost.dmn\SQLEXPRESS;Initial Catalog=Doku;User ID=sa;Password=BmWr501956;Connection Timeout=5;" - 'Class1.FilePath = "\\192.168.0.90\f\EDV-Wartung\Dokumentation" Class1.FilePath = "\\DEVELOPER.verag.ost.dmn\f\EDV-Wartung\Dokumentation" End If End Function @@ -131,6 +132,52 @@ Public Class Class1 End Try End Function + Public Shared Function datatable_2_csv_export(dt As DataTable) + Dim savefiledialog As New SaveFileDialog + Dim firstin As String + Dim out As String + Dim in2 As String + Dim header As String + + savefiledialog.Filter = "CSV files (*.csv)|*.CSV" + savefiledialog.InitialDirectory = "C:\Verag" + savefiledialog.ShowDialog() + + + Try + For r As Integer = 0 To dt.Rows.Count - 1 + For c As Integer = 0 To dt.Columns.Count - 1 + 'test &= r & c & vbCrLf + Try + 'test &= Replace(quelldgv.Rows(r).Cells(c).Value.ToString, vbCrLf, "vbCrlLf") + firstin = dt.Rows(r).Item(c).ToString + firstin = Replace(firstin, ";", ",") + 'in2 = """" & firstin & """" & ";" + in2 = firstin & ";" + out &= Replace(in2, vbCrLf, "##vbCrLf##") + Catch ex As Exception + MsgBox(ex.Message) + out &= "ooo" + End Try + + Next + + out &= "nZ" + Next + For c As Integer = 0 To dt.Columns.Count - 1 + header &= dt.Columns(c).ColumnName & ";" + Next + out = Replace(out, "nZ", vbCrLf) + 'MsgBox(out) + Using sw As New IO.StreamWriter(savefiledialog.FileName) + sw.WriteLine(header) + sw.WriteLine(out) + End Using + Catch ex As Exception + MsgBox("datatable_2_csv_export: " & ex.Message) + End Try + End Function + Public Shared Function hochkomma(textin As String) Dim textout As String = textin.Replace("'", "''") Return (textout) diff --git a/Dokumentation/Classes/Ext_Programme.vb b/Dokumentation/Classes/Ext_Programme.vb index 8dd61d3..fc9752b 100644 --- a/Dokumentation/Classes/Ext_Programme.vb +++ b/Dokumentation/Classes/Ext_Programme.vb @@ -43,11 +43,24 @@ End Try End Function - Public Shared Function pingip(ip As String) + Public Shared Function pingip(ip As String, Optional ByVal Argument As String = "") Dim ping As New Process ping.StartInfo.FileName = "cmd.exe" - ping.StartInfo.Arguments = " /k ping " & ip + ping.StartInfo.Arguments = " /k ping " & ip & Argument ping.Start() End Function + Public Shared Function msgsend(argumente As String) + Try + Dim msg As New Process + System.IO.File.WriteAllBytes("msg.exe", My.Resources.msg) + msg.StartInfo.FileName = "msg.exe" + 'msg.StartInfo.WorkingDirectory = "C:\Windows\System32\" + msg.StartInfo.Arguments = argumente + msg.Start() + Catch ex As Exception + MsgBox(ex.Message) + End Try + End Function + End Class diff --git a/Dokumentation/Classes/cBenutzer.vb b/Dokumentation/Classes/cBenutzer.vb index 15e8190..56f7906 100644 --- a/Dokumentation/Classes/cBenutzer.vb +++ b/Dokumentation/Classes/cBenutzer.vb @@ -117,7 +117,7 @@ Public Class cBenutzer Function isDokuAdmin() As Boolean Dim ds As New DataSet - SQL.SQL2DS("select * from TbL_Berechtigungen where Benutzeranmeldename = '" & Me.BenutzeranmeldeName & "' AND Standort = 'DokuAdmin'", ds) + cSQL.SQL2DS("select * from TbL_Berechtigungen where Benutzeranmeldename = '" & Me.BenutzeranmeldeName & "' AND Standort = 'DokuAdmin'", ds) If ds.Tables(0).Rows.Count > 0 Then Return True Else diff --git a/Dokumentation/Classes/cBerechtigungen.vb b/Dokumentation/Classes/cBerechtigungen.vb index 6667e04..8ea923d 100644 --- a/Dokumentation/Classes/cBerechtigungen.vb +++ b/Dokumentation/Classes/cBerechtigungen.vb @@ -23,7 +23,7 @@ Public Class cBerechtigungen Public Function getFromSQL() '(ip As String) Dim ds As New DataSet Dim test As String = "" - SQL.SQL2DS("SELECT * FROM TbL_Berechtigungen WHERE BENUTZERANMELDENAME = '" & Benutzeranmeldename & "' AND Standort = '" & Standort & "'", ds) + cSQL.SQL2DS("SELECT * FROM TbL_Berechtigungen WHERE BENUTZERANMELDENAME = '" & Benutzeranmeldename & "' AND Standort = '" & Standort & "'", ds) If ds.Tables(0).Rows.Count > 0 Then For Each c As DataColumn In ds.Tables(0).Columns Dim propInfo As PropertyInfo = Me.GetType.GetProperty(c.ColumnName) @@ -42,7 +42,7 @@ Public Class cBerechtigungen Function checkExist() '(ByVal ip As String) Dim ds As New DataSet - SQL.SQL2DS("SELECT * FROM TbL_Berechtigungen WHERE BENUTZERANMELDENAME = '" & Benutzeranmeldename & "' AND Standort = '" & Standort & "'", ds) + cSQL.SQL2DS("SELECT * FROM TbL_Berechtigungen WHERE BENUTZERANMELDENAME = '" & Benutzeranmeldename & "' AND Standort = '" & Standort & "'", ds) If ds.Tables(0).Rows.Count > 0 Then MeExist = True Return True @@ -67,7 +67,7 @@ Public Class cBerechtigungen End If Next update = update.Substring(0, update.Length - 1) - SQL.UpdateSQL("TbL_Berechtigungen", update, where) + cSQL.UpdateSQL("TbL_Berechtigungen", update, where) Else Me.ID = Guid.NewGuid().ToString("N") Dim Spalten As String = "" @@ -83,7 +83,7 @@ Public Class cBerechtigungen Spalten = Spalten.Substring(0, Spalten.Length - 1) Werte = Werte.Substring(0, Werte.Length - 1) - SQL.InsertSQL("TbL_Berechtigungen", "(" & Spalten & ") VALUES (" & Werte & ")") + cSQL.InsertSQL("TbL_Berechtigungen", "(" & Spalten & ") VALUES (" & Werte & ")") MeExist = True End If End Function @@ -92,7 +92,7 @@ Public Class cBerechtigungen Try Dim ToR As New List(Of cBerechtigungen) ' ToR -> Table of Rights *Badum Tss* Dim ds As New DataSet - SQL.SQL2DS("SELECT * FROM TbL_Berechtigungen WHERE BENUTZERANMELDENAME = '" & Benutzeranmeldename & "'", ds) + cSQL.SQL2DS("SELECT * FROM TbL_Berechtigungen WHERE BENUTZERANMELDENAME = '" & Benutzeranmeldename & "'", ds) If ds.Tables(0).Rows.Count > 0 Then For Each row As DataRow In ds.Tables(0).Rows Dim R As New cBerechtigungen @@ -111,7 +111,7 @@ Public Class cBerechtigungen Public Shared Function BenutzerBerechtigungfuerStandort(ByVal Benutzer As String, ByVal Standort As String) Dim ds As New DataSet - SQL.SQL2DS("SELECT ZUGRIFF FROM TbL_Berechtigungen WHERE BENUTZERANMELDENAME = '" & Benutzer & "' AND Standort = '" & Standort & "'", ds) + cSQL.SQL2DS("SELECT ZUGRIFF FROM TbL_Berechtigungen WHERE BENUTZERANMELDENAME = '" & Benutzer & "' AND Standort = '" & Standort & "'", ds) If ds.Tables(0).Rows.Count > 0 Then Return ds.Tables(0).Rows(0).Item(0).ToString Else @@ -122,7 +122,7 @@ Public Class cBerechtigungen Public Shared Function BenutzerBerechtigungfuerID(ByVal Benutzer As String, ByVal ID As String) Dim ds As New DataSet - SQL.SQL2DS("SELECT ZUGRIFF FROM TbL_Berechtigungen WHERE BENUTZERANMELDENAME = '" & Benutzer & "' AND ID = '" & ID & "'", ds) + cSQL.SQL2DS("SELECT ZUGRIFF FROM TbL_Berechtigungen WHERE BENUTZERANMELDENAME = '" & Benutzer & "' AND ID = '" & ID & "'", ds) If ds.Tables(0).Rows.Count > 0 Then Return ds.Tables(0).Rows(0).Item(0).ToString Else diff --git a/Dokumentation/Classes/cEintrag.vb b/Dokumentation/Classes/cEintrag.vb index 9902b02..42991de 100644 --- a/Dokumentation/Classes/cEintrag.vb +++ b/Dokumentation/Classes/cEintrag.vb @@ -33,7 +33,7 @@ Public Class cEintrag Dim ds As New DataSet Dim test As String = "" Try - SQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE ID = '" & Me.ID & "'", ds) + cSQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE ID = '" & Me.ID & "'", ds) If ds.Tables(0).Rows.Count > 0 Then For Each c As DataColumn In ds.Tables(0).Columns Dim propInfo As PropertyInfo = Me.GetType.GetProperty(c.ColumnName) @@ -45,7 +45,7 @@ Public Class cEintrag Next Else ds.Clear() - SQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE Rubrik = '" & rubrik & "' AND Titel = '" & Titel & "'", ds) + cSQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE Rubrik = '" & rubrik & "' AND Titel = '" & Titel & "'", ds) For Each c As DataColumn In ds.Tables(0).Columns Dim propInfo As PropertyInfo = Me.GetType.GetProperty(c.ColumnName) If propInfo IsNot Nothing Then @@ -78,7 +78,7 @@ Public Class cEintrag Spalten = Spalten.Substring(0, Spalten.Length - 1) Werte = Werte.Substring(0, Werte.Length - 1) - SQL.InsertSQL("TbL_Allgemein", "(" & Spalten & ") VALUES (" & Werte & ")") + cSQL.InsertSQL("TbL_Allgemein", "(" & Spalten & ") VALUES (" & Werte & ")") ElseIf checkExist() And NewID = True Then ''----------------------------------------bestehender Eintrag ohne ID Dim UpdateString As String = "" Dim WhereString As String = "" @@ -90,7 +90,7 @@ Public Class cEintrag Next UpdateString = UpdateString.Substring(0, UpdateString.Length - 1) 'wg. ',' - SQL.UpdateSQL("TbL_Allgemein", UpdateString, "Rubrik = '" & rubrik & "' AND Titel = '" & Titel & "'") + cSQL.UpdateSQL("TbL_Allgemein", UpdateString, "Rubrik = '" & rubrik & "' AND Titel = '" & Titel & "'") NewID = False ElseIf checkExist() And NewID = False Then ''----------------------------------------bestehender Eintrag mit bestehender ID Dim UpdateString As String = "" @@ -103,19 +103,19 @@ Public Class cEintrag Next UpdateString = UpdateString.Substring(0, UpdateString.Length - 1) 'wg. ',' - SQL.UpdateSQL("TbL_Allgemein", UpdateString, "ID = '" & ID & "'") + cSQL.UpdateSQL("TbL_Allgemein", UpdateString, "ID = '" & ID & "'") End If End Function Function checkExist() '(ByVal ip As String) Dim ds As New DataSet - SQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE ID = '" & Me.ID & "'", ds) + cSQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE ID = '" & Me.ID & "'", ds) If ds.Tables(0).Rows.Count > 0 Then Return True Else ds.Clear() - SQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE Rubrik = '" & rubrik & "' AND Titel = '" & Titel & "'", ds) + cSQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE Rubrik = '" & rubrik & "' AND Titel = '" & Titel & "'", ds) If ds.Tables(0).Rows.Count > 0 Then Return True Else diff --git a/Dokumentation/Classes/cFirewallEntry.vb b/Dokumentation/Classes/cFirewallEntry.vb index e3fb28d..7655fed 100644 --- a/Dokumentation/Classes/cFirewallEntry.vb +++ b/Dokumentation/Classes/cFirewallEntry.vb @@ -46,7 +46,7 @@ Public Class cFirewallEntry From [Doku].[dbo].[TbL_FirewallRules] where [fwr_hostip] = '" & HostIP & "' ORDER BY [fwr_in]" - SQL.SQL2DS(selector, ds) + cSQL.SQL2DS(selector, ds) End Function @@ -86,13 +86,13 @@ ORDER BY [fwr_in]" Public Function insertFirewallEntry(ByRef entry As cFirewallEntry) Dim insert As String getInsertCmd(insert) - SQL.InsertSQL("TbL_FirewallRules", insert) + cSQL.InsertSQL("TbL_FirewallRules", insert) End Function Public Function updateFirewallEntry(ByRef entry As cFirewallEntry) Dim update, where As String getUpdateCmd(update, where) - SQL.UpdateSQL("TbL_FirewallRules", update, where) + cSQL.UpdateSQL("TbL_FirewallRules", update, where) 'MsgBox(update & where) End Function diff --git a/Dokumentation/Classes/cHost.vb b/Dokumentation/Classes/cHost.vb index ebee195..9e7d95a 100644 --- a/Dokumentation/Classes/cHost.vb +++ b/Dokumentation/Classes/cHost.vb @@ -119,14 +119,14 @@ Public Class cHost From [Doku].[dbo].[TbL_FirewallRules] where [fwr_hostip] = '" & HostIP & "' ORDER BY [fwr_in]" - SQL.SQL2DS(selector, ds) + cSQL.SQL2DS(selector, ds) End Function Public Function gethost(ip As String) Dim ds As New DataSet Dim test As String = "" - SQL.SQL2DS("select * from TbL_Netzwerkclients where IPAdresse = '" & ip & "'", ds) + cSQL.SQL2DS("select * from TbL_Netzwerkclients where IPAdresse = '" & ip & "'", ds) For Each c As DataColumn In ds.Tables(0).Columns Dim propInfo As PropertyInfo = Me.GetType.GetProperty(c.ColumnName) If propInfo IsNot Nothing Then @@ -194,15 +194,15 @@ ORDER BY [fwr_in]" Public Function updateHostEntry(ByRef entry As cHost) Dim update, where, slaveupdate, slavewhere As String getUpdateCmd(update, where, slaveupdate, slavewhere, Me.Linked) - SQL.UpdateSQL("TbL_Netzwerkclients", update, where) - SQL.UpdateSQL("TbL_Netzwerkclients", slaveupdate, slavewhere) + cSQL.UpdateSQL("TbL_Netzwerkclients", update, where) + cSQL.UpdateSQL("TbL_Netzwerkclients", slaveupdate, slavewhere) 'MsgBox(update & where) End Function Function checkIfIPExist(ByVal ip As String) Dim ds As New DataSet - SQL.SQL2DS("SELECT * FROM TbL_Netzwerkclients WHERE IPADRESSE = '" & ip & "'", ds) + cSQL.SQL2DS("SELECT * FROM TbL_Netzwerkclients WHERE IPADRESSE = '" & ip & "'", ds) If ds.Tables(0).Rows.Count > 0 Then Return True Else @@ -215,7 +215,7 @@ ORDER BY [fwr_in]" If MessageBox.Show("Eintrag " & Me.FQDN & " wirklich löschen?", "Hosteintrag löschen", MessageBoxButtons.OKCancel) = DialogResult.OK Then Dim ds As New DataSet Dim Slaves As String = "" - SQL.SQL2DS("SELECT * FROM TbL_Netzwerkclients WHERE LinkedWith ='" & Me.IPAdresse & "'", ds) + cSQL.SQL2DS("SELECT * FROM TbL_Netzwerkclients WHERE LinkedWith ='" & Me.IPAdresse & "'", ds) If ds.Tables(0).Rows.Count > 0 Then For Each r As DataRow In ds.Tables(0).Rows @@ -225,18 +225,18 @@ ORDER BY [fwr_in]" If MessageBox.Show(" Achtung! " & vbCrLf & "Der Eintrag " & Me.FQDN & " ist ein MasterEintrag für die IP Adressen " & vbCrLf & Slaves & " Diese Einträge werden ebenfalls gelöscht. Fortfahren?", "Hosteintrag löschen", MessageBoxButtons.OKCancel) = DialogResult.OK Then - SQL.DeleteSQL("TbL_Netzwerkclients", "LinkedWith = '" & Me.IPAdresse & "'") + cSQL.DeleteSQL("TbL_Netzwerkclients", "LinkedWith = '" & Me.IPAdresse & "'") ElseIf DialogResult.Cancel Then Exit Function End If End If - SQL.DeleteSQL("TbL_Netzwerkclients", "IPAdresse = '" & Me.IPAdresse & "'") + cSQL.DeleteSQL("TbL_Netzwerkclients", "IPAdresse = '" & Me.IPAdresse & "'") Class1.RefillNW(Me.Netzwerk) ElseIf DialogResult.Cancel Then Exit Function End If Else - SQL.DeleteSQL("TbL_Netzwerkclients", "IPAdresse = '" & Me.IPAdresse & "'") + cSQL.DeleteSQL("TbL_Netzwerkclients", "IPAdresse = '" & Me.IPAdresse & "'") Class1.RefillNW(Me.Netzwerk) End If @@ -251,7 +251,7 @@ Diese Einträge werden ebenfalls gelöscht. Fortfahren?", "Hosteintrag löschen" 'Get Slaves of LinkedMaster Dim ds As New DataSet - SQL.SQL2DS("SELECT * FROM TbL_Netzwerkclients WHERE LinkedWith = '" & Me.IPAdresse & "'", ds) + cSQL.SQL2DS("SELECT * FROM TbL_Netzwerkclients WHERE LinkedWith = '" & Me.IPAdresse & "'", ds) 'Ziel prüfen und gegebenenfalls anzeigen If ( @@ -269,7 +269,7 @@ Diese Einträge werden ebenfalls gelöscht. Fortfahren?", "Hosteintrag löschen" 'If Host = LinkedMaster then Update Slaves If ds.Tables(0).Rows.Count > 0 Then - SQL.UpdateSQL("TbL_Netzwerkclients", "LinkedWith = '" & newip & "'", "LinkedWith = '" & oldip & "'") + cSQL.UpdateSQL("TbL_Netzwerkclients", "LinkedWith = '" & newip & "'", "LinkedWith = '" & oldip & "'") End If newhost.FQDN = Me.FQDN @@ -291,7 +291,7 @@ Diese Einträge werden ebenfalls gelöscht. Fortfahren?", "Hosteintrag löschen" Dim update, where As String getUpdateCmd(update, where, "", "", newhost.Linked, newhost) - SQL.UpdateSQL("TbL_Netzwerkclients", update, where) + cSQL.UpdateSQL("TbL_Netzwerkclients", update, where) cFolder.FolderMove(Me.NWSTANDORT & "_" & Me.NETNAME, Me.HOST, newhost.NWSTANDORT & "_" & newhost.NETNAME, newhost.HOST) @@ -302,7 +302,7 @@ Diese Einträge werden ebenfalls gelöscht. Fortfahren?", "Hosteintrag löschen" Public Shared Function getSlaves(ByVal ip As String, ByRef ds As DataSet) - SQL.SQL2DS("SELECT IPAdresse , (NWSTANDORT + ' ' + NETNAME) as Netzwerk FROM TbL_Netzwerkclients WHERE LinkedWith = '" & ip & "'", ds) + cSQL.SQL2DS("SELECT IPAdresse , (NWSTANDORT + ' ' + NETNAME) as Netzwerk FROM TbL_Netzwerkclients WHERE LinkedWith = '" & ip & "'", ds) End Function diff --git a/Dokumentation/Classes/cNetzwerk.vb b/Dokumentation/Classes/cNetzwerk.vb index 3c3e4b2..e2301eb 100644 --- a/Dokumentation/Classes/cNetzwerk.vb +++ b/Dokumentation/Classes/cNetzwerk.vb @@ -42,7 +42,7 @@ Public Class cNetzwerk Public Function getNetzwerk(nwstandort_ As String, netname_ As String) Dim ds As New DataSet ' Dim test As String = "" - SQL.SQL2DS("select * from TbL_Netzwerke where Netzwerkname = '" & nwstandort_ & "_" & netname_ & "'", ds) + cSQL.SQL2DS("select * from TbL_Netzwerke where Netzwerkname = '" & nwstandort_ & "_" & netname_ & "'", ds) For Each c As DataColumn In ds.Tables(0).Columns Dim propInfo As PropertyInfo = Me.GetType.GetProperty(c.ColumnName) If propInfo IsNot Nothing Then diff --git a/Dokumentation/Classes/SQL.vb b/Dokumentation/Classes/cSQL.vb similarity index 99% rename from Dokumentation/Classes/SQL.vb rename to Dokumentation/Classes/cSQL.vb index 1f7f98c..6bd027a 100644 --- a/Dokumentation/Classes/SQL.vb +++ b/Dokumentation/Classes/cSQL.vb @@ -1,6 +1,6 @@ Imports System.Data.SqlClient -Public Class SQL +Public Class cSQL Public Shared Sub SQL2DS(ByRef selector As String, ByRef ds As DataSet) Dim con As New SqlConnection diff --git a/Dokumentation/Classes/cTSUser.vb b/Dokumentation/Classes/cTSUser.vb new file mode 100644 index 0000000..4cffad9 --- /dev/null +++ b/Dokumentation/Classes/cTSUser.vb @@ -0,0 +1,17 @@ +Public Class cTSUser + + Property BenutzerAnmeldeName As String = "" + Property Name As String = "" + Property TeamviewerID As Integer = Nothing + Property LastLogonTime As DateTime = Nothing + Property LastReport As DateTime = Nothing + Property TSServer As String = "" + Property NameKurz As String = "" + + + Public Function genNameKurz() + Dim i As Integer = Me.BenutzerAnmeldeName.IndexOf("\") + Me.NameKurz = Me.BenutzerAnmeldeName.Substring(i + 1, Me.BenutzerAnmeldeName.Length - (i + 1)) + End Function + +End Class diff --git a/Dokumentation/Dokumentation.vbproj b/Dokumentation/Dokumentation.vbproj index 8dc0cd4..3d83cf7 100644 --- a/Dokumentation/Dokumentation.vbproj +++ b/Dokumentation/Dokumentation.vbproj @@ -155,12 +155,19 @@ + frmAllgemeinEintrag.vb Form + + uscntr_TSSitzungen.vb + + + UserControl + uscntr_FunktionAdmin.vb @@ -181,7 +188,7 @@ - + frmPrint.vb @@ -301,6 +308,12 @@ UserControl + + uscntr_SendMSG.vb + + + UserControl + uscntr_Slaves.vb @@ -313,6 +326,12 @@ UserControl + + uscntr_TSServer.vb + + + UserControl + @@ -330,6 +349,9 @@ frmAllgemeinEintrag.vb + + uscntr_TSSitzungen.vb + uscntr_FunktionAdmin.vb @@ -394,9 +416,15 @@ uscntr_INFO.vb + + uscntr_SendMSG.vb + uscntr_Slaves.vb + + uscntr_TSServer.vb + @@ -420,9 +448,12 @@ + + + diff --git a/Dokumentation/Login/Login.vb b/Dokumentation/Login/Login.vb index afa12a2..5347a03 100644 --- a/Dokumentation/Login/Login.vb +++ b/Dokumentation/Login/Login.vb @@ -207,10 +207,12 @@ Public Class Login Class1.LoggedOnUserisAdmin = True main.BenutzerToolStripMenuItem.Enabled = True main.NetzwerkeToolStripMenuItem.Enabled = True + main.AllesSichernCSVToolStripMenuItem.Enabled = True Exit For Else main.BenutzerToolStripMenuItem.Enabled = False main.NetzwerkeToolStripMenuItem.Enabled = False + main.AllesSichernCSVToolStripMenuItem.Enabled = False End If Next diff --git a/Dokumentation/Main.Designer.vb b/Dokumentation/Main.Designer.vb index 840f3a0..2e49429 100644 --- a/Dokumentation/Main.Designer.vb +++ b/Dokumentation/Main.Designer.vb @@ -50,12 +50,14 @@ Partial Class Main Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ImportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.BenutzerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AllesSichernCSVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.UpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ExitToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItemINFO = New System.Windows.Forms.ToolStripMenuItem() Me.Panel3 = New System.Windows.Forms.Panel() + Me.chkTSSitzungen = New System.Windows.Forms.CheckBox() Me.lblCount = New System.Windows.Forms.Label() Me.btnNeu = New System.Windows.Forms.Button() Me.ChkDHCPClients = New System.Windows.Forms.CheckBox() @@ -90,8 +92,9 @@ Partial Class Main Me.ToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PuttyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PingToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() + Me.PingtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PanTools = New System.Windows.Forms.Panel() + Me.CmdPintT = New System.Windows.Forms.Button() Me.btnTest3 = New System.Windows.Forms.Button() Me.LblDebugInfo = New System.Windows.Forms.Label() Me.CmdPing = New System.Windows.Forms.Button() @@ -99,6 +102,7 @@ Partial Class Main Me.TimerUhrzeit = New System.Windows.Forms.Timer(Me.components) Me.TimerUpdate = New System.Windows.Forms.Timer(Me.components) Me.TimerWillkommen = New System.Windows.Forms.Timer(Me.components) + Me.panTSSitzungen = New System.Windows.Forms.Panel() Me.Panel2.SuspendLayout() Me.Panel4.SuspendLayout() Me.PanType.SuspendLayout() @@ -122,7 +126,7 @@ Partial Class Main Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1477, 130) + Me.Panel2.Size = New System.Drawing.Size(1581, 130) Me.Panel2.TabIndex = 1 ' 'Panel4 @@ -141,7 +145,7 @@ Partial Class Main Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(272, 24) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1205, 106) + Me.Panel4.Size = New System.Drawing.Size(1309, 106) Me.Panel4.TabIndex = 14 ' 'LblDEBUGMODE @@ -159,7 +163,7 @@ Partial Class Main ' Me.LblVersion.Anchor = System.Windows.Forms.AnchorStyles.Right Me.LblVersion.AutoSize = True - Me.LblVersion.Location = New System.Drawing.Point(858, 81) + Me.LblVersion.Location = New System.Drawing.Point(962, 81) Me.LblVersion.Name = "LblVersion" Me.LblVersion.Size = New System.Drawing.Size(42, 13) Me.LblVersion.TabIndex = 17 @@ -180,7 +184,7 @@ Partial Class Main Me.CmdSucheReset.BackColor = System.Drawing.SystemColors.ControlLightLight Me.CmdSucheReset.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.CmdSucheReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.CmdSucheReset.Location = New System.Drawing.Point(709, 71) + Me.CmdSucheReset.Location = New System.Drawing.Point(813, 71) Me.CmdSucheReset.Name = "CmdSucheReset" Me.CmdSucheReset.Size = New System.Drawing.Size(121, 23) Me.CmdSucheReset.TabIndex = 15 @@ -191,7 +195,7 @@ Partial Class Main ' Me.TxtSuche.Anchor = System.Windows.Forms.AnchorStyles.Right Me.TxtSuche.BackColor = System.Drawing.SystemColors.ControlLightLight - Me.TxtSuche.Location = New System.Drawing.Point(523, 23) + Me.TxtSuche.Location = New System.Drawing.Point(627, 23) Me.TxtSuche.Name = "TxtSuche" Me.TxtSuche.Size = New System.Drawing.Size(138, 20) Me.TxtSuche.TabIndex = 3 @@ -200,9 +204,10 @@ Partial Class Main ' Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Right Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(476, 26) + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(580, 26) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(41, 13) + Me.Label1.Size = New System.Drawing.Size(47, 13) Me.Label1.TabIndex = 4 Me.Label1.Text = "Suche:" ' @@ -211,7 +216,7 @@ Partial Class Main Me.PanType.Anchor = System.Windows.Forms.AnchorStyles.Right Me.PanType.Controls.Add(Me.LstType) Me.PanType.Controls.Add(Me.Label2) - Me.PanType.Location = New System.Drawing.Point(667, 5) + Me.PanType.Location = New System.Drawing.Point(771, 5) Me.PanType.Name = "PanType" Me.PanType.Size = New System.Drawing.Size(183, 41) Me.PanType.TabIndex = 12 @@ -228,9 +233,10 @@ Partial Class Main 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(11, 21) + Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label2.Location = New System.Drawing.Point(3, 21) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(34, 13) + Me.Label2.Size = New System.Drawing.Size(39, 13) Me.Label2.TabIndex = 9 Me.Label2.Text = "Type:" ' @@ -238,7 +244,7 @@ Partial Class Main ' Me.PictureBox1.Anchor = System.Windows.Forms.AnchorStyles.Right Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image) - Me.PictureBox1.Location = New System.Drawing.Point(861, 2) + Me.PictureBox1.Location = New System.Drawing.Point(965, 2) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(333, 67) Me.PictureBox1.TabIndex = 1 @@ -250,7 +256,7 @@ Partial Class Main Me.PanSuche.Controls.Add(Me.RadGlobal) Me.PanSuche.Controls.Add(Me.RadNurNetzwerk) Me.PanSuche.Controls.Add(Me.RadStandort) - Me.PanSuche.Location = New System.Drawing.Point(523, 49) + Me.PanSuche.Location = New System.Drawing.Point(627, 49) Me.PanSuche.Name = "PanSuche" Me.PanSuche.Size = New System.Drawing.Size(314, 31) Me.PanSuche.TabIndex = 11 @@ -290,7 +296,7 @@ Partial Class Main 'LblUhrzeit ' Me.LblUhrzeit.Anchor = System.Windows.Forms.AnchorStyles.Left - Me.LblUhrzeit.Location = New System.Drawing.Point(946, 81) + Me.LblUhrzeit.Location = New System.Drawing.Point(1051, 81) Me.LblUhrzeit.Name = "LblUhrzeit" Me.LblUhrzeit.Size = New System.Drawing.Size(235, 13) Me.LblUhrzeit.TabIndex = 7 @@ -322,13 +328,13 @@ Partial Class Main Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ToolStripMenuItem2, Me.ToolStripMenuItemINFO}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.Size = New System.Drawing.Size(1477, 24) + Me.MenuStrip1.Size = New System.Drawing.Size(1581, 24) Me.MenuStrip1.TabIndex = 2 Me.MenuStrip1.Text = "MenuStrip1" ' 'ToolStripMenuItem1 ' - Me.ToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NetzwerkeToolStripMenuItem, Me.AnsichtDruckenToolStripMenuItem, Me.ExportToolStripMenuItem, Me.ImportToolStripMenuItem, Me.BenutzerToolStripMenuItem, Me.ToolStripSeparator1, Me.UpdateToolStripMenuItem, Me.ExitToolStripMenuItem}) + Me.ToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NetzwerkeToolStripMenuItem, Me.AnsichtDruckenToolStripMenuItem, Me.ExportToolStripMenuItem, Me.ImportToolStripMenuItem, Me.BenutzerToolStripMenuItem, Me.AllesSichernCSVToolStripMenuItem, Me.ToolStripSeparator1, Me.UpdateToolStripMenuItem, Me.ExitToolStripMenuItem}) Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" Me.ToolStripMenuItem1.Size = New System.Drawing.Size(50, 20) Me.ToolStripMenuItem1.Text = "Extras" @@ -363,6 +369,12 @@ Partial Class Main Me.BenutzerToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.BenutzerToolStripMenuItem.Text = "Benutzer" ' + 'AllesSichernCSVToolStripMenuItem + ' + Me.AllesSichernCSVToolStripMenuItem.Name = "AllesSichernCSVToolStripMenuItem" + Me.AllesSichernCSVToolStripMenuItem.Size = New System.Drawing.Size(176, 22) + Me.AllesSichernCSVToolStripMenuItem.Text = "Alles Sichern (CSV)" + ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" @@ -395,6 +407,7 @@ Partial Class Main 'Panel3 ' Me.Panel3.BackColor = System.Drawing.SystemColors.GradientInactiveCaption + Me.Panel3.Controls.Add(Me.chkTSSitzungen) Me.Panel3.Controls.Add(Me.lblCount) Me.Panel3.Controls.Add(Me.btnNeu) Me.Panel3.Controls.Add(Me.ChkDHCPClients) @@ -412,13 +425,23 @@ Partial Class Main Me.Panel3.Dock = System.Windows.Forms.DockStyle.Left Me.Panel3.Location = New System.Drawing.Point(0, 130) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(200, 771) + Me.Panel3.Size = New System.Drawing.Size(200, 790) Me.Panel3.TabIndex = 2 ' + 'chkTSSitzungen + ' + Me.chkTSSitzungen.AutoSize = True + Me.chkTSSitzungen.Location = New System.Drawing.Point(25, 680) + Me.chkTSSitzungen.Name = "chkTSSitzungen" + Me.chkTSSitzungen.Size = New System.Drawing.Size(157, 17) + Me.chkTSSitzungen.TabIndex = 19 + Me.chkTSSitzungen.Text = "Terminalsitzungen anzeigen" + Me.chkTSSitzungen.UseVisualStyleBackColor = True + ' 'lblCount ' Me.lblCount.AutoSize = True - Me.lblCount.Location = New System.Drawing.Point(13, 746) + Me.lblCount.Location = New System.Drawing.Point(12, 768) Me.lblCount.Name = "lblCount" Me.lblCount.Size = New System.Drawing.Size(45, 13) Me.lblCount.TabIndex = 18 @@ -443,7 +466,7 @@ Partial Class Main Me.ChkDHCPClients.AutoSize = True Me.ChkDHCPClients.Checked = True Me.ChkDHCPClients.CheckState = System.Windows.Forms.CheckState.Checked - Me.ChkDHCPClients.Location = New System.Drawing.Point(25, 651) + Me.ChkDHCPClients.Location = New System.Drawing.Point(25, 628) Me.ChkDHCPClients.Name = "ChkDHCPClients" Me.ChkDHCPClients.Size = New System.Drawing.Size(136, 17) Me.ChkDHCPClients.TabIndex = 16 @@ -453,7 +476,7 @@ Partial Class Main 'ChkFreieHosts ' Me.ChkFreieHosts.AutoSize = True - Me.ChkFreieHosts.Location = New System.Drawing.Point(25, 628) + Me.ChkFreieHosts.Location = New System.Drawing.Point(25, 605) Me.ChkFreieHosts.Name = "ChkFreieHosts" Me.ChkFreieHosts.Size = New System.Drawing.Size(122, 17) Me.ChkFreieHosts.TabIndex = 15 @@ -465,7 +488,7 @@ Partial Class Main Me.ChkKompAnsicht.AutoSize = True Me.ChkKompAnsicht.Checked = True Me.ChkKompAnsicht.CheckState = System.Windows.Forms.CheckState.Checked - Me.ChkKompAnsicht.Location = New System.Drawing.Point(25, 605) + Me.ChkKompAnsicht.Location = New System.Drawing.Point(25, 582) Me.ChkKompAnsicht.Name = "ChkKompAnsicht" Me.ChkKompAnsicht.Size = New System.Drawing.Size(124, 17) Me.ChkKompAnsicht.TabIndex = 14 @@ -549,7 +572,7 @@ Partial Class Main 'ChkTools ' Me.ChkTools.AutoSize = True - Me.ChkTools.Location = New System.Drawing.Point(25, 709) + Me.ChkTools.Location = New System.Drawing.Point(25, 726) Me.ChkTools.Name = "ChkTools" Me.ChkTools.Size = New System.Drawing.Size(107, 17) Me.ChkTools.TabIndex = 10 @@ -573,7 +596,7 @@ Partial Class Main 'ChKZugangsdaten ' Me.ChKZugangsdaten.AutoSize = True - Me.ChKZugangsdaten.Location = New System.Drawing.Point(25, 687) + Me.ChKZugangsdaten.Location = New System.Drawing.Point(25, 703) Me.ChKZugangsdaten.Name = "ChKZugangsdaten" Me.ChKZugangsdaten.Size = New System.Drawing.Size(141, 17) Me.ChKZugangsdaten.TabIndex = 4 @@ -601,7 +624,7 @@ Partial Class Main 'CMdTest2 ' Me.CMdTest2.Dock = System.Windows.Forms.DockStyle.Right - Me.CMdTest2.Location = New System.Drawing.Point(1202, 0) + Me.CMdTest2.Location = New System.Drawing.Point(941, 0) Me.CMdTest2.Name = "CMdTest2" Me.CMdTest2.Size = New System.Drawing.Size(75, 100) Me.CMdTest2.TabIndex = 3 @@ -611,7 +634,7 @@ Partial Class Main 'CmdTest ' Me.CmdTest.Dock = System.Windows.Forms.DockStyle.Right - Me.CmdTest.Location = New System.Drawing.Point(1127, 0) + Me.CmdTest.Location = New System.Drawing.Point(866, 0) Me.CmdTest.Name = "CmdTest" Me.CmdTest.Size = New System.Drawing.Size(75, 100) Me.CmdTest.TabIndex = 2 @@ -641,7 +664,7 @@ Partial Class Main Me.DgVMain.Name = "DgVMain" Me.DgVMain.ReadOnly = True Me.DgVMain.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.DgVMain.Size = New System.Drawing.Size(1277, 671) + Me.DgVMain.Size = New System.Drawing.Size(1016, 690) Me.DgVMain.TabIndex = 3 ' 'DGVMainContext @@ -710,7 +733,7 @@ Partial Class Main ' 'ToolsToolStripMenuItem ' - Me.ToolsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PuttyToolStripMenuItem, Me.PingToolStripMenuItem, Me.ToolStripSeparator4}) + Me.ToolsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PuttyToolStripMenuItem, Me.PingToolStripMenuItem, Me.PingtToolStripMenuItem}) Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(229, 22) Me.ToolsToolStripMenuItem.Text = "Tools" @@ -718,23 +741,25 @@ Partial Class Main 'PuttyToolStripMenuItem ' Me.PuttyToolStripMenuItem.Name = "PuttyToolStripMenuItem" - Me.PuttyToolStripMenuItem.Size = New System.Drawing.Size(102, 22) + Me.PuttyToolStripMenuItem.Size = New System.Drawing.Size(110, 22) Me.PuttyToolStripMenuItem.Text = "Putty" ' 'PingToolStripMenuItem ' Me.PingToolStripMenuItem.Name = "PingToolStripMenuItem" - Me.PingToolStripMenuItem.Size = New System.Drawing.Size(102, 22) + Me.PingToolStripMenuItem.Size = New System.Drawing.Size(110, 22) Me.PingToolStripMenuItem.Text = "Ping" ' - 'ToolStripSeparator4 + 'PingtToolStripMenuItem ' - Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(99, 6) + Me.PingtToolStripMenuItem.Name = "PingtToolStripMenuItem" + Me.PingtToolStripMenuItem.Size = New System.Drawing.Size(110, 22) + Me.PingtToolStripMenuItem.Text = "Ping -t" ' 'PanTools ' Me.PanTools.BackColor = System.Drawing.SystemColors.GradientInactiveCaption + Me.PanTools.Controls.Add(Me.CmdPintT) Me.PanTools.Controls.Add(Me.btnTest3) Me.PanTools.Controls.Add(Me.LblDebugInfo) Me.PanTools.Controls.Add(Me.CmdPing) @@ -742,16 +767,28 @@ Partial Class Main Me.PanTools.Controls.Add(Me.CmdTest) Me.PanTools.Controls.Add(Me.CMdTest2) Me.PanTools.Dock = System.Windows.Forms.DockStyle.Bottom - Me.PanTools.Location = New System.Drawing.Point(200, 801) + Me.PanTools.Location = New System.Drawing.Point(200, 820) Me.PanTools.Name = "PanTools" - Me.PanTools.Size = New System.Drawing.Size(1277, 100) + Me.PanTools.Size = New System.Drawing.Size(1016, 100) Me.PanTools.TabIndex = 4 Me.PanTools.Visible = False ' + 'CmdPintT + ' + Me.CmdPintT.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.CmdPintT.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.CmdPintT.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.CmdPintT.Location = New System.Drawing.Point(183, 36) + Me.CmdPintT.Name = "CmdPintT" + Me.CmdPintT.Size = New System.Drawing.Size(151, 23) + Me.CmdPintT.TabIndex = 14 + Me.CmdPintT.Text = "Ping -t" + Me.CmdPintT.UseVisualStyleBackColor = False + ' 'btnTest3 ' Me.btnTest3.Dock = System.Windows.Forms.DockStyle.Right - Me.btnTest3.Location = New System.Drawing.Point(1052, 0) + Me.btnTest3.Location = New System.Drawing.Point(791, 0) Me.btnTest3.Name = "btnTest3" Me.btnTest3.Size = New System.Drawing.Size(75, 100) Me.btnTest3.TabIndex = 13 @@ -799,13 +836,23 @@ Partial Class Main Me.TimerWillkommen.Enabled = True Me.TimerWillkommen.Interval = 5000 ' + 'panTSSitzungen + ' + Me.panTSSitzungen.Dock = System.Windows.Forms.DockStyle.Right + Me.panTSSitzungen.Location = New System.Drawing.Point(1216, 130) + Me.panTSSitzungen.Name = "panTSSitzungen" + Me.panTSSitzungen.Size = New System.Drawing.Size(365, 790) + Me.panTSSitzungen.TabIndex = 5 + Me.panTSSitzungen.Visible = False + ' 'Main ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1477, 901) + Me.ClientSize = New System.Drawing.Size(1581, 920) Me.Controls.Add(Me.DgVMain) Me.Controls.Add(Me.PanTools) + Me.Controls.Add(Me.panTSSitzungen) Me.Controls.Add(Me.Panel3) Me.Controls.Add(Me.Panel2) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -898,7 +945,6 @@ Partial Class Main Friend WithEvents PuttyToolStripMenuItem As ToolStripMenuItem Friend WithEvents PingToolStripMenuItem As ToolStripMenuItem Friend WithEvents ObjektLöschenToolStripMenuItem As ToolStripMenuItem - Friend WithEvents ToolStripSeparator4 As ToolStripSeparator Friend WithEvents ChkFreieHosts As CheckBox Friend WithEvents ChkDHCPClients As CheckBox Public WithEvents DgVMain As DataGridView @@ -911,4 +957,9 @@ Partial Class Main Friend WithEvents ToolStripMenuItemINFO As ToolStripMenuItem Friend WithEvents SMBToolStripMenuItem As ToolStripMenuItem Friend WithEvents IPAdresseInZwischenablageToolStripMenuItem As ToolStripMenuItem + Friend WithEvents PingtToolStripMenuItem As ToolStripMenuItem + Friend WithEvents CmdPintT As Button + Friend WithEvents AllesSichernCSVToolStripMenuItem As ToolStripMenuItem + Friend WithEvents panTSSitzungen As Panel + Friend WithEvents chkTSSitzungen As CheckBox End Class diff --git a/Dokumentation/Main.vb b/Dokumentation/Main.vb index 0130041..b4a6766 100644 --- a/Dokumentation/Main.vb +++ b/Dokumentation/Main.vb @@ -72,6 +72,8 @@ Public Class Main TypeFilter() ChkTools.Checked = Class1.DebugMode + chkTSSitzungen.Checked = True + End Sub ''LISTEN @@ -170,7 +172,7 @@ Public Class Main LstStandort.Items.Clear() : Class1.Standorte.Clear() : Class1.AlleStandorte.Clear() - SQL.SQL2DS("SELECT NWSTANDORT from TbL_Netzwerke where main='True' order by NWSTANDORT", ds) + cSQL.SQL2DS("SELECT NWSTANDORT from TbL_Netzwerke where main='True' order by NWSTANDORT", ds) Try For Each dr As DataRow In ds.Tables(0).Rows Dim b As New cBerechtigungen @@ -200,7 +202,7 @@ Public Class Main Dim dsa As New DataSet() - SQL.SQL2DS("select distinct Rubrik from tbl_allgemein", dsa) + cSQL.SQL2DS("select distinct Rubrik from tbl_allgemein", dsa) LstAllgemein.Items.Clear() Try @@ -249,7 +251,7 @@ Public Class Main Dim ds As New DataSet() Dim Standort As String = LstStandort.SelectedItem - SQL.SQL2DS("select NETNAME from TbL_Netzwerke where NWSTANDORT='" & Standort & "' ORDER BY NETNAME", ds) + cSQL.SQL2DS("select NETNAME from TbL_Netzwerke where NWSTANDORT='" & Standort & "' ORDER BY NETNAME", ds) LstNetzwerk.Items.Clear() Try @@ -312,16 +314,16 @@ Public Class Main If tabelle = "TbL_Netzwerkclients" Then If ChkFreieHosts.Checked Then - SQL.SQL2DS("select * from " & tabelle & " where NWSTANDORT='" & Standort & "' AND NETNAME='" & Netzwerk & "' order by host", ds) + cSQL.SQL2DS("select * from " & tabelle & " where NWSTANDORT='" & Standort & "' AND NETNAME='" & Netzwerk & "' order by host", ds) dgvfill(ds, "Netzwerk") Else - SQL.SQL2DS("select * from " & tabelle & " where NWSTANDORT='" & Standort & "' AND NETNAME='" & Netzwerk & "' AND FQDN is not NUll order by host", ds) + cSQL.SQL2DS("select * from " & tabelle & " where NWSTANDORT='" & Standort & "' AND NETNAME='" & Netzwerk & "' AND FQDN is not NUll order by host", ds) dgvfill(ds, "Netzwerk") End If ElseIf tabelle = "TbL_Allgemein" Then 'SQL.SQL2DS("select * from " & tabelle & " WHERE Rubrik = '" & LstAllgemein.SelectedItem & "'", ds) - 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 & "')", ds) + cSQL.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 & "')", ds) dgvfill(ds, "Allgemein") End If @@ -390,13 +392,13 @@ Public Class Main '''ABFRAGE RADIOBUTTONS + SUCHPARAMETER''' If RadGlobal.Checked Then - SQL.SQL2DS("select " & SelSQL4DGV & " from TbL_Netzwerkclients where " & Suchparameter & " order by host", ds) + cSQL.SQL2DS("select " & SelSQL4DGV & " from TbL_Netzwerkclients where " & Suchparameter & " order by host", ds) ElseIf RadNurNetzwerk.Checked Then - SQL.SQL2DS("select " & SelSQL4DGV & " from TbL_Netzwerkclients where NWSTANDORT = '" & Standort & "' AND NETNAME ='" & Netzwerk & "' AND " & Suchparameter & " order by host", ds) + cSQL.SQL2DS("select " & SelSQL4DGV & " from TbL_Netzwerkclients where NWSTANDORT = '" & Standort & "' AND NETNAME ='" & Netzwerk & "' AND " & Suchparameter & " order by host", ds) ElseIf RadStandort.Checked Then - SQL.SQL2DS("select " & SelSQL4DGV & " from TbL_Netzwerkclients where NWSTANDORT = '" & Standort & "' AND " & Suchparameter & " order by host", ds) + cSQL.SQL2DS("select " & SelSQL4DGV & " from TbL_Netzwerkclients where NWSTANDORT = '" & Standort & "' AND " & Suchparameter & " order by host", ds) ElseIf suchbegriff = "" Then - SQL.SQL2DS("select " & SelSQL4DGV & " from TbL_Netzwerkclients order by host", ds) + cSQL.SQL2DS("select " & SelSQL4DGV & " from TbL_Netzwerkclients order by host", ds) End If @@ -447,7 +449,7 @@ Public Class Main '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) + cSQL.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") @@ -907,7 +909,7 @@ Public Class Main 'Dim sda As New SqlDataAdapter("SELECT * FROM Tbl_NetzwerkClients WHERE IPAdresse='" & SenderIP & "'", con) 'sda.Fill(ds) 'con.Close() - SQL.SQL2DS("SELECT * FROM Tbl_NetzwerkClients WHERE IPAdresse='" & SenderIP & "'", ds) + cSQL.SQL2DS("SELECT * FROM Tbl_NetzwerkClients WHERE IPAdresse='" & SenderIP & "'", ds) If IsDBNull(ds.Tables(0).Rows(0).Item("Linked")) Then islinked = "0" @@ -932,7 +934,7 @@ Public Class Main 'da.Fill(dslinked) 'con.Close() - SQL.SQL2DS("SELECT * FROM Tbl_NetzwerkClients WHERE IPAdresse='" & LinkedWith & "'", dslinked) + cSQL.SQL2DS("SELECT * FROM Tbl_NetzwerkClients WHERE IPAdresse='" & LinkedWith & "'", dslinked) Select Case art Case "Dateien" Path = Class1.FilePath & "\" & dslinked.Tables(0).Rows(0).Item("NWStandort") & "_" & dslinked.Tables(0).Rows(0).Item("NetName") & "\" & dslinked.Tables(0).Rows(0).Item("Host") @@ -1115,7 +1117,7 @@ Public Class Main LblVersion.Text = "Version: " & Version Try Dim ds As New DataSet - SQL.SQL2DS("SELECT prog_aktuelleVersion FROM ADMIN.dbo.tblProgramme WHERE prog_codename= '" & My.Resources.Programmcode & "'", ds) + cSQL.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 @@ -1212,7 +1214,11 @@ Public Class Main End Sub Private Sub btnTest3_Click(sender As Object, e As EventArgs) Handles btnTest3.Click - cFolder.netuse("Verag", "1VerSub9#", "\\10.4.3.17") + panTSSitzungen.Controls.Clear() + Dim dingsi As New uscntr_TSSitzungen + panTSSitzungen.Controls.Add(dingsi) + + End Sub Private Sub ToolStripMenuItemINFO_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItemINFO.Click @@ -1239,6 +1245,36 @@ Public Class Main End If End Sub + Private Sub PingtToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PingtToolStripMenuItem.Click, CmdPintT.Click + Ext_Programme.pingip(DgVMain.CurrentRow.Cells("IPAdresse").Value, " -t") + End Sub + + Private Sub AllesSichernCSVToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AllesSichernCSVToolStripMenuItem.Click + Dim dgvtemp As New DataGridView + Dim dstemp As New DataSet + + cSQL.SQL2DS("select * from TbL_Netzwerkclients where FQDN is not null order by NWSTANDORT, NETNAME, host", dstemp) + + dgvtemp.DataSource = dstemp.Tables(0) + + Class1.datatable_2_csv_export(dstemp.Tables(0)) + End Sub + + Private Sub chkTSSitzungen_CheckedChanged(sender As Object, e As EventArgs) Handles chkTSSitzungen.CheckedChanged + If chkTSSitzungen.Checked Then + panTSSitzungen.Controls.Clear() + Dim dingsi As New uscntr_TSSitzungen + dingsi.AutoSize = AutoSizeMode.GrowAndShrink + dingsi.Dock = Dock.Fill + + panTSSitzungen.Controls.Add(dingsi) + panTSSitzungen.Visible = True + Else + panTSSitzungen.Controls.Clear() + panTSSitzungen.Visible = False + End If + End Sub + Private Sub ObjektLöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ObjektLöschenToolStripMenuItem.Click If Tabelle = "TbL_Netzwerkclients" Then Dim ds As New DataSet diff --git a/Dokumentation/My Project/Resources.Designer.vb b/Dokumentation/My Project/Resources.Designer.vb index 732c67f..c3a5482 100644 --- a/Dokumentation/My Project/Resources.Designer.vb +++ b/Dokumentation/My Project/Resources.Designer.vb @@ -110,6 +110,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property mail20() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("mail20", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. + ''' + Friend ReadOnly Property msg() As Byte() + Get + Dim obj As Object = ResourceManager.GetObject("msg", resourceCulture) + Return CType(obj,Byte()) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -169,7 +189,17 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.35 ähnelt. + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Update() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Update", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.38 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Dokumentation/My Project/Resources.resx b/Dokumentation/My Project/Resources.resx index 3f625ce..4dee1ae 100644 --- a/Dokumentation/My Project/Resources.resx +++ b/Dokumentation/My Project/Resources.resx @@ -117,41 +117,50 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Dokumentation - - - ..\Resources\Link20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Folder20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Update.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Bearbeiten20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Link.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - 0.0.1.35 - - - ..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Folder20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - DOKU - - - ..\Resources\pdf512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Netzwerk20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Print.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + 0.0.1.38 ..\Resources\Print20x20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Netzwerk20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Dokumentation + + + ..\Resources\Link20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Print.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\pdf512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + DOKU + + + ..\Resources\Link.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\mail20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\msg.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/Dokumentation/Resources/Update.png b/Dokumentation/Resources/Update.png new file mode 100644 index 0000000..f5946c7 Binary files /dev/null and b/Dokumentation/Resources/Update.png differ diff --git a/Dokumentation/Resources/mail20.png b/Dokumentation/Resources/mail20.png new file mode 100644 index 0000000..821ba59 Binary files /dev/null and b/Dokumentation/Resources/mail20.png differ diff --git a/Dokumentation/Resources/msg.exe b/Dokumentation/Resources/msg.exe new file mode 100644 index 0000000..8a77d9c Binary files /dev/null and b/Dokumentation/Resources/msg.exe differ diff --git a/Dokumentation/frmAllgemeinEintrag.vb b/Dokumentation/frmAllgemeinEintrag.vb index b21bb0f..3794562 100644 --- a/Dokumentation/frmAllgemeinEintrag.vb +++ b/Dokumentation/frmAllgemeinEintrag.vb @@ -93,7 +93,7 @@ 'sda.Fill(ds) 'con.Close() - SQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE Rubrik='" & Eintrag.rubrik & "' AND Titel='" & Eintrag.Titel & "'", ds) + cSQL.SQL2DS("SELECT * FROM TbL_Allgemein WHERE Rubrik='" & Eintrag.rubrik & "' AND Titel='" & Eintrag.Titel & "'", ds) Dim Info As String = ds.Tables(0).Rows(0).Item("Info") @@ -112,7 +112,7 @@ Dim dslinked As New DataSet() - SQL.SQL2DS("SELECT * FROM Tbl_Allgemein WHERE LinkedWith='" & LinkedWith & "'", dslinked) + cSQL.SQL2DS("SELECT * FROM Tbl_Allgemein WHERE LinkedWith='" & LinkedWith & "'", dslinked) path = Class1.FilePath & "\" & dslinked.Tables(0).Rows(0).Item("Rubrik") & "\" & dslinked.Tables(0).Rows(0).Item("Titel") '& "\" & dslinked.Tables(0).Rows(0).Item("Host") @@ -153,7 +153,7 @@ ElseIf DialogResult.No Then Exit Sub End If - SQL.DeleteSQL("TbL_Allgemein", "ID = '" & Eintrag.ID & "'") + cSQL.DeleteSQL("TbL_Allgemein", "ID = '" & Eintrag.ID & "'") ' Main.LstStandortLoad() Me.Close() Else diff --git a/Dokumentation/frmHostBearbeiten.Designer.vb b/Dokumentation/frmHostBearbeiten.Designer.vb index 7a29f72..5680c4f 100644 --- a/Dokumentation/frmHostBearbeiten.Designer.vb +++ b/Dokumentation/frmHostBearbeiten.Designer.vb @@ -60,6 +60,7 @@ Partial Class frmHostBearbeiten Me.TxtLink = New System.Windows.Forms.TextBox() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MitHTTPFüllenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CmdIPUp = New System.Windows.Forms.Button() Me.CmdDateien = New System.Windows.Forms.Button() Me.Label6 = New System.Windows.Forms.Label() @@ -77,6 +78,7 @@ Partial Class frmHostBearbeiten Me.PanFirewall = New System.Windows.Forms.Panel() Me.PanSlaves = New System.Windows.Forms.Panel() Me.PanNavTop = New System.Windows.Forms.Panel() + Me.FFPortToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip2.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -406,16 +408,22 @@ Partial Class frmHostBearbeiten ' 'ContextMenuStrip1 ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MitHTTPFüllenToolStripMenuItem}) + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MitHTTPFüllenToolStripMenuItem, Me.KopierenToolStripMenuItem, Me.FFPortToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(157, 26) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 92) ' 'MitHTTPFüllenToolStripMenuItem ' Me.MitHTTPFüllenToolStripMenuItem.Name = "MitHTTPFüllenToolStripMenuItem" - Me.MitHTTPFüllenToolStripMenuItem.Size = New System.Drawing.Size(156, 22) + Me.MitHTTPFüllenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.MitHTTPFüllenToolStripMenuItem.Text = "mit HTTP füllen" ' + 'KopierenToolStripMenuItem + ' + Me.KopierenToolStripMenuItem.Name = "KopierenToolStripMenuItem" + Me.KopierenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.KopierenToolStripMenuItem.Text = "Kopieren" + ' 'CmdIPUp ' Me.CmdIPUp.BackColor = System.Drawing.SystemColors.ControlLightLight @@ -627,6 +635,13 @@ Partial Class frmHostBearbeiten Me.PanNavTop.Size = New System.Drawing.Size(309, 32) Me.PanNavTop.TabIndex = 141 ' + 'FFPortToolStripMenuItem + ' + Me.FFPortToolStripMenuItem.Name = "FFPortToolStripMenuItem" + Me.FFPortToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.FFPortToolStripMenuItem.Text = "FF Port" + Me.FFPortToolStripMenuItem.Visible = False + ' 'frmHostBearbeiten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -708,4 +723,6 @@ Partial Class frmHostBearbeiten Friend WithEvents PanNavTop As Panel Friend WithEvents cmdSMB As Button Friend WithEvents cmdAuthSMB As Button + Friend WithEvents KopierenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents FFPortToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Dokumentation/frmHostBearbeiten.vb b/Dokumentation/frmHostBearbeiten.vb index b556710..628278b 100644 --- a/Dokumentation/frmHostBearbeiten.vb +++ b/Dokumentation/frmHostBearbeiten.vb @@ -190,8 +190,8 @@ ShowFirewallPanel(chkFirewall.Checked) End Sub Public Function EnableDisableFirewallBoolean(ByVal hostip As String, ByVal EnDisable As Boolean) - SQL.UpdateSQL("TbL_Netzwerkclients", "Firewall = '" & EnDisable & "'", "ipadresse = '" & hostip & "'") - SQL.UpdateSQL("TbL_Netzwerkclients", "Firewall = '" & EnDisable & "'", "linkedwith = '" & hostip & "'") + cSQL.UpdateSQL("TbL_Netzwerkclients", "Firewall = '" & EnDisable & "'", "ipadresse = '" & hostip & "'") + cSQL.UpdateSQL("TbL_Netzwerkclients", "Firewall = '" & EnDisable & "'", "linkedwith = '" & hostip & "'") End Function Public Function ShowFirewallPanel(ByVal EnDisable As Boolean) @@ -306,7 +306,10 @@ End Sub Private Sub Form1_KeyDown(ByVal sender As Object, ByVal e As KeyEventArgs) Handles Me.KeyDown - If e.KeyCode = Keys.ControlKey Then cmdAuthSMB.Text = "NetDelete" + If e.KeyCode = Keys.ControlKey Then + cmdAuthSMB.Text = "NetDelete" + FFPortToolStripMenuItem.Visible = True + End If If e.KeyCode = Keys.Escape Then Me.Close() @@ -315,6 +318,7 @@ Private Sub Form1_KeyUp(ByVal sender As Object, ByVal e As KeyEventArgs) Handles Me.KeyUp cmdAuthSMB.Text = "Auth. SMB" + FFPortToolStripMenuItem.Visible = False End Sub Private Sub MitHTTPFüllenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MitHTTPFüllenToolStripMenuItem.Click @@ -331,7 +335,7 @@ cFolder.explorerstarten(host.IPAdresse, True) End Sub - Private Sub Label1_Click(sender As Object, e As EventArgs) Handles Label1.DoubleClick + Private Sub Label1_Click(sender As Object, e As EventArgs) Handles Label1.DoubleClick, TxtIP.DoubleClick Clipboard.SetText(host.IPAdresse) End Sub @@ -350,5 +354,9 @@ cFolder.netdelete("\\" & host.IPAdresse) End Sub + Private Sub KopierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KopierenToolStripMenuItem.Click + Clipboard.SetText(TxtLink.Text) + End Sub + End Class \ No newline at end of file diff --git a/Dokumentation/uscntr_Firewalleinstellungen.vb b/Dokumentation/uscntr_Firewalleinstellungen.vb index 629f021..7bd6dca 100644 --- a/Dokumentation/uscntr_Firewalleinstellungen.vb +++ b/Dokumentation/uscntr_Firewalleinstellungen.vb @@ -130,7 +130,7 @@ End Sub Private Sub btnLoeschen_Click(sender As Object, e As EventArgs) Handles btnLoeschen.Click - If MsgBox("Eintrag wirklich löschen?", MessageBoxButtons.OKCancel, "Löschen?") = MsgBoxResult.Ok Then SQL.DeleteSQL("TbL_FirewallRules", "fwr_ID = '" & fwr_ID & "'") : clear() : Laden() + If MsgBox("Eintrag wirklich löschen?", MessageBoxButtons.OKCancel, "Löschen?") = MsgBoxResult.Ok Then cSQL.DeleteSQL("TbL_FirewallRules", "fwr_ID = '" & fwr_ID & "'") : clear() : Laden() End Sub Private Function clear() diff --git a/Dokumentation/uscntr_FunktionAdmin.vb b/Dokumentation/uscntr_FunktionAdmin.vb index 9617fcd..03491f0 100644 --- a/Dokumentation/uscntr_FunktionAdmin.vb +++ b/Dokumentation/uscntr_FunktionAdmin.vb @@ -30,7 +30,7 @@ Select Case sender.name Case "btnJa" btnJa.BackColor = Color.Green : Berechtigung.Zugriff = "Y" : Berechtigung.SaveToSQL() - SQL.UpdateSQL("TbL_Berechtigungen", "Zugriff = 'W'", "Benutzeranmeldename = '" & User.BenutzeranmeldeName & "' AND NOT Standort = 'DokuAdmin'") + cSQL.UpdateSQL("TbL_Berechtigungen", "Zugriff = 'W'", "Benutzeranmeldename = '" & User.BenutzeranmeldeName & "' AND NOT Standort = 'DokuAdmin'") Case "btnNein" btnNein.BackColor = Color.Red : Berechtigung.Zugriff = "0" : Berechtigung.SaveToSQL() End Select diff --git a/Dokumentation/uscntr_SendMSG.Designer.vb b/Dokumentation/uscntr_SendMSG.Designer.vb new file mode 100644 index 0000000..42bff78 --- /dev/null +++ b/Dokumentation/uscntr_SendMSG.Designer.vb @@ -0,0 +1,145 @@ + _ +Partial Class uscntr_SendMSG + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.cmdSenden = New System.Windows.Forms.Button() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.PanServerListe = New System.Windows.Forms.Panel() + Me.PanMain = New System.Windows.Forms.Panel() + Me.LabelInfo = New System.Windows.Forms.Label() + Me.cmdVorschau = New System.Windows.Forms.Button() + Me.Panel1.SuspendLayout() + Me.PanMain.SuspendLayout() + Me.SuspendLayout() + ' + 'TextBox1 + ' + Me.TextBox1.Location = New System.Drawing.Point(8, 21) + Me.TextBox1.Margin = New System.Windows.Forms.Padding(8) + Me.TextBox1.Multiline = True + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(444, 71) + Me.TextBox1.TabIndex = 0 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(5, 0) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(56, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Nachricht:" + ' + 'cmdSenden + ' + Me.cmdSenden.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cmdSenden.Location = New System.Drawing.Point(383, 173) + Me.cmdSenden.Name = "cmdSenden" + Me.cmdSenden.Size = New System.Drawing.Size(75, 23) + Me.cmdSenden.TabIndex = 2 + Me.cmdSenden.Text = "Senden" + Me.cmdSenden.UseVisualStyleBackColor = True + ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.TextBox1) + Me.Panel1.Controls.Add(Me.Label1) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel1.Location = New System.Drawing.Point(0, 0) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(461, 108) + Me.Panel1.TabIndex = 3 + ' + 'PanServerListe + ' + Me.PanServerListe.Dock = System.Windows.Forms.DockStyle.Left + Me.PanServerListe.Location = New System.Drawing.Point(0, 108) + Me.PanServerListe.Name = "PanServerListe" + Me.PanServerListe.Size = New System.Drawing.Size(196, 91) + Me.PanServerListe.TabIndex = 0 + ' + 'PanMain + ' + Me.PanMain.AutoSize = True + Me.PanMain.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.PanMain.Controls.Add(Me.LabelInfo) + Me.PanMain.Controls.Add(Me.cmdVorschau) + Me.PanMain.Controls.Add(Me.cmdSenden) + Me.PanMain.Dock = System.Windows.Forms.DockStyle.Fill + Me.PanMain.Location = New System.Drawing.Point(0, 0) + Me.PanMain.MinimumSize = New System.Drawing.Size(461, 199) + Me.PanMain.Name = "PanMain" + Me.PanMain.Size = New System.Drawing.Size(461, 199) + Me.PanMain.TabIndex = 4 + ' + 'LabelInfo + ' + Me.LabelInfo.AutoSize = True + Me.LabelInfo.Location = New System.Drawing.Point(202, 111) + Me.LabelInfo.Name = "LabelInfo" + Me.LabelInfo.Size = New System.Drawing.Size(51, 13) + Me.LabelInfo.TabIndex = 4 + Me.LabelInfo.Text = "LabelInfo" + ' + 'cmdVorschau + ' + Me.cmdVorschau.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cmdVorschau.Location = New System.Drawing.Point(205, 173) + Me.cmdVorschau.Name = "cmdVorschau" + Me.cmdVorschau.Size = New System.Drawing.Size(75, 23) + Me.cmdVorschau.TabIndex = 3 + Me.cmdVorschau.Text = "Vorschau" + Me.cmdVorschau.UseVisualStyleBackColor = True + ' + 'uscntr_SendMSG + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoSize = True + Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.Controls.Add(Me.PanServerListe) + Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.PanMain) + Me.MinimumSize = New System.Drawing.Size(461, 199) + Me.Name = "uscntr_SendMSG" + Me.Size = New System.Drawing.Size(461, 199) + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() + Me.PanMain.ResumeLayout(False) + Me.PanMain.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents TextBox1 As TextBox + Friend WithEvents Label1 As Label + Friend WithEvents cmdSenden As Button + Friend WithEvents Panel1 As Panel + Friend WithEvents PanServerListe As Panel + Friend WithEvents PanMain As Panel + Friend WithEvents cmdVorschau As Button + Friend WithEvents LabelInfo As Label +End Class diff --git a/Dokumentation/uscntr_SendMSG.resx b/Dokumentation/uscntr_SendMSG.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Dokumentation/uscntr_SendMSG.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Dokumentation/uscntr_SendMSG.vb b/Dokumentation/uscntr_SendMSG.vb new file mode 100644 index 0000000..abb4ad9 --- /dev/null +++ b/Dokumentation/uscntr_SendMSG.vb @@ -0,0 +1,85 @@ +Public Class uscntr_SendMSG + + Dim recserver As New List(Of String) + Public recuser As New cTSUser + Dim msg As String = " {0} /Server:{1} '{2}'" 'Username, Server, Nachricht + Dim msgfin As String = "" + Dim SingleUserRec As Boolean = False + + Private Sub uscntr_SendMSG_Load(sender As Object, e As EventArgs) Handles Me.Load + LabelInfo.Text = "" + FillPanWithServer() + SelectUniUser() + End Sub + + Function FillPanWithServer() + PanServerListe.Controls.Clear() + + Dim i As Integer = 0 + + For Each Server As String In Class1.TerminalServerList + Dim usrcntrl As New uscntr_TSServer + usrcntrl.btnServer.Text = Server + usrcntrl.Location = New Point(0, i * usrcntrl.Height) + i = i + 1 + PanServerListe.Controls.Add(usrcntrl) + AddHandler usrcntrl.btnServer.Click, Function() + UpdateSelectedServerList() + End Function + + Next + End Function + + Sub UpdateSelectedServerList() + recserver.Clear() + For Each uc As uscntr_TSServer In PanServerListe.Controls + If uc.selected Then + ' LabelInfo.Text &= uc.btnServer.Text & vbCrLf + recserver.Add(uc.btnServer.Text) + End If + Next + End Sub + + Private Sub cmdVorschau_Click(sender As Object, e As EventArgs) Handles cmdVorschau.Click + If SingleUserRec = True Then + MsgBox("msg" & msgfin) + Else + For Each srv As String In recserver + MsgBox(String.Format(msg, "*", srv, TextBox1.Text)) + Next + End If + End Sub + + Function SelectUniUser() 'wenn nur ein Empfänger + If recuser.BenutzerAnmeldeName.Length > 0 Then + SingleUserRec = True + recuser.genNameKurz() + LabelInfo.Text = String.Format(msg, recuser.NameKurz, recuser.TSServer, "Das ist ein Test!") + For Each uc As uscntr_TSServer In PanServerListe.Controls + If uc.btnServer.Text = recuser.TSServer Then uc.btnServer.PerformClick() + uc.btnServer.Enabled = False + Next + End If + End Function + + Private Sub TextBox1_TextChanged(sender As Object, e As EventArgs) Handles TextBox1.TextChanged + If SingleUserRec = True Then + msgfin = String.Format(msg, recuser.NameKurz, recuser.TSServer, TextBox1.Text) + Else + msgfin = String.Format(msg, "*", recserver(0), TextBox1.Text) + End If + LabelInfo.Text = "msg" & msgfin + End Sub + + Private Sub cmdSenden_Click(sender As Object, e As EventArgs) Handles cmdSenden.Click + If MsgBox("Nachricht senden?", MsgBoxStyle.OkCancel, "Senden?") = MsgBoxResult.Ok Then + If SingleUserRec = True Then + Ext_Programme.msgsend(msgfin) + Else + For Each srv As String In recserver + Ext_Programme.msgsend(String.Format(msg, "*", srv, TextBox1.Text)) + Next + End If + End If + End Sub +End Class diff --git a/Dokumentation/uscntr_TSServer.Designer.vb b/Dokumentation/uscntr_TSServer.Designer.vb new file mode 100644 index 0000000..9869087 --- /dev/null +++ b/Dokumentation/uscntr_TSServer.Designer.vb @@ -0,0 +1,54 @@ + _ +Partial Class uscntr_TSServer + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.btnServer = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'btnServer + ' + Me.btnServer.BackColor = System.Drawing.Color.Red + Me.btnServer.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnServer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnServer.Location = New System.Drawing.Point(3, 3) + Me.btnServer.Name = "btnServer" + Me.btnServer.Size = New System.Drawing.Size(148, 24) + Me.btnServer.TabIndex = 3 + Me.btnServer.Text = "btnServer" + Me.btnServer.UseVisualStyleBackColor = False + ' + 'uscntr_TSServer + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoSize = True + Me.Controls.Add(Me.btnServer) + Me.MinimumSize = New System.Drawing.Size(154, 30) + Me.Name = "uscntr_TSServer" + Me.Size = New System.Drawing.Size(154, 30) + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents btnServer As Button +End Class diff --git a/Dokumentation/uscntr_TSServer.resx b/Dokumentation/uscntr_TSServer.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Dokumentation/uscntr_TSServer.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Dokumentation/uscntr_TSServer.vb b/Dokumentation/uscntr_TSServer.vb new file mode 100644 index 0000000..fa386ff --- /dev/null +++ b/Dokumentation/uscntr_TSServer.vb @@ -0,0 +1,13 @@ +Public Class uscntr_TSServer + Public selected As Boolean = False + + Private Sub btnServer_Click(sender As Object, e As EventArgs) Handles btnServer.Click + selected = Not selected + If selected Then + btnServer.BackColor = Color.Green + Else + btnServer.BackColor = Color.Red + End If + + End Sub +End Class diff --git a/Dokumentation/uscntr_TSSitzungen.Designer.vb b/Dokumentation/uscntr_TSSitzungen.Designer.vb new file mode 100644 index 0000000..d1fdb0b --- /dev/null +++ b/Dokumentation/uscntr_TSSitzungen.Designer.vb @@ -0,0 +1,233 @@ + _ +Partial Class uscntr_TSSitzungen + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.dgvTSSitzungen = New System.Windows.Forms.DataGridView() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.NachrichtSendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.UpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.Timer1 = New System.Windows.Forms.Timer(Me.components) + Me.Panel1 = New System.Windows.Forms.Panel() + Me.cmdNachricht = New System.Windows.Forms.Button() + Me.chkAutoUpdate = New System.Windows.Forms.CheckBox() + Me.CmdUpdate = New System.Windows.Forms.Button() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.btnReset = New System.Windows.Forms.Button() + Me.lblAnzahl = New System.Windows.Forms.Label() + CType(Me.dgvTSSitzungen, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ContextMenuStrip1.SuspendLayout() + Me.Panel1.SuspendLayout() + Me.Panel2.SuspendLayout() + Me.SuspendLayout() + ' + 'dgvTSSitzungen + ' + Me.dgvTSSitzungen.AllowUserToAddRows = False + Me.dgvTSSitzungen.AllowUserToDeleteRows = False + Me.dgvTSSitzungen.AllowUserToResizeRows = False + Me.dgvTSSitzungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvTSSitzungen.ContextMenuStrip = Me.ContextMenuStrip1 + Me.dgvTSSitzungen.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvTSSitzungen.Location = New System.Drawing.Point(0, 36) + Me.dgvTSSitzungen.MultiSelect = False + Me.dgvTSSitzungen.Name = "dgvTSSitzungen" + Me.dgvTSSitzungen.ReadOnly = True + Me.dgvTSSitzungen.RowTemplate.ReadOnly = True + Me.dgvTSSitzungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvTSSitzungen.Size = New System.Drawing.Size(365, 197) + Me.dgvTSSitzungen.TabIndex = 0 + ' + 'ContextMenuStrip1 + ' + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NachrichtSendenToolStripMenuItem, Me.UpdateToolStripMenuItem}) + Me.ContextMenuStrip1.Name = "ContextMenuStrip1" + Me.ContextMenuStrip1.Size = New System.Drawing.Size(168, 48) + ' + 'NachrichtSendenToolStripMenuItem + ' + Me.NachrichtSendenToolStripMenuItem.Name = "NachrichtSendenToolStripMenuItem" + Me.NachrichtSendenToolStripMenuItem.Size = New System.Drawing.Size(167, 22) + Me.NachrichtSendenToolStripMenuItem.Text = "Nachricht senden" + ' + 'UpdateToolStripMenuItem + ' + Me.UpdateToolStripMenuItem.Name = "UpdateToolStripMenuItem" + Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(167, 22) + Me.UpdateToolStripMenuItem.Text = "Update" + ' + 'Timer1 + ' + Me.Timer1.Interval = 10000 + ' + 'Panel1 + ' + Me.Panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption + Me.Panel1.Controls.Add(Me.lblAnzahl) + Me.Panel1.Controls.Add(Me.cmdNachricht) + Me.Panel1.Controls.Add(Me.chkAutoUpdate) + Me.Panel1.Controls.Add(Me.CmdUpdate) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Bottom + Me.Panel1.Location = New System.Drawing.Point(0, 233) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(365, 67) + Me.Panel1.TabIndex = 2 + ' + 'cmdNachricht + ' + Me.cmdNachricht.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cmdNachricht.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.cmdNachricht.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.cmdNachricht.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cmdNachricht.Image = Global.Dokumentation.My.Resources.Resources.mail20 + Me.cmdNachricht.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.cmdNachricht.Location = New System.Drawing.Point(8, 31) + Me.cmdNachricht.Margin = New System.Windows.Forms.Padding(8) + Me.cmdNachricht.Name = "cmdNachricht" + Me.cmdNachricht.Size = New System.Drawing.Size(151, 28) + Me.cmdNachricht.TabIndex = 12 + Me.cmdNachricht.Text = "Nachricht" + Me.cmdNachricht.UseVisualStyleBackColor = False + ' + 'chkAutoUpdate + ' + Me.chkAutoUpdate.AutoSize = True + Me.chkAutoUpdate.Location = New System.Drawing.Point(220, 11) + Me.chkAutoUpdate.Name = "chkAutoUpdate" + Me.chkAutoUpdate.Size = New System.Drawing.Size(127, 17) + Me.chkAutoUpdate.TabIndex = 11 + Me.chkAutoUpdate.Text = "AutoUpdate (10 sec.)" + Me.chkAutoUpdate.UseVisualStyleBackColor = True + ' + 'CmdUpdate + ' + Me.CmdUpdate.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.CmdUpdate.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.CmdUpdate.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.CmdUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.CmdUpdate.Image = Global.Dokumentation.My.Resources.Resources.Update + Me.CmdUpdate.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.CmdUpdate.Location = New System.Drawing.Point(206, 31) + Me.CmdUpdate.Margin = New System.Windows.Forms.Padding(8) + Me.CmdUpdate.Name = "CmdUpdate" + Me.CmdUpdate.Size = New System.Drawing.Size(151, 28) + Me.CmdUpdate.TabIndex = 10 + Me.CmdUpdate.Text = "Update" + Me.CmdUpdate.UseVisualStyleBackColor = False + ' + 'Panel2 + ' + Me.Panel2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption + Me.Panel2.Controls.Add(Me.btnReset) + Me.Panel2.Controls.Add(Me.Label1) + Me.Panel2.Controls.Add(Me.TextBox1) + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel2.Location = New System.Drawing.Point(0, 0) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(365, 36) + Me.Panel2.TabIndex = 3 + ' + 'TextBox1 + ' + Me.TextBox1.Location = New System.Drawing.Point(103, 8) + Me.TextBox1.Margin = New System.Windows.Forms.Padding(8) + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(157, 20) + Me.TextBox1.TabIndex = 0 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(8, 12) + Me.Label1.Margin = New System.Windows.Forms.Padding(8) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(93, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "TSUser Suche:" + ' + 'btnReset + ' + Me.btnReset.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnReset.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.btnReset.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnReset.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnReset.Location = New System.Drawing.Point(276, 8) + Me.btnReset.Margin = New System.Windows.Forms.Padding(8) + Me.btnReset.Name = "btnReset" + Me.btnReset.Size = New System.Drawing.Size(81, 20) + Me.btnReset.TabIndex = 13 + Me.btnReset.Text = "Reset" + Me.btnReset.UseVisualStyleBackColor = False + ' + 'lblAnzahl + ' + Me.lblAnzahl.AutoSize = True + Me.lblAnzahl.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAnzahl.ForeColor = System.Drawing.SystemColors.WindowFrame + Me.lblAnzahl.Location = New System.Drawing.Point(9, 11) + Me.lblAnzahl.Name = "lblAnzahl" + Me.lblAnzahl.Size = New System.Drawing.Size(43, 12) + Me.lblAnzahl.TabIndex = 13 + Me.lblAnzahl.Text = "lblAnzahl" + ' + 'uscntr_TSSitzungen + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoSize = True + Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.Controls.Add(Me.dgvTSSitzungen) + Me.Controls.Add(Me.Panel2) + Me.Controls.Add(Me.Panel1) + Me.MinimumSize = New System.Drawing.Size(365, 300) + Me.Name = "uscntr_TSSitzungen" + Me.Size = New System.Drawing.Size(365, 300) + CType(Me.dgvTSSitzungen, System.ComponentModel.ISupportInitialize).EndInit() + Me.ContextMenuStrip1.ResumeLayout(False) + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() + Me.Panel2.ResumeLayout(False) + Me.Panel2.PerformLayout() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents dgvTSSitzungen As DataGridView + Friend WithEvents Timer1 As Timer + Friend WithEvents Panel1 As Panel + Friend WithEvents CmdUpdate As Button + Friend WithEvents chkAutoUpdate As CheckBox + Friend WithEvents cmdNachricht As Button + Friend WithEvents ContextMenuStrip1 As ContextMenuStrip + Friend WithEvents NachrichtSendenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents UpdateToolStripMenuItem As ToolStripMenuItem + Friend WithEvents Panel2 As Panel + Friend WithEvents Label1 As Label + Friend WithEvents TextBox1 As TextBox + Friend WithEvents btnReset As Button + Friend WithEvents lblAnzahl As Label +End Class diff --git a/Dokumentation/uscntr_TSSitzungen.resx b/Dokumentation/uscntr_TSSitzungen.resx new file mode 100644 index 0000000..bbde99b --- /dev/null +++ b/Dokumentation/uscntr_TSSitzungen.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 106, 17 + + + 17, 17 + + + 44 + + \ No newline at end of file diff --git a/Dokumentation/uscntr_TSSitzungen.vb b/Dokumentation/uscntr_TSSitzungen.vb new file mode 100644 index 0000000..f886772 --- /dev/null +++ b/Dokumentation/uscntr_TSSitzungen.vb @@ -0,0 +1,104 @@ +Public Class uscntr_TSSitzungen + + Private Sub uscntr_TSSitzungen_Load(sender As Object, e As EventArgs) Handles Me.Load + Load2DGV() + End Sub + + Function Load2DGV(Optional ByVal WhereString As String = "") + Dim ds As New DataSet + cSQL.SQL2DS("SELECT * FROM TbL_TSSitzungen WHERE Name LIKE '" & ReturnOfTheWhere() & "' OR TSServer LIKE '" & ReturnOfTheWhere() & "' ORDER BY NAME", ds) + + With dgvTSSitzungen + .RowHeadersVisible = False + .DataSource = ds.Tables(0) + .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.DisplayedCells + .Columns("BenutzerAnmeldeName").Visible = False + '.Columns("BenutzerAnmeldeName").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("LastLogon").Visible = False + .Columns("LastLogon").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + '.Columns("LastReport").Width = 85 + '.Columns("TeamviewerID").Width = 80 + '.Columns("TSServer").Width = 60 + End With + lblAnzahl.Text = dgvTSSitzungen.Rows.Count + LoadTSServer() + End Function + + Private Sub dgvTSSitzungen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvTSSitzungen.CellContentDoubleClick + + Dim sitzung As String = Class1.DBNull2emptyString(dgvTSSitzungen.CurrentRow.Cells("TeamviewerID").Value) + StartTeamviewer(sitzung) + + End Sub + + Public Function StartTeamviewer(ID As String) + Dim teamviewer As New Process + With teamviewer.StartInfo + .FileName = "Teamviewer.exe" + .WorkingDirectory = "C:\Program Files (x86)\TeamViewer" + .Arguments = "-i " & ID & " -P BmWr501956" + End With + + teamviewer.Start() + + End Function + + Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick + Load2DGV() + End Sub + + Private Sub RefreshToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CmdUpdate.Click, UpdateToolStripMenuItem.Click + Load2DGV() + End Sub + + Private Sub chkAutoUpdate_CheckedChanged(sender As Object, e As EventArgs) Handles chkAutoUpdate.CheckedChanged + If chkAutoUpdate.Checked Then + Timer1.Enabled = True + Else + Timer1.Enabled = False + End If + End Sub + + Private Function LoadTSServer() + Dim ds As New DataSet + cSQL.SQL2DS("SELECT DISTINCT TSServer FROM TbL_TSSitzungen", ds) + + For Each r As DataRow In ds.Tables(0).Rows + Class1.TerminalServerList.Add(r.Item(0).ToString) + Next + + + End Function + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles cmdNachricht.Click + Dim send As New frmLeer + send.Text = "Nachricht senden" + Dim usrcntrl As New uscntr_SendMSG + usrcntrl.Dock = DockStyle.Fill : send.PanMain.Controls.Add(usrcntrl) + send.Show() + End Sub + + Private Sub NachrichtSendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NachrichtSendenToolStripMenuItem.Click + Dim send As New frmLeer + send.Text = "Nachricht senden" + Dim usrcntrl As New uscntr_SendMSG + usrcntrl.recuser.Name = dgvTSSitzungen.CurrentRow.Cells("Name").Value.ToString + usrcntrl.recuser.BenutzerAnmeldeName = dgvTSSitzungen.CurrentRow.Cells("BenutzerAnmeldeName").Value.ToString + usrcntrl.recuser.TSServer = dgvTSSitzungen.CurrentRow.Cells("TSServer").Value.ToString + usrcntrl.Dock = DockStyle.Fill : send.PanMain.Controls.Add(usrcntrl) + send.Show() + End Sub + + Private Sub TextBox1_TextChanged(sender As Object, e As EventArgs) Handles TextBox1.TextChanged + Load2DGV(TextBox1.Text) + End Sub + + Function ReturnOfTheWhere() + Dim ding As String = "%{0}%" + Return String.Format(ding, TextBox1.Text) + End Function + + Private Sub btnReset_Click(sender As Object, e As EventArgs) Handles btnReset.Click + TextBox1.Text = "" + End Sub +End Class diff --git a/Dokumentation_Updater/Update.Designer.vb b/Dokumentation_Updater/Update.Designer.vb index bd649d6..3fa5cd3 100644 --- a/Dokumentation_Updater/Update.Designer.vb +++ b/Dokumentation_Updater/Update.Designer.vb @@ -68,7 +68,7 @@ Partial Class Update Me.Controls.Add(Me.CmdUpdate) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "Update" - Me.Text = "Doku Update 1.0.1" + Me.Text = "Doku Update 1.0.2" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/Dokumentation_Updater/Update.vb b/Dokumentation_Updater/Update.vb index 92d615d..9e780de 100644 --- a/Dokumentation_Updater/Update.vb +++ b/Dokumentation_Updater/Update.vb @@ -3,7 +3,7 @@ Public Class Update Public sAppPath As String = Application.StartupPath - Public Updatequelle As String = "\\192.168.0.91\f\Programme\Doku\" + Public Updatequelle As String = "\\share01.verag.ost.dmn\Programme\Doku\" Private Sub Update_Load(sender As Object, e As EventArgs) Handles MyBase.Load TxtInfo.Text = "Programmpfad: " & sAppPath & vbCrLf