From b4b3c5959f21e871116a78791d72b5746353ba75 Mon Sep 17 00:00:00 2001
From: adrien <adrien@malingrey.fr>
Date: Wed, 23 Aug 2023 11:29:43 +0200
Subject: [PATCH] prioritize shutdown, change class names

---
 style.css | 12 ++++++------
 vlans.php | 11 +++++++----
 2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/style.css b/style.css
index 48054d1..eab745c 100644
--- a/style.css
+++ b/style.css
@@ -19,11 +19,11 @@ td {
     margin: 0;
     border: 4px solid #335;
 }
-.vlans {
+.legend {
     border-spacing: 0;
 }
 .member td,
-.vlans td {
+.legend td {
     border: 2px inset;
 }
 .interface {
@@ -33,8 +33,7 @@ td {
     mix-blend-mode: darken;
     padding: 2px;
 }
-.access,
-.pvid {
+.vlan {
     background-color: hsl(calc(var(--k)*var(--pvid)) 100% 60%);
 }
 .trunk {
@@ -50,8 +49,9 @@ td {
     background-image: linear-gradient(135deg, hsl(calc(var(--k)*var(--tagged)) 100% 60%) 50%, hsl(calc(var(--k)*var(--untagged)) 100% 60%) 50%);
 }
 .shutdown {
-    background-color: lightgray;
-    color: gray;
+    background-color: lightgray !important;
+    background-image: none !important;
+    color: gray !important;
 }
 .poe {
     position: relative;
diff --git a/vlans.php b/vlans.php
index ff39a1d..e31adec 100644
--- a/vlans.php
+++ b/vlans.php
@@ -11,7 +11,7 @@ $conf = file_get_contents($path);
 preg_match("/ sysname ([\w-]+)/", $conf, $sysname);
 preg_match("/ip address ([\d.]+)/", $conf, $address);
 preg_match_all("/(?<=\n)vlan (?P<pvid>\d+)[\r\n]+(?: name (?P<name>.+)[\r\n]+| description (?P<description>.+)[\r\n]+| .*[\r\n]+)*/", $conf, $vlans, PREG_SET_ORDER);
-preg_match_all("/(?<=\n)interface [\w-]+(?P<member>\d+)\/0\/(?P<port>\d+)[\r\n]+(?: port hybrid vlan (?P<tagged>\d+) tagged[\r\n]+| port hybrid vlan (?P<untagged>\d+)(?: \d+)* untagged[\r\n]+| port (?P<linktype>access|trunk pvid|hybrid pvid) vlan (?P<pvid>\d+)[\r\n]+| (?P<poe>poe) enable[\r\n]+| (?P<shutdown>shutdown)[\r\n]+| .*[\r\n]+)*/", $conf, $interfaces, PREG_SET_ORDER);
+preg_match_all("/(?<=\n)interface [\w-]+(?P<member>\d+)\/0\/(?P<port>\d+)[\r\n]+(?: port hybrid (?:pvid )?vlan (?P<tagged>\d+) tagged[\r\n]+| port hybrid vlan (?P<untagged>\d+)(?: \d+)* untagged[\r\n]+| port (?P<linktype>(?:access |trunk |hybrid |pvid |vlan )*)(?P<pvid>\d+)[\r\n]+| (?P<poe>poe) enable[\r\n]+| (?P<shutdown>shutdown)[\r\n]+| .*[\r\n]+)*/", $conf, $interfaces, PREG_SET_ORDER);
 $stack = array();
 foreach ($interfaces as $interface) {
     if (!isset($stack[$interface["member"]])) {
@@ -19,6 +19,9 @@ foreach ($interfaces as $interface) {
     }
     $stack[$interface["member"]][$interface["port"]] = $interface;
 }
+echo ("<!--");
+var_dump($stack);
+echo ("-->");
 ?>
 <!DOCTYPE HTML>
 <html lang='fr'>
@@ -54,7 +57,7 @@ foreach ($stack as $member => $interfaces) {
 ?>
 </tbody>
 </table>
-<table class='vlans'>
+<table class='legend'>
 <caption><h2>Légende</h2></caption>
 <thead><tr><th>PVID</th><th>Nom</th><th>Description</th></tr></thead>
 <tbody>
@@ -63,7 +66,7 @@ foreach ($vlans as $vlan) {
     if (isset($vlan["pvid"]) and $vlan["pvid"] != 1) {
         $name = $vlan["name"] ?? "";
         $description = $vlan["description"] ?? "";
-        echo "<tr title='${vlan[0]}'><td class='interface pvid' style='--pvid: ${vlan["pvid"]}'>${vlan["pvid"]}</td><td>$name</td><td>$description</td></tr>";
+        echo "<tr title='${vlan[0]}'><td class='interface vlan' style='--pvid: ${vlan["pvid"]}'>${vlan["pvid"]}</td><td>$name</td><td>$description</td></tr>";
     }
 }
 ?>
@@ -75,4 +78,4 @@ foreach ($vlans as $vlan) {
 </table>
 </main>
 </body>
-</html>
+</html>
\ No newline at end of file

PVID	Nom	Description
${vlan["pvid"]}	$name	$description
${vlan["pvid"]}	$name	$description