diff --git a/show.php b/show.php index 64728af..fb8f673 100644 --- a/show.php +++ b/show.php @@ -30,7 +30,7 @@ $endPattern = "(?\d+)\/0\/(?P\d+)$NL"; $pvidPattern = " port (?:access|trunk pvid|hybrid pvid) vlan (?P\d+)$NL"; -$portHybridPattern = " port hybrid (?:pvid )?vlan (?:(?P\d+)(?: [0-9a-z ]*)? tagged|(?P\d+)(?: \d+)* untagged)$NL"; +$portHybridPattern = " port hybrid vlan (?:(?P\d+)(?: [\d ]*)? tagged|(?P\d+)(?: \d+)* untagged)$NL"; $voiceVlanPattern = " voice-vlan (?P\d+) enable$NL"; preg_match_all("/$startPattern$interfaceAddressPattern(?:$pvidPattern|$portHybridPattern|$voiceVlanPattern|$otherPattern)*$endPattern/", $conf, $interfaces, PREG_SET_ORDER); @@ -134,16 +134,19 @@ foreach ($interfaces as $interface) { diff --git a/style.css b/style.css index ea8289f..884dd34 100644 --- a/style.css +++ b/style.css @@ -190,6 +190,8 @@ main { .hybrid { --tagged: 0; --tagged-color: hsl(calc(var(--hue) * var(--tagged)) var(--saturation) var(--lightness)); + --untagged: var(--pvid); + --untagged-color: hsl(calc(var(--hue) * var(--untagged)) var(--saturation) var(--lightness)); background-image: linear-gradient(145deg, transparent 50%, var(--tagged-color) 50%); }