From 00b22a54a59ca9e8bcc71bc6b914be4aed8b687e Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 15 Dec 2011 23:14:50 +0000
Subject: [PATCH] improved vlan display

git-svn-id: http://www.observium.org/svn/observer/trunk@2787 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/print-vlan.inc.php     | 17 ++++++++++++++++-
 html/pages/device/port/vlans.inc.php |  9 +++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/html/includes/print-vlan.inc.php b/html/includes/print-vlan.inc.php
index 8ab7be263..53593c6fd 100644
--- a/html/includes/print-vlan.inc.php
+++ b/html/includes/print-vlan.inc.php
@@ -8,7 +8,20 @@ echo("<td width=100 class=list-large> Vlan " . $vlan['vlan_vlan'] . "</td>");
 echo("<td width=200 class=box-desc>" . $vlan['vlan_descr'] . "</td>");
 echo("<td class=list-bold>");
 
-foreach (dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?", array($device['device_id'], $vlan['vlan_vlan'])) as $port)
+  $vlan_ports = array();
+  $otherports = dbFetchRows("SELECT * FROM `ports_vlans` AS V, `ports` as P WHERE V.`device_id` = ? AND V.`vlan` = ? AND P.interface_id = V.interface_id", array($device['device_id'], $vlan['vlan_vlan']));
+  foreach($otherports as $otherport)
+  {
+   $vlan_ports[$otherport[ifIndex]] = $otherport;
+  }
+  $otherports = dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?", array($device['device_id'], $vlan['vlan_vlan']));
+  foreach($otherports as $otherport)
+  {
+   $vlan_ports[$otherport[ifIndex]] = array_merge($otherport, array('untagged' => '1'));
+  }
+  ksort($vlan_ports);
+
+foreach ($vlan_ports as $port)
 {
   $port = ifLabel($port, $device);
   if ($vars['view'] == "graphs")
@@ -29,6 +42,8 @@ foreach (dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?
   {
     echo($vlan['port_sep'] . generate_port_link($port, makeshortif($port['label'])));
     $vlan['port_sep'] = ", ";
+    if($port['untagged']) { echo("(U)"); }
+
   }
 }
 
diff --git a/html/pages/device/port/vlans.inc.php b/html/pages/device/port/vlans.inc.php
index e008a5888..f284c8119 100644
--- a/html/pages/device/port/vlans.inc.php
+++ b/html/pages/device/port/vlans.inc.php
@@ -4,7 +4,7 @@ $vlans = dbFetchRows("SELECT * FROM `ports_vlans` AS PV, vlans AS V WHERE PV.`in
 
 echo('<table border="0" cellspacing="0" cellpadding="5" width="100%">');
 
-echo("<tr><td>VLAN</td><td>Description</td><td>Cost</td><td>Priority</td><td>State</td><td>Other Ports</td></tr>");
+echo("<tr><th>VLAN</th><th>Description</th><th>Cost</th><th>Priority</th><th>State</th><th>Other Ports</th></tr>");
 
 $row=0;
 foreach($vlans as $vlan)
@@ -19,19 +19,16 @@ foreach($vlans as $vlan)
   echo("<td>".$vlan['cost']."</td><td>".$vlan['priority']."</td><td>".$vlan['state']."</td>");
 
   $vlan_ports = array();
-
   $otherports = dbFetchRows("SELECT * FROM `ports_vlans` AS V, `ports` as P WHERE V.`device_id` = ? AND V.`vlan` = ? AND P.interface_id = V.interface_id", array($device['device_id'], $vlan['vlan']));
   foreach($otherports as $otherport)
   {
    $vlan_ports[$otherport[ifIndex]] = $otherport;
   }
-
   $otherports = dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?", array($device['device_id'], $vlan['vlan']));
   foreach($otherports as $otherport)
   {
-   $vlan_ports[$otherport[ifIndex]] = array_merge($otherport, array('access' => '1'));
+   $vlan_ports[$otherport[ifIndex]] = array_merge($otherport, array('untagged' => '1'));
   }
-
   ksort($vlan_ports);
 
   echo("<td>");
@@ -39,7 +36,7 @@ foreach($vlans as $vlan)
   foreach($vlan_ports as $otherport)
   {
     echo($vsep.generate_port_link($otherport, makeshortif($otherport['ifDescr'])));
-    if($otherport['access']) { echo("(A)"); }
+    if($otherport['untagged']) { echo("(U)"); }
     $vsep=", ";
   }
   echo("</td>");