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] 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'];
             <div class="col-md-6">
             <form role="form" method="post" action="./network.php">
               <div class="form-group">
-                <label for="exampleInputEmail1">Netzwerk Gerät hinzufügen:</label>
+                <label for="NetworkDeviceName">Netzwerk Gerät hinzufügen:</label>
                 <input type="text" class="form-control" id="NetworkDeviceName" name="NetworkDeviceName" placeholder="Name">
               </div>
               <!-- /.form-group -->
@@ -95,7 +95,7 @@ echo $_REQUEST['device_id'];
                   </select>
               </div>
               <div class="form-group">
-                <label for="exampleInputEmail1">Portanzahl des Gerätes (bei WLAN leer lassen):</label>
+                <label for="NetworkDevicePort">Portanzahl des Gerätes (bei WLAN leer lassen):</label>
                 <input type="text" class="form-control" id="NetworkDevicePort" name="NetworkDevicePort" placeholder="Portanzahl">
               </div>
               <div class="form-group">
@@ -223,7 +223,7 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_
             unset($multistate);
           }           
           if (stristr($network_device_portmac[$x],',') == '') {
-            echo '<td><a href="./deviceDetails.php?mac='.$network_device_portmac[$x].'"><b>'.$network_device_portname[$x].'</b></td>';
+            echo '<td><a href="./deviceDetails.php?mac='.$network_device_portmac[$x].'"><b>'.$network_device_portname[$x].'</b></a></td>';
           } 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 '<td>';
             foreach($multiname as $key => $value) {
-                echo '<a href="./deviceDetails.php?mac='.$multimac[$key].'"><b>'.$value.'</b><br>';
+                echo '<a href="./deviceDetails.php?mac='.$multimac[$key].'"><b>'.$value.'</b></a><br>';
             }
             echo '</td>';
             unset($multiname, $multimac);
           } 
           if (stristr($network_device_portip[$x],',') == '') {
-            echo '<td>'.$network_device_portip[$x].'</a></td>';
+            echo '<td>'.$network_device_portip[$x].'</td>';
           } 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); 
 ?>
-      <div class="nav-tabs-custom">
+      <div class="nav-tabs-custom" style="margin-bottom: 0px;">
             <ul class="nav nav-tabs">
 <?php
 $i = 0;
@@ -295,6 +295,7 @@ unset($i);
             </div>
             <!-- /.tab-content -->
   </div>
+  <div style="width: 100%; height: 20px;"></div>
 </section>
 
     <!-- /.content -->
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 @@
     <?php
       $conf_file = '../config/version.conf';
       $conf_data = parse_ini_file($conf_file);
-      echo 'Pi.Alert&nbsp&nbsp'. $conf_data['VERSION'] .'&nbsp&nbsp<small>('. $conf_data['VERSION_DATE'] .')</small>';
+      echo 'Pi.Alert&nbsp;&nbsp;'. $conf_data['VERSION'] .'&nbsp;&nbsp;<small>('. $conf_data['VERSION_DATE'] .')</small>';
     ?>
     </div>
   </footer>
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\');"';}
 ?>
-
 <!-- Servertime to the right of the hostname -->
 <script>
 var pia_servertime = new Date(<?php echo date("Y, n, j, G, i, s") ?>);
@@ -151,7 +150,7 @@ function show_pia_servertime() {
         <ul class="nav navbar-nav">
 
           <!-- Server Name -->
-          <li><a style="pointer-events:none;"><?php echo gethostname();?> <span id="PIA_Servertime_place"></a></li>
+          <li><a style="pointer-events:none;"><?php echo gethostname();?> <span id="PIA_Servertime_place"></span></a></li>
 
           <!-- Header right info -->
           <li class="dropdown user user-menu">
@@ -225,6 +224,10 @@ function show_pia_servertime() {
           <a href="events.php"><i class="fa fa-bolt"></i> <span><?php echo $pia_lang['Navigation_Events'];?></span></a>
         </li>
 
+        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('network.php') ) ){ echo 'active'; } ?>">
+          <a href="network.php"><i class="fa fa-server"></i> <span>Netzwerk</span></a>
+        </li>
+
         <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'active'; } ?>">
           <a href="maintenance.php"><i class="fa fa-cog"></i> <span><?php echo $pia_lang['Navigation_Maintenance'];?></span></a>
         </li>