From 8b49a5a53f976a4e749e0d7877dc0d8643b30409 Mon Sep 17 00:00:00 2001 From: leiweibau <105860611+leiweibau@users.noreply.github.com> Date: Fri, 29 Jul 2022 17:00:27 +0200 Subject: [PATCH] tuning and bugfixing add edit function --- front/network.php | 104 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 83 insertions(+), 21 deletions(-) diff --git a/front/network.php b/front/network.php index fdf6ec0b..a7b7a6d8 100644 --- a/front/network.php +++ b/front/network.php @@ -40,6 +40,17 @@ if ($_REQUEST['Networkinsert'] == "yes") { } } // ##################################### +// Add New Network Devices +// ##################################### +if ($_REQUEST['Networkedit'] == "yes") { + if (isset($_REQUEST['NewNetworkDeviceName']) && isset($_REQUEST['NewNetworkDeviceTyp'])) + { + $sql = 'UPDATE "network_infrastructure" SET "net_device_name" = "'.$_REQUEST['NewNetworkDeviceName'].'", "net_device_typ" = "'.$_REQUEST['NewNetworkDeviceTyp'].'", "net_device_port" = "'.$_REQUEST['NewNetworkDevicePort'].'" WHERE "device_id"="'.$_REQUEST['NetworkDeviceID'].'"'; + //$sql = 'INSERT INTO "network_infrastructure" ("net_device_name", "net_device_typ", "net_device_port") VALUES("'.$_REQUEST['NetworkDeviceName'].'", "'.$_REQUEST['NetworkDeviceTyp'].'", "'.$_REQUEST['NetworkDevicePort'].'")'; + $result = $db->query($sql); + } +} +// ##################################### // remove Network Devices // ##################################### if ($_REQUEST['Networkdelete'] == "yes") { @@ -67,7 +78,7 @@ echo $_REQUEST['device_id']; ?>
-
+

Verwalte Netzwerk-Geräte

@@ -77,7 +88,7 @@ echo $_REQUEST['device_id'];
-
+
@@ -87,7 +98,7 @@ echo $_REQUEST['device_id'];
- - + +
@@ -105,12 +116,12 @@ echo $_REQUEST['device_id'];
-
+
- +
+
+ + +
+
+ + +
+
+ + +
- +
+
+
+
+ + +
+ +
+ +
+
+ +
@@ -178,10 +230,6 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ if ($network_device_portmac[$func_res['dev_Infrastructure_port']] != '') {$network_device_portmac[$func_res['dev_Infrastructure_port']] = $network_device_portmac[$func_res['dev_Infrastructure_port']].','.$func_res['dev_MAC'];} else {$network_device_portmac[$func_res['dev_Infrastructure_port']] = $func_res['dev_MAC'];} if ($network_device_portip[$func_res['dev_Infrastructure_port']] != '') {$network_device_portip[$func_res['dev_Infrastructure_port']] = $network_device_portip[$func_res['dev_Infrastructure_port']].','.$func_res['dev_LastIP'];} else {$network_device_portip[$func_res['dev_Infrastructure_port']] = $func_res['dev_LastIP'];} if (isset($network_device_portstate[$func_res['dev_Infrastructure_port']])) {$network_device_portstate[$func_res['dev_Infrastructure_port']] = $network_device_portstate[$func_res['dev_Infrastructure_port']].','.$func_res['dev_PresentLastScan'];} else {$network_device_portstate[$func_res['dev_Infrastructure_port']] = $func_res['dev_PresentLastScan'];} - //$network_device_portname[$func_res['dev_Infrastructure_port']] = $func_res['dev_Name']; - //$network_device_portmac[$func_res['dev_Infrastructure_port']] = $func_res['dev_MAC']; - //$network_device_portip[$func_res['dev_Infrastructure_port']] = $func_res['dev_LastIP']; - //$network_device_portstate[$func_res['dev_Infrastructure_port']] = $func_res['dev_PresentLastScan']; } else { $multiport = array(); $multiport = explode(',',$func_res['dev_Infrastructure_port']); @@ -195,7 +243,10 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ } } else { // Table without Port > echo values - echo '###'.$port_state.''.$func_res['dev_Name'].''.$func_res['dev_LastIP'].''; + // Specific icon for devicetype + if ($pia_func_netdevtyp == "WLAN") {$dev_port_icon = 'fa-wifi';} + if ($pia_func_netdevtyp == "Powerline") {$dev_port_icon = 'fa-flash';} + echo ''.$port_state.''.$func_res['dev_Name'].''.$func_res['dev_LastIP'].''; } } // Create table with Port @@ -203,28 +254,36 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ { for ($x=1; $x<=$pia_func_netdevport; $x++) { + // Prepare online/offline badge for later functions $online_badge = '
Online
'; - $offline_baadge = '
Offline
'; - if ($network_device_portstate[$x] == 1) {$port_state = $online_badge;} else {$port_state = $offline_baadge;} + $offline_badge = '
Offline
'; + // Set online/offline badge echo ''; - echo ''.$x.''; + echo ''.$x.''; + // Set online/offline badge + // Check if multiple badges necessary if (stristr($network_device_portstate[$x],',') == '') { - if ($network_device_portstate[$x] == 1) {$port_state = $online_badge;} else {$port_state = $offline_baadge;} + // Set single online/offline badge + if ($network_device_portstate[$x] == 1) {$port_state = $online_badge;} else {$port_state = $offline_badge;} echo ''.$port_state.''; } else { + // Set multiple online/offline badges $multistate = array(); $multistate = explode(',',$network_device_portstate[$x]); echo ''; foreach($multistate as $key => $value) { - if ($value == 1) {$port_state = $online_badge;} else {$port_state = $offline_baadge;} + if ($value == 1) {$port_state = $online_badge;} else {$port_state = $offline_badge;} echo $port_state.'
'; } echo ''; unset($multistate); - } + } + // Check if multiple Hostnames are set + // print single hostname if (stristr($network_device_portmac[$x],',') == '') { echo ''.$network_device_portname[$x].''; } else { + // print multiple hostnames with separate links $multimac = array(); $multimac = explode(',',$network_device_portmac[$x]); $multiname = array(); @@ -235,10 +294,13 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ } echo ''; unset($multiname, $multimac); - } + } + // Check if multiple IP are set + // print single IP if (stristr($network_device_portip[$x],',') == '') { echo ''.$network_device_portip[$x].''; } else { + // print multiple IPs $multiip = array(); $multiip = explode(',',$network_device_portip[$x]); echo '';