diff --git a/front/network.php b/front/network.php index 202d46ec..f7517ef8 100644 --- a/front/network.php +++ b/front/network.php @@ -18,6 +18,7 @@ $sql = 'CREATE TABLE IF NOT EXISTS "network_infrastructure" ( "device_id" INTEGER, "net_device_name" TEXT NOT NULL, "net_device_typ" TEXT NOT NULL, + "net_device_port" INTEGER, PRIMARY KEY("device_id" AUTOINCREMENT) )'; $result = $db->query($sql); @@ -34,7 +35,7 @@ $result = $db->query($sql); if ($_REQUEST['Networkinsert'] == "yes") { if (isset($_REQUEST['NetworkDeviceName']) && isset($_REQUEST['NetworkDeviceTyp'])) { - $sql = 'INSERT INTO "network_infrastructure" ("net_device_name", "net_device_typ") VALUES("'.$_REQUEST['NetworkDeviceName'].'", "'.$_REQUEST['NetworkDeviceTyp'].'")'; + $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); } } @@ -89,9 +90,13 @@ 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); +?>
    -
    - +
    +