From e68c74ea85e43fd7734feb81c05dd4d59e2aad57 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 12 Aug 2010 19:15:19 +0000
Subject: [PATCH] fix customer and iftype graphs since port rrd filename
 changes

git-svn-id: http://www.observium.org/svn/observer/trunk@1673 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/customer/bits.inc.php | 4 ++--
 html/pages/iftype.inc.php                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/includes/graphs/customer/bits.inc.php b/html/includes/graphs/customer/bits.inc.php
index 64bd2e01e..51521d63a 100644
--- a/html/includes/graphs/customer/bits.inc.php
+++ b/html/includes/graphs/customer/bits.inc.php
@@ -4,8 +4,8 @@
 
 $query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE `port_descr_type` = 'cust' AND `port_descr_descr` = '".mres($_GET['id'])."' AND D.device_id = I.device_id");
 while($int = mysql_fetch_array($query)) {
-  if(is_file($config['rrd_dir'] . "/" . $int['hostname'] . "/" . safename($int['ifIndex'] . ".rrd"))) {
-    $rrd_filenames[] = $config['rrd_dir'] . "/" . $int['hostname'] . "/" . safename($int['ifIndex'] . ".rrd");
+  if(is_file($config['rrd_dir'] . "/" . $int['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd"))) {
+    $rrd_filenames[] = $config['rrd_dir'] . "/" . $int['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd");
   }
 }
 
diff --git a/html/pages/iftype.inc.php b/html/pages/iftype.inc.php
index b4a4018bb..dde985e4b 100644
--- a/html/pages/iftype.inc.php
+++ b/html/pages/iftype.inc.php
@@ -54,7 +54,7 @@ echo("<table cellpadding=7 cellspacing=0 class=devicetable width=100%>");
 
     echo("</td></tr><tr bgcolor='$bg'><td>");
 
-if(file_exists($config['rrd_dir'] . "/" . $interface['hostname'] . "/" . $interface['ifIndex'] . ".rrd")) {
+if(file_exists($config['rrd_dir'] . "/" . $interface['hostname'] . "/port-" . $interface['ifIndex'] . ".rrd")) {
 
     $graph_type = "port_bits";
     include("includes/print-interface-graphs.inc.php");