From 0ca2ffc5769191c13209e8318c564d5bb508af3b Mon Sep 17 00:00:00 2001 From: leiweibau <105860611+leiweibau@users.noreply.github.com> Date: Wed, 27 Jul 2022 00:08:42 +0200 Subject: [PATCH 01/13] difficult to describe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I want to display an assignment of individual network nodes to specific network devices (which device is connected to which switch, router or wlan). It is still in the experimental phase, but is already usable in principle. Whether this "feature" will make it into the main fork, I can't say yet. Wegen der aktuellen Entwicklungsphase ist dieser teil ausschließlich deutsch. --- front/deviceDetails.php | 22 +++- front/network.php | 191 +++++++++++++++++++++++++++++++++++ front/php/server/devices.php | 2 + 3 files changed, 210 insertions(+), 5 deletions(-) create mode 100644 front/network.php diff --git a/front/deviceDetails.php b/front/deviceDetails.php index aefd7542..9ee4b1a2 100644 --- a/front/deviceDetails.php +++ b/front/deviceDetails.php @@ -17,6 +17,7 @@ if ($_SESSION["login"] != 1) } require 'php/templates/header.php'; + require 'php/server/db.php'; ?> @@ -263,6 +264,14 @@ if ($_REQUEST['mac'] == 'Internet') { $DevDetail_Tap_temp = "Tools"; } else { $D +
+ +
+ +
+
+ + @@ -453,7 +462,7 @@ if ($_REQUEST['mac'] == 'Internet') { ?>

Online Speedtest

- +
- - - + + + -
+
- +
+
+ +
+ +
+
@@ -1099,34 +1105,35 @@ function getDeviceData (readAllData=false) { $('#deviceStatus')[0].className = 'text-gray'; $('#deviceStatusIcon')[0].className = ''; - $('#deviceSessions').html ('--'); - $('#deviceDownAlerts').html ('--'); - $('#deviceEvents').html ('--'); + $('#deviceSessions').html ('--'); + $('#deviceDownAlerts').html ('--'); + $('#deviceEvents').html ('--'); - $('#txtMAC').val ('--'); - $('#txtName').val ('--'); - $('#txtOwner').val ('--'); - $('#txtDeviceType').val ('--'); - $('#txtVendor').val ('--'); + $('#txtMAC').val ('--'); + $('#txtName').val ('--'); + $('#txtOwner').val ('--'); + $('#txtDeviceType').val ('--'); + $('#txtVendor').val ('--'); - $('#chkFavorite').iCheck ('uncheck'); - $('#txtGroup').val ('--'); - $('#txtLocation').val ('--'); - $('#txtComments').val ('--'); - $('#txtInfrastructure').val ('--'); + $('#chkFavorite').iCheck ('uncheck'); + $('#txtGroup').val ('--'); + $('#txtLocation').val ('--'); + $('#txtComments').val ('--'); + $('#txtInfrastructure').val ('--'); + $('#txtInfrastructurePort').val ('--'); - $('#txtFirstConnection').val ('--'); - $('#txtLastConnection').val ('--'); - $('#txtLastIP').val ('--'); - $('#txtStatus').val ('--'); - $('#chkStaticIP').iCheck ('uncheck'); + $('#txtFirstConnection').val ('--'); + $('#txtLastConnection').val ('--'); + $('#txtLastIP').val ('--'); + $('#txtStatus').val ('--'); + $('#chkStaticIP').iCheck ('uncheck'); - $('#txtScanCycle').val ('--'); - $('#chkAlertEvents').iCheck ('uncheck') - $('#chkAlertDown').iCheck ('uncheck') - $('#txtSkipRepeated').val ('--'); - $('#chkNewDevice').iCheck ('uncheck'); - $('#chkArchived').iCheck ('uncheck'); + $('#txtScanCycle').val ('--'); + $('#chkAlertEvents').iCheck ('uncheck') + $('#chkAlertDown').iCheck ('uncheck') + $('#txtSkipRepeated').val ('--'); + $('#chkNewDevice').iCheck ('uncheck'); + $('#chkArchived').iCheck ('uncheck'); $('#iconRandomMACactive').addClass ('hidden'); $('#iconRandomMACinactive').removeClass ('hidden'); @@ -1195,6 +1202,7 @@ function getDeviceData (readAllData=false) { $('#txtLocation').val (deviceData['dev_Location']); $('#txtComments').val (deviceData['dev_Comments']); $('#txtInfrastructure').val (deviceData['dev_Infrastructure']); + $('#txtInfrastructurePort').val (deviceData['dev_Infrastructure_port']); $('#txtFirstConnection').val (deviceData['dev_FirstConnection']); $('#txtLastConnection').val (deviceData['dev_LastConnection']); @@ -1304,6 +1312,7 @@ function setDeviceData (refreshCallback='') { + '&location=' + $('#txtLocation').val() + '&comments=' + $('#txtComments').val() + '&infrastructure=' + $('#txtInfrastructure').val() + + '&infrastructureport=' + $('#txtInfrastructurePort').val() + '&staticIP=' + ($('#chkStaticIP')[0].checked * 1) + '&scancycle=' + $('#txtScanCycle').val().split(' ')[0] + '&alertevents=' + ($('#chkAlertEvents')[0].checked * 1) diff --git a/front/network.php b/front/network.php index f433a409..e53692f2 100644 --- a/front/network.php +++ b/front/network.php @@ -9,10 +9,11 @@ if ($_SESSION["login"] != 1) require 'php/templates/header.php'; require 'php/server/db.php'; - $DBFILE = '../db/pialert.db'; OpenDB(); -// Create Table if not exists' +// ##################################### +// ## Create Table if not exists' +// ##################################### $sql = 'CREATE TABLE IF NOT EXISTS "network_infrastructure" ( "device_id" INTEGER, "net_device_name" TEXT NOT NULL, @@ -20,13 +21,16 @@ $sql = 'CREATE TABLE IF NOT EXISTS "network_infrastructure" ( PRIMARY KEY("device_id" AUTOINCREMENT) )'; $result = $db->query($sql); -// Expand Devices Table +// ##################################### +// ## Expand Devices Table +// ##################################### $sql = 'ALTER TABLE "Devices" ADD "dev_Infrastructure" INTEGER'; $result = $db->query($sql); $sql = 'ALTER TABLE "Devices" ADD "dev_Infrastructure_port" INTEGER'; $result = $db->query($sql); - - +// ##################################### +// Add New Network Devices +// ##################################### if ($_REQUEST['Networkinsert'] == "yes") { if (isset($_REQUEST['NetworkDeviceName']) && isset($_REQUEST['NetworkDeviceTyp'])) { @@ -34,7 +38,9 @@ if ($_REQUEST['Networkinsert'] == "yes") { $result = $db->query($sql); } } - +// ##################################### +// remove Network Devices +// ##################################### if ($_REQUEST['Networkdelete'] == "yes") { if (isset($_REQUEST['NetworkDeviceID'])) { @@ -63,10 +69,8 @@ echo $_REQUEST['device_id'];

Verwalte Netzwerk-Geräte

-
-
@@ -102,7 +106,6 @@ echo $_REQUEST['device_id'];
+
+ + +
@@ -130,61 +135,115 @@ echo $_REQUEST['device_id']; '.$pia_func_netdevname.' / '.$pia_func_netdevtyp.''; +function createnetworktab($pia_func_netdevid, $pia_func_netdevname, $pia_func_netdevtyp, $pia_func_netdevport, $activetab) { + echo '
  • '.$pia_func_netdevname.' / '.$pia_func_netdevtyp; + if ($pia_func_netdevport != "") {echo ' ('.$pia_func_netdevport.')';} + echo '
    • '; } -function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_func_netdevtyp, $activetab) { +function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_func_netdevtyp, $pia_func_netdevport, $activetab) { echo '

    '.$pia_func_netdevname.' (ID: '.$pia_func_netdevid.')


    '; + + echo '
    + + + + + + + '; + // Prepare Array + if ($pia_func_netdevport == "") {$pia_func_netdevport = 1;} + //echo $pia_func_netdevport; + $network_device_portname = array(); + $network_device_portmac = array(); + $network_device_portip = array(); + $network_device_portstate = array(); + if ($pia_func_netdevport > 1) + { + for ($x=1; $x<=$pia_func_netdevport; $x++) { $network_device_portname[$x] = ''; $network_device_portmac[$x] = ''; $network_device_portip[$x] = ''; $network_device_portstate[$x] = ''; } + } + // Debug + // print_r($network_device_port); + // SQL for Devices with Network Device Number global $db; $func_sql = 'SELECT * FROM "Devices" WHERE "dev_Infrastructure" = "'.$pia_func_netdevid.'"'; $func_result = $db->query($func_sql);//->fetchArray(SQLITE3_ASSOC); - while($func_res = $func_result->fetchArray(SQLITE3_ASSOC)){ - if(!isset($func_res['dev_Name'])) continue; - if ($func_res['dev_PresentLastScan'] == 1) {$port_state = '
    Up
    ';} else {$port_state = '
    Down
    ';} - echo 'Port: '.$func_res['dev_Infrastructure_port'].' - '.$port_state.' - '.$func_res['dev_Name'].' - '.$func_res['dev_LastIP'].'
    '; + // Debug + //if(!isset($func_res['dev_Name'])) continue; + if ($func_res['dev_PresentLastScan'] == 1) {$port_state = '
    Up
    ';} else {$port_state = '
    Down
    ';} + //echo 'Port: '.$func_res['dev_Infrastructure_port'].' - '.$port_state.' - '.$func_res['dev_Name'].' - '.$func_res['dev_LastIP'].'
    '; + if ($pia_func_netdevport > 1) + { + $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 { +// Table without Port + echo ''; + } } + // Debug + //print_r($network_device_portname); + //print_r($network_device_portmac); + //print_r($network_device_portip); + //print_r($network_device_portstate); + + if ($pia_func_netdevport > 1) + { + for ($x=1; $x<=$pia_func_netdevport; $x++) + { + if ($network_device_portstate[$x] == 1) {$port_state = '
    Up
    ';} else {$port_state = '
    Down
    ';} + echo ' + + + + + '; + } + } + echo '
    PortStateHostnameLast known IP
    ###'.$port_state.''.$func_res['dev_Name'].''.$func_res['dev_LastIP'].'
    '.$x.''.$port_state.''.$network_device_portname[$x].''.$network_device_portip[$x].'
    +
    '; echo '
    '; } -// ##################################### -// Build Tab Box -// ##################################### - -$sql = 'SELECT "device_id", "net_device_name", "net_device_typ" FROM "network_infrastructure"'; +$sql = 'SELECT "device_id", "net_device_name", "net_device_typ", "net_device_port" FROM "network_infrastructure"'; $result = $db->query($sql);//->fetchArray(SQLITE3_ASSOC); ?> -
    - + +
    +
    - fetchArray(SQLITE3_ASSOC)){ - if(!isset($res['device_id'])) continue; - if ($i == 0) {$active = 'active';} else {$active = '';} - createnetworktabcontent($res['device_id'], $res['net_device_name'], $res['net_device_typ'], $active); - $i++; - } - unset($i); - ?> + + + +fetchArray(SQLITE3_ASSOC)){ + if(!isset($res['device_id'])) continue; + if ($i == 0) {$active = 'active';} else {$active = '';} + createnetworktabcontent($res['device_id'], $res['net_device_name'], $res['net_device_typ'], $res['net_device_port'], $active); + $i++; +} +unset($i); +?>
    -
    - +
    + From 2c00d103d98934ca4c867f6ede8d124d1ac63a33 Mon Sep 17 00:00:00 2001 From: leiweibau <105860611+leiweibau@users.noreply.github.com> Date: Wed, 27 Jul 2022 19:12:01 +0200 Subject: [PATCH 05/13] Update network.php --- front/network.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front/network.php b/front/network.php index f7517ef8..4dff45b1 100644 --- a/front/network.php +++ b/front/network.php @@ -182,7 +182,7 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ $network_device_portstate[$func_res['dev_Infrastructure_port']] = $func_res['dev_PresentLastScan']; } else { // Table without Port - echo '###'.$port_state.''.$func_res['dev_Name'].''.$func_res['dev_LastIP'].''; + echo '###'.$port_state.''.$func_res['dev_Name'].''.$func_res['dev_LastIP'].''; } } // Debug @@ -199,12 +199,12 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ echo ' '.$x.' '.$port_state.' - '.$network_device_portname[$x].' + '.$network_device_portname[$x].' '.$network_device_portip[$x].' '; } } - echo ' + echo ' '; echo ' '; } From d10353b2474fe6b542453c3d5a146787921829e1 Mon Sep 17 00:00:00 2001 From: leiweibau <105860611+leiweibau@users.noreply.github.com> Date: Wed, 27 Jul 2022 19:46:58 +0200 Subject: [PATCH 06/13] Update deviceDetails.php --- front/deviceDetails.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/deviceDetails.php b/front/deviceDetails.php index 8b36dee8..50cdecad 100644 --- a/front/deviceDetails.php +++ b/front/deviceDetails.php @@ -265,7 +265,7 @@ if ($_REQUEST['mac'] == 'Internet') { $DevDetail_Tap_temp = "Tools"; } else { $D
    - +
    From e3564ac067ad30835a726e72a9ba18b4f2787a94 Mon Sep 17 00:00:00 2001 From: leiweibau <105860611+leiweibau@users.noreply.github.com> Date: Wed, 27 Jul 2022 21:33:01 +0200 Subject: [PATCH 07/13] Update version.conf --- config/version.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.conf b/config/version.conf index 60c442de..9607d21e 100644 --- a/config/version.conf +++ b/config/version.conf @@ -1,3 +1,3 @@ -VERSION = '3.5_leiweibau' +VERSION = '3.6_leiweibau' VERSION_YEAR = '2022' -VERSION_DATE = '2022-07-07' +VERSION_DATE = '2022-07-27' From eaf84be82556d0bf236faf321b7584d89057d17a Mon Sep 17 00:00:00 2001 From: leiweibau <105860611+leiweibau@users.noreply.github.com> Date: Thu, 28 Jul 2022 20:22:36 +0200 Subject: [PATCH 08/13] add multiple ports support --- front/network.php | 75 +++++++++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 29 deletions(-) diff --git a/front/network.php b/front/network.php index 4dff45b1..4f885ce4 100644 --- a/front/network.php +++ b/front/network.php @@ -68,10 +68,10 @@ echo $_REQUEST['device_id'];
    -
    +

    Verwalte Netzwerk-Geräte

    - +
    @@ -91,10 +91,11 @@ echo $_REQUEST['device_id']; +
    - +
    @@ -135,6 +136,9 @@ echo $_REQUEST['device_id'];
    '.$pia_func_netdevname.' / '.$pia_func_netdevtyp; if ($pia_func_netdevport != "") {echo ' ('.$pia_func_netdevport.')';} @@ -143,7 +147,6 @@ function createnetworktab($pia_func_netdevid, $pia_func_netdevname, $pia_func_ne function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_func_netdevtyp, $pia_func_netdevport, $activetab) { echo '

    '.$pia_func_netdevname.' (ID: '.$pia_func_netdevid.')


    '; - echo '
    @@ -152,9 +155,10 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ '; - // Prepare Array + // Prepare Array for Devices with Port value + // If no Port is set, the Port number is set to 1 if ($pia_func_netdevport == "") {$pia_func_netdevport = 1;} - //echo $pia_func_netdevport; + // Create Array with specific length $network_device_portname = array(); $network_device_portmac = array(); $network_device_portip = array(); @@ -163,39 +167,47 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ { for ($x=1; $x<=$pia_func_netdevport; $x++) { $network_device_portname[$x] = ''; $network_device_portmac[$x] = ''; $network_device_portip[$x] = ''; $network_device_portstate[$x] = ''; } } - // Debug - // print_r($network_device_port); - // SQL for Devices with Network Device Number + // make sql query for Network Hardware ID global $db; $func_sql = 'SELECT * FROM "Devices" WHERE "dev_Infrastructure" = "'.$pia_func_netdevid.'"'; $func_result = $db->query($func_sql);//->fetchArray(SQLITE3_ASSOC); - while($func_res = $func_result->fetchArray(SQLITE3_ASSOC)){ - // Debug - //if(!isset($func_res['dev_Name'])) continue; - if ($func_res['dev_PresentLastScan'] == 1) {$port_state = '
    Up
    ';} else {$port_state = '
    Down
    ';} - //echo 'Port: '.$func_res['dev_Infrastructure_port'].' - '.$port_state.' - '.$func_res['dev_Name'].' - '.$func_res['dev_LastIP'].'
    '; + while($func_res = $func_result->fetchArray(SQLITE3_ASSOC)) { + //if(!isset($func_res['dev_Name'])) continue; + if ($func_res['dev_PresentLastScan'] == 1) {$port_state = '
    Online
    ';} else {$port_state = '
    Offline
    ';} + // Prepare Table with Port > push values in array if ($pia_func_netdevport > 1) { + if (stristr($func_res['dev_Infrastructure_port'], ',') == '') { $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']); + foreach($multiport as $row) { + $network_device_portname[trim($row)] = $func_res['dev_Name']; + $network_device_portmac[trim($row)] = $func_res['dev_MAC']; + $network_device_portip[trim($row)] = $func_res['dev_LastIP']; + $network_device_portstate[trim($row)] = $func_res['dev_PresentLastScan']; + } + unset($multiport); + } + // $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 { -// Table without Port + // Table without Port > echo values echo ''; } } - // Debug - //print_r($network_device_portname); - //print_r($network_device_portmac); - //print_r($network_device_portip); - //print_r($network_device_portstate); - + // Create table with Port if ($pia_func_netdevport > 1) { for ($x=1; $x<=$pia_func_netdevport; $x++) { - if ($network_device_portstate[$x] == 1) {$port_state = '
    Up
    ';} else {$port_state = '
    Down
    ';} + if ($network_device_portstate[$x] == 1) {$port_state = '
    Online
    ';} else {$port_state = '
    Offline
    ';} echo ' @@ -208,13 +220,18 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ '; echo ' '; } +// ##################################### +// ## End Function Setup +// ##################################### + +// ##################################### +// ## Create Tabs +// ##################################### $sql = 'SELECT "device_id", "net_device_name", "net_device_typ", "net_device_port" FROM "network_infrastructure"'; $result = $db->query($sql);//->fetchArray(SQLITE3_ASSOC); ?> - -
    +
      - fetchArray(SQLITE3_ASSOC)){ @@ -226,15 +243,15 @@ while($res = $result->fetchArray(SQLITE3_ASSOC)){ ?>
    - - - fetchArray(SQLITE3_ASSOC)){ if(!isset($res['device_id'])) continue; if ($i == 0) {$active = 'active';} else {$active = '';} - createnetworktabcontent($res['device_id'], $res['net_device_name'], $res['net_device_typ'], $res['net_device_port'], $active); + createnetworktabcontent($res['device_id'], $res['net_device_name'], $res['net_device_typ'], $res['net_device_port'], $active); $i++; } unset($i); From f6b6fe36dafa2899d4927829513fc27f670f12a3 Mon Sep 17 00:00:00 2001 From: leiweibau <105860611+leiweibau@users.noreply.github.com> Date: Thu, 28 Jul 2022 21:53:52 +0200 Subject: [PATCH 09/13] add multiple hosts per port support --- front/network.php | 73 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 19 deletions(-) diff --git a/front/network.php b/front/network.php index 4f885ce4..58ce87c8 100644 --- a/front/network.php +++ b/front/network.php @@ -163,10 +163,6 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ $network_device_portmac = array(); $network_device_portip = array(); $network_device_portstate = array(); - if ($pia_func_netdevport > 1) - { - for ($x=1; $x<=$pia_func_netdevport; $x++) { $network_device_portname[$x] = ''; $network_device_portmac[$x] = ''; $network_device_portip[$x] = ''; $network_device_portstate[$x] = ''; } - } // make sql query for Network Hardware ID global $db; $func_sql = 'SELECT * FROM "Devices" WHERE "dev_Infrastructure" = "'.$pia_func_netdevid.'"'; @@ -178,10 +174,14 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ if ($pia_func_netdevport > 1) { if (stristr($func_res['dev_Infrastructure_port'], ',') == '') { - $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']; + if ($network_device_portname[$func_res['dev_Infrastructure_port']] != '') {$network_device_portname[$func_res['dev_Infrastructure_port']] = $network_device_portname[$func_res['dev_Infrastructure_port']].','.$func_res['dev_Name'];} else {$network_device_portname[$func_res['dev_Infrastructure_port']] = $func_res['dev_Name'];} + 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']); @@ -193,10 +193,6 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ } unset($multiport); } - // $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 { // Table without Port > echo values echo '
    '; @@ -207,13 +203,52 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ { for ($x=1; $x<=$pia_func_netdevport; $x++) { - if ($network_device_portstate[$x] == 1) {$port_state = '
    Online
    ';} else {$port_state = '
    Offline
    ';} - echo ' - - - - - '; + $online_badge = '
    Online
    '; + $offline_baadge = '
    Offline
    '; + if ($network_device_portstate[$x] == 1) {$port_state = $online_badge;} else {$port_state = $offline_baadge;} + echo ''; + echo ''; + if (stristr($network_device_portstate[$x],',') == '') { + if ($network_device_portstate[$x] == 1) {$port_state = $online_badge;} else {$port_state = $offline_baadge;} + echo ''; + } else { + $multistate = array(); + $multistate = explode(',',$network_device_portstate[$x]); + echo ''; + unset($multistate); + } + if (stristr($network_device_portmac[$x],',') == '') { + echo ''; + } else { + $multimac = array(); + $multimac = explode(',',$network_device_portmac[$x]); + $multiname = array(); + $multiname = explode(',',$network_device_portname[$x]); + echo ''; + unset($multiname, $multimac); + } + if (stristr($network_device_portip[$x],',') == '') { + echo ''; + } else { + $multiip = array(); + $multiip = explode(',',$network_device_portip[$x]); + echo ''; + unset($multiip); + } + echo ''; } } echo '
    Hostname Last known IP
    ###'.$port_state.''.$func_res['dev_Name'].''.$func_res['dev_LastIP'].'
    '.$x.' '.$port_state.'
    ###'.$port_state.''.$func_res['dev_Name'].''.$func_res['dev_LastIP'].'
    '.$x.''.$port_state.''.$network_device_portname[$x].''.$network_device_portip[$x].'
    '.$x.''.$port_state.''; + foreach($multistate as $key => $value) { + if ($value == 1) {$port_state = $online_badge;} else {$port_state = $offline_baadge;} + echo $port_state.'
    '; + } + echo '    		'.$network_device_portname[$x].''; + foreach($multiname as $key => $value) { + echo ''.$value.'
    '; + } + echo '    		'.$network_device_portip[$x].''; + foreach($multiip as $key => $value) { + echo $value.'
    '; + } + echo '
    From d6100dfda31393ab446fd7e62d640b1a9ab091c1 Mon Sep 17 00:00:00 2001 From: leiweibau <105860611+leiweibau@users.noreply.github.com> Date: Thu, 28 Jul 2022 22:19:49 +0200 Subject: [PATCH 10/13] bug fixing and w3c validation --- front/network.php | 13 +++++++------ front/php/templates/footer.php | 2 +- front/php/templates/header.php | 7 +++++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/front/network.php b/front/network.php index 58ce87c8..fdf6ec0b 100644 --- a/front/network.php +++ b/front/network.php @@ -80,7 +80,7 @@ echo $_REQUEST['device_id'];
    - +
    @@ -95,7 +95,7 @@ echo $_REQUEST['device_id'];
    - +
    @@ -223,7 +223,7 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ unset($multistate); } if (stristr($network_device_portmac[$x],',') == '') { - echo ''.$network_device_portname[$x].''; + echo ''.$network_device_portname[$x].''; } else { $multimac = array(); $multimac = explode(',',$network_device_portmac[$x]); @@ -231,13 +231,13 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ $multiname = explode(',',$network_device_portname[$x]); echo ''; foreach($multiname as $key => $value) { - echo ''.$value.'
    '; + echo '    '.$value.'
    '; } echo ''; unset($multiname, $multimac); } if (stristr($network_device_portip[$x],',') == '') { - echo ''.$network_device_portip[$x].''; + echo ''.$network_device_portip[$x].''; } else { $multiip = array(); $multiip = explode(',',$network_device_portip[$x]); @@ -265,7 +265,7 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ $sql = 'SELECT "device_id", "net_device_name", "net_device_typ", "net_device_port" FROM "network_infrastructure"'; $result = $db->query($sql);//->fetchArray(SQLITE3_ASSOC); ?> -
    +
    +
    diff --git a/front/php/templates/footer.php b/front/php/templates/footer.php index ae604c36..0bc35294 100644 --- a/front/php/templates/footer.php +++ b/front/php/templates/footer.php @@ -24,7 +24,7 @@ ('. $conf_data['VERSION_DATE'] .')'; + echo 'Pi.Alert  '. $conf_data['VERSION'] .'  ('. $conf_data['VERSION_DATE'] .')'; ?>
    diff --git a/front/php/templates/header.php b/front/php/templates/header.php index ce9284b1..9c0a1f3f 100644 --- a/front/php/templates/header.php +++ b/front/php/templates/header.php @@ -99,7 +99,6 @@ if ($ENABLED_DARKMODE === True) { $BACKGROUND_IMAGE_PATCH='style="background-image: url(\'img/boxed-bg-dark.png\');"'; } else { $BACKGROUND_IMAGE_PATCH='style="background-image: url(\'img/background.png\');"';} ?> -