From 8b2bc22272a9039a43e5935a8eca42312e24f27c Mon Sep 17 00:00:00 2001
From: Robert Verspuy <robert@exa.nl>
Date: Fri, 17 Feb 2017 09:51:48 +0100
Subject: [PATCH] Fixed a few small bugs, introduced by the Poller tidy up of
 laf (#5930)

* Fix for #5734 - incorrect hostname in the mouse-over of the services in the availability-map

* Fixed a few small bugs, introduced by the Poller tidy up of laf
---
 includes/polling/functions.inc.php | 4 ++--
 includes/polling/sensors.inc.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php
index a11c5f521a..9fe1e9d3f3 100644
--- a/includes/polling/functions.inc.php
+++ b/includes/polling/functions.inc.php
@@ -56,7 +56,7 @@ function poll_sensor($device, $class)
     $misc_sensors = array();
     $all_sensors = array();
 
-    foreach (dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = '?' AND `device_id` = ?", array($class, $device['device_id'])) as $sensor) {
+    foreach (dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `device_id` = ?", array($class, $device['device_id'])) as $sensor) {
         if ($sensor['poller_type'] == 'agent') {
             $misc_sensors[] = $sensor;
         } elseif ($sensor['poller_type'] == 'ipmi') {
@@ -176,7 +176,7 @@ function poll_sensor($device, $class)
         if ($sensor['sensor_class'] == 'state' && $sensor['sensor_current'] != $sensor_value) {
             log_event($class . ' sensor has changed from ' . $sensor['sensor_current'] . ' to ' . $sensor_value, $device, $class, 3, $sensor['sensor_id']);
         }
-        dbUpdate(array('sensor_current' => $sensor_value, 'sensor_prev' => $sensor['sensor_current'], 'lastupdate' => array('NOW()')), 'sensors', "`sensor_class` = '?' AND `sensor_id` = ?", array($class,$sensor['sensor_id']));
+        dbUpdate(array('sensor_current' => $sensor_value, 'sensor_prev' => $sensor['sensor_current'], 'lastupdate' => array('NOW()')), 'sensors', "`sensor_class` = ? AND `sensor_id` = ?", array($class,$sensor['sensor_id']));
         unset($supported_sensors);
     }
 }//end poll_sensor()
diff --git a/includes/polling/sensors.inc.php b/includes/polling/sensors.inc.php
index 902eb837da..9a29c2265e 100644
--- a/includes/polling/sensors.inc.php
+++ b/includes/polling/sensors.inc.php
@@ -13,7 +13,7 @@
 
 $sensors = dbFetchRows("SELECT `sensor_class` FROM `sensors` WHERE `device_id` = ? GROUP BY `sensor_class`", array($device['device_id']));
 foreach ($sensors as $sensor_type) {
-    poll_sensor($device, $sensor_type);
+    poll_sensor($device, $sensor_type['sensor_class']);
 }
 
 unset($sensors, $sensor_type);