From 2237a6ff62ffe4e934cc812c631bb4bab838bf5c Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 23 Nov 2011 12:53:24 +0000
Subject: [PATCH] fix fabric graph overlib descr and vlan output

git-svn-id: http://www.observium.org/svn/observer/trunk@2734 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/print-vlan.inc.php           | 3 ++-
 html/pages/device/overview/c6kxbar.inc.php | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/html/includes/print-vlan.inc.php b/html/includes/print-vlan.inc.php
index a61957584..676177c2c 100644
--- a/html/includes/print-vlan.inc.php
+++ b/html/includes/print-vlan.inc.php
@@ -10,6 +10,7 @@ echo("<td class=list-bold>");
 
 foreach (dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?", array($device['device_id'], $vlan['vlan_vlan'])) as $port)
 {
+  $port = ifLabel($port, $device);
   if ($vars['view'] == "graphs")
   {
     echo("<div style='display: block; padding: 2px; margin: 2px; min-width: 139px; max-width:139px; min-height:85px; max-height:85px; text-align: center; float: left; background-color: ".$list_colour_b_b.";'>
@@ -26,7 +27,7 @@ foreach (dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?
   }
   else
   {
-    echo($vlan['port_sep'] . generate_port_link($port, makeshortif(ifnamedescr($port))));
+    echo($vlan['port_sep'] . generate_port_link($port, makeshortif($port['label']));
     $vlan['port_sep'] = ", ";
   }
 }
diff --git a/html/pages/device/overview/c6kxbar.inc.php b/html/pages/device/overview/c6kxbar.inc.php
index fff882aa4..c95bd6233 100644
--- a/html/pages/device/overview/c6kxbar.inc.php
+++ b/html/pages/device/overview/c6kxbar.inc.php
@@ -52,6 +52,8 @@ foreach($entity_state['group']['c6kxbar'] as $index => $entry)
     unset($link_array['height'], $link_array['width'], $link_array['legend']);
     $link = generate_url($link_array);
 
+    $text_descr = $entity['entPhysicalName'] . " - Fabric " . $subindex;
+
     $overlib_content = generate_overlib_content($graph_array, $device['hostname'] . " - " . $text_descr);
 
     $graph_array['width'] = 80; $graph_array['height'] = 20; $graph_array['bg'] = $graph_colour;