diff --git a/show.php b/show.php index 053a581..62f49ae 100644 --- a/show.php +++ b/show.php @@ -19,10 +19,11 @@ $otherPattern = " .*$NLP"; $endPattern = "(?\d+)\/0\/(?P\d+)$NLP"; -$portHybridPattern = " port hybrid (?:pvid )?vlan (?:(?P\d+)(?: [0-9a-z ]*)? tagged|(?P\d+)(?: \d+)* untagged)$NLP"; $portAccessPattern = " port (?:access |trunk |hybrid |pvid |vlan )*(?P\d+)$NLP"; +$portHybridPattern = " port hybrid (?:pvid )?vlan (?:(?P\d+)(?: [0-9a-z ]*)? tagged|(?P\d+)(?: \d+)* untagged)$NLP"; $voiceVlanPattern = " voice-vlan (?P\d+) enable$NLP"; -preg_match_all("/$startPattern$interfaceAddressPattern(?:$portHybridPattern|$portAccessPattern|$voiceVlanPattern|$otherPattern)*$endPattern/", $conf, $interfaces, PREG_SET_ORDER); +preg_match_all("/$startPattern$interfaceAddressPattern(?:$portAccessPattern|$portHybridPattern|$voiceVlanPattern|$otherPattern)*$endPattern/", $conf, $interfaces, PREG_SET_ORDER); + $stack = array(); foreach ($interfaces as $interface) { if (!isset($stack[$interface["member"]])) $stack[$interface["member"]] = [[], []]; @@ -30,12 +31,13 @@ foreach ($interfaces as $interface) { if (!empty($interface["pvid"])) $interface["style"] .= "--pvid: {$interface["pvid"]}; "; if (!empty($interface["tagged"])) $interface["style"] .= "--tagged: {$interface["tagged"]}; "; if (!empty($interface["untagged"])) $interface["style"] .= "--untagged: {$interface["untagged"]}; "; + if (!empty($interface["voice_vlan"])) $interface["style"] .= "--voice-vlan: {$interface["voice_vlan"]}; "; $stack[$interface["member"]][1 - $interface["port"] % 2][$interface["port"]] = $interface; } /*echo ("");*/ +var_dump($stack); +echo ("-->");*/ ?> @@ -96,10 +98,10 @@ foreach ($interfaces as $interface) { Trunk - + Power on Ethernet diff --git a/style.css b/style.css index 48a6036..2d86e2f 100644 --- a/style.css +++ b/style.css @@ -112,7 +112,7 @@ main { } .member-id { - background: #777; + background: #888; align-content: center; color: lightgreen; text-shadow: 0 1px 3px #fffb;