From 870cb750383fb377a7d3e42c20488072e35e9912 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 7 Oct 2011 13:42:02 +0000
Subject: [PATCH] fixes

git-svn-id: http://www.observium.org/svn/observer/trunk@2660 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/customer/bits.inc.php | 6 ++++--
 html/map.php                               | 8 ++++----
 html/pages/device/routing/ospf.inc.php     | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/html/includes/graphs/customer/bits.inc.php b/html/includes/graphs/customer/bits.inc.php
index d47f83986a..e7529c2312 100644
--- a/html/includes/graphs/customer/bits.inc.php
+++ b/html/includes/graphs/customer/bits.inc.php
@@ -7,8 +7,10 @@ foreach (dbFetchRows("SELECT * FROM `ports` AS I, `devices` AS D WHERE `port_des
   if (is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd")))
   {
     $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd");
-    $rrd_list[$i]['filename'] = $rrd_filename;
-    $rrd_list[$i]['descr'] = $port['hostname'] ."-". $port['ifDescr'];
+    $rrd_list[$i]['filename']  = $rrd_filename;
+    $rrd_list[$i]['descr']     = $port['hostname'] ."-". $port['ifDescr'];
+    $rrd_list[$i]['descr_in']  = shorthost($port['hostname']);
+    $rrd_list[$i]['descr_out'] = makeshortif($port['ifDescr']);
     $i++;
   }
 }
diff --git a/html/map.php b/html/map.php
index dde556e026..8614113449 100755
--- a/html/map.php
+++ b/html/map.php
@@ -3,10 +3,10 @@
 ### FIXME : remove link when port/host is not in the database (things /seen/ but not *discovered*)
 ###         No, that should be there... I like to see that stuff :> (adama)
 
-#  ini_set('display_errors', 1);
-#  ini_set('display_startup_errors', 1);
-#  ini_set('log_errors', 1);
-#  ini_set('error_reporting', E_ALL);
+  ini_set('display_errors', 1);
+  ini_set('display_startup_errors', 1);
+  ini_set('log_errors', 1);
+  ini_set('error_reporting', E_ALL);
 
 $links = 1;
 
diff --git a/html/pages/device/routing/ospf.inc.php b/html/pages/device/routing/ospf.inc.php
index 0a4fa95473..f8322b36cf 100644
--- a/html/pages/device/routing/ospf.inc.php
+++ b/html/pages/device/routing/ospf.inc.php
@@ -109,7 +109,7 @@ foreach (dbFetchRows("SELECT * FROM `ospf_instances` WHERE `device_id` = ?", arr
     $host = @dbFetchRow("SELECT * FROM ipv4_addresses AS A, ports AS I, devices AS D WHERE A.ipv4_address = ?
                                             AND I.interface_id = A.interface_id AND D.device_id = I.device_id", array($nbr['ospfNbrRtrId']));
 
-    if (is_array($host)) { $rtr_id = generate_device_link($host, $nbr['ospfNbrRtrId']); } else { $rtr_id = "unknown"; }
+    if (is_array($host)) { $rtr_id = generate_device_link($host); } else { $rtr_id = "unknown"; }
 
     echo('<tr bgcolor="'.$nbr_bg.'">');
     echo('  <td width=5></td>');