From bccaa2c279a3e975da7ea68710382a8c9cb59307 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 4 May 2011 11:09:27 +0000
Subject: [PATCH] fix temperatures

git-svn-id: http://www.observium.org/svn/observer/trunk@2237 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/functions.inc.php                 | 2 ++
 includes/discovery/temperatures/cisco-envmon.inc.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php
index 7d4a07ba1..565a3b745 100644
--- a/includes/discovery/functions.inc.php
+++ b/includes/discovery/functions.inc.php
@@ -147,6 +147,8 @@ function check_valid_sensors($device, $class, $valid)
   {
     while ($test = mysql_fetch_assoc($query))
     {
+
+      print_r($test);
       $index = $test['sensor_index'];
       $type = $test['sensor_type'];
       if ($debug) { echo($index . " -> " . $type . "\n"); }
diff --git a/includes/discovery/temperatures/cisco-envmon.inc.php b/includes/discovery/temperatures/cisco-envmon.inc.php
index 50b6a4d5b..e01fa1ce3 100644
--- a/includes/discovery/temperatures/cisco-envmon.inc.php
+++ b/includes/discovery/temperatures/cisco-envmon.inc.php
@@ -1,6 +1,5 @@
 <?php
 
-
 global $entity_temperature;
 
 if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = '".$device['device_id']."' AND `sensor_class` = 'temperature' AND (`sensor_type` = 'cisco-entity-sensor' OR `sensor_type` = 'entity-sensor')"),0) == "0" && ($device['os'] == "ios" || $device['os_group'] == "ios"))
@@ -27,9 +26,10 @@ if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` =
         $descr = trim($descr);
 
         discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'cisco', $descr, '1', '1', NULL, NULL, NULL, NULL, $temperature);
+
       }
     }
   }
 }
 
-?>
\ No newline at end of file
+?>