From a1349f83139d4890412d3f5fcab015a9084c3c91 Mon Sep 17 00:00:00 2001
From: leiweibau <105860611+leiweibau@users.noreply.github.com>
Date: Wed, 27 Jul 2022 00:58:06 +0200
Subject: [PATCH] add port number

---
 front/deviceDetails.php      | 59 +++++++++++++++++++++---------------
 front/network.php            | 30 +++++++++---------
 front/php/server/devices.php |  2 ++
 3 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/front/deviceDetails.php b/front/deviceDetails.php
index 9ee4b1a2..8b36dee8 100644
--- a/front/deviceDetails.php
+++ b/front/deviceDetails.php
@@ -265,11 +265,17 @@ if ($_REQUEST['mac'] == 'Internet') { $DevDetail_Tap_temp = "Tools"; } else { $D
                       </div>
 
                       <div class="form-group">
-                        <label class="col-sm-3 control-label">Infrastructure</label>
+                        <label class="col-sm-3 control-label">Network Hardward</label>
                         <div class="col-sm-9">
                           <input class="form-control" id="txtInfrastructure" type="text" value="--">
                         </div>
                       </div>
+                      <div class="form-group">
+                        <label class="col-sm-3 control-label">Network HW Port</label>
+                        <div class="col-sm-9">
+                          <input class="form-control" id="txtInfrastructurePort" type="text" value="--">
+                        </div>
+                      </div>
 
 
                     </div>          
@@ -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'];
 		<div class="box box-default collapsed-box">
         <div class="box-header with-border">
           <h3 class="box-title">Verwalte Netzwerk-Geräte</h3>
-
           <div class="box-tools pull-right">
             <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-            <!-- <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-remove"></i></button> -->
           </div>
         </div>
         <!-- /.box-header -->
@@ -102,7 +106,6 @@ echo $_REQUEST['device_id'];
                   <select class="form-control" name="NetworkDeviceID">
                     <option value="">-- Select Typ --</option>
 					<?php
-
 					$sql = 'SELECT "device_id", "net_device_name", "net_device_typ" FROM "network_infrastructure"'; 
 					$result = $db->query($sql);//->fetchArray(SQLITE3_ASSOC); 
 					while($res = $result->fetchArray(SQLITE3_ASSOC)){
@@ -126,7 +129,6 @@ echo $_REQUEST['device_id'];
         <!-- /.box-body -->
       </div>
 
-	
 <?php
 function createnetworktab($pia_func_netdevid, $pia_func_netdevname, $pia_func_netdevtyp, $activetab) {
 	echo '<li class="'.$activetab.'"><a href="#'.$pia_func_netdevid.'" data-toggle="tab">'.$pia_func_netdevname.' / '.$pia_func_netdevtyp.'</a></li>';
@@ -140,12 +142,11 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_
 
 	while($func_res = $func_result->fetchArray(SQLITE3_ASSOC)){
 		if(!isset($func_res['dev_Name'])) continue;
-		echo $func_res['dev_Name'].' - '.$func_res['dev_LastIP'].' - '.$func_res['dev_PresentLastScan'].'<br>';
+		if ($func_res['dev_PresentLastScan'] == 1) {$port_state = '<div class="badge bg-green text-white">Up</div>';} else {$port_state = '<div class="badge bg-red text-white">Down</div>';}
+		echo 'Port: '.$func_res['dev_Infrastructure_port'].' - '.$port_state.' - <a href="./deviceDetails.php?mac='.$func_res['dev_MAC'].'">'.$func_res['dev_Name'].' - '.$func_res['dev_LastIP'].'</a><br>';
 	}
-
 	echo '</div> ';
 }
-
 $sql = 'SELECT "device_id", "net_device_name", "net_device_typ" FROM "network_infrastructure"'; 
 $result = $db->query($sql);//->fetchArray(SQLITE3_ASSOC); 
 ?>
@@ -163,8 +164,7 @@ while($res = $result->fetchArray(SQLITE3_ASSOC)){
 }
 ?>              
             </ul>
-
-            <div class="tab-content">
+			<div class="tab-content">
 <?php
 $i = 0;
 while($res = $result->fetchArray(SQLITE3_ASSOC)){
diff --git a/front/php/server/devices.php b/front/php/server/devices.php
index 6fa3efab..74818dea 100644
--- a/front/php/server/devices.php
+++ b/front/php/server/devices.php
@@ -87,6 +87,7 @@ function getDeviceData() {
   $mac = $deviceData['dev_MAC'];
 
   $deviceData['dev_Infrastructure'] = $row['dev_Infrastructure'];
+  $deviceData['dev_Infrastructure_port'] = $row['dev_Infrastructure_port'];
   $deviceData['dev_FirstConnection'] = formatDate ($row['dev_FirstConnection']); // Date formated
   $deviceData['dev_LastConnection'] =  formatDate ($row['dev_LastConnection']);  // Date formated
 
@@ -155,6 +156,7 @@ function setDeviceData() {
                  dev_Location        = "'. quotes($_REQUEST['location'])     .'",
                  dev_Comments        = "'. quotes($_REQUEST['comments'])     .'",
                  dev_Infrastructure  = "'. quotes($_REQUEST['infrastructure']).'",
+                 dev_Infrastructure_port  = "'. quotes($_REQUEST['infrastructureport']).'",
                  dev_StaticIP        = "'. quotes($_REQUEST['staticIP'])     .'",
                  dev_ScanCycle       = "'. quotes($_REQUEST['scancycle'])    .'",
                  dev_AlertEvents     = "'. quotes($_REQUEST['alertevents'])  .'",