From 38cd6d58cbfc963acf49278863d20868d6b36ff9 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 13 May 2011 13:08:25 +0000
Subject: [PATCH] wtfbbq, ports have fanspeed? (and fix pagp_bits!)

git-svn-id: http://www.observium.org/svn/observer/trunk@2308 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/port/fanspeed.inc.php  | 22 ---------------------
 html/includes/graphs/port/pagp_bits.inc.php |  6 ++----
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 html/includes/graphs/port/fanspeed.inc.php

diff --git a/html/includes/graphs/port/fanspeed.inc.php b/html/includes/graphs/port/fanspeed.inc.php
deleted file mode 100644
index 361720e45..000000000
--- a/html/includes/graphs/port/fanspeed.inc.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-$scale_min = "0";
-
-include("includes/graphs/common.inc.php");
-
-$rrd_options .= " COMMENT:'                         Last     Max\\n'";
-
-$fanspeed = mysql_fetch_assoc(mysql_query("SELECT * FROM sensors WHERE sensor_class='fanspeed' AND sensor_id = '".mres($_GET['id'])."'"));
-
-$hostname = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '" . $fanspeed['device_id'] . "'"),0);
-
-$fanspeed['sensor_descr_fixed'] = substr(str_pad($fanspeed['sensor_descr'], 20),0,20);
-
-$rrd_filename  = $config['rrd_dir'] . "/".$hostname."/" . safename("fan-" . $fanspeed['sensor_descr'] . ".rrd");
-
-$rrd_options .= " DEF:fan=$rrd_filename:fan:AVERAGE";
-$rrd_options .= " LINE1.5:fan#cc0000:'" . str_replace(':','\:',str_replace('\*','*',quotemeta($fanspeed['sensor_descr_fixed'])))."'"; # Ugly hack :(
-$rrd_options .= " GPRINT:fan:LAST:%3.0lfrpm";
-$rrd_options .= " GPRINT:fan:MAX:%3.0lfrpm\\\\l";
-
-?>
\ No newline at end of file
diff --git a/html/includes/graphs/port/pagp_bits.inc.php b/html/includes/graphs/port/pagp_bits.inc.php
index f34e5012e..b33ce2422 100644
--- a/html/includes/graphs/port/pagp_bits.inc.php
+++ b/html/includes/graphs/port/pagp_bits.inc.php
@@ -2,10 +2,8 @@
 
 ## Generate a list of ports and then call the multi_bits grapher to generate from the list
 
-$query = mysql_query("SELECT * FROM `ports` WHERE `device_id` = '".$port['device_id']."' AND `pagpGroupIfIndex` = '".$port['ifIndex']."'");
-
 $i=0;
-while ($int = mysql_fetch_assoc($query))
+foreach(dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ? AND `pagpGroupIfIndex` = ?", array($port['device_id'], $port['ifIndex'])) as $int)
 {
   if (is_file($config['rrd_dir'] . "/" . $hostname . "/port-" . safename($int['ifIndex'] . ".rrd")))
   {
@@ -27,4 +25,4 @@ $rra_out = "OUTOCTETS";
 
 include("includes/graphs/generic_multi_bits_separated.inc.php");
 
-?>
\ No newline at end of file
+?>