From 965b0df8cb6db19951795aebfdc69951c17c597e Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Fri, 1 May 2015 11:22:36 +0100
Subject: [PATCH] Scrut fixes

---
 includes/discovery/os/siklu.inc.php           | 1 -
 includes/discovery/temperatures/siklu.inc.php | 4 ++--
 includes/discovery/voltages/siklu.inc.php     | 4 ++--
 includes/polling/functions.inc.php            | 2 ++
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/includes/discovery/os/siklu.inc.php b/includes/discovery/os/siklu.inc.php
index 2ea1981259..aa1f06c75d 100644
--- a/includes/discovery/os/siklu.inc.php
+++ b/includes/discovery/os/siklu.inc.php
@@ -18,4 +18,3 @@ if ($entPhysicalMfgName == 'Siklu') {
     $os = 'siklu';
 }
 
-?>
diff --git a/includes/discovery/temperatures/siklu.inc.php b/includes/discovery/temperatures/siklu.inc.php
index 31eaae64ce..d8945a5279 100644
--- a/includes/discovery/temperatures/siklu.inc.php
+++ b/includes/discovery/temperatures/siklu.inc.php
@@ -4,10 +4,10 @@ if ($device['os'] == "siklu") {
     $oid = "rbSysTemperature.0";
     $oids = snmp_get($device, "$oid", "-OsqnU", "RADIO-BRIDGE-MIB");
     if ($debug) { echo($oids."\n"); }
-    if ($oids) echo("Siklu Temperature ");
+    if (!empty($oids)) echo("Siklu Temperature ");
     $divisor = 1;
     $type = "siklu";
-    if ($oids) {
+    if (!empty($oids)) {
         list(,$current) = explode(' ',$oids);
         $index = $oid;
         $descr = "System Temp";
diff --git a/includes/discovery/voltages/siklu.inc.php b/includes/discovery/voltages/siklu.inc.php
index 9c920eb49f..16c309d96c 100644
--- a/includes/discovery/voltages/siklu.inc.php
+++ b/includes/discovery/voltages/siklu.inc.php
@@ -4,10 +4,10 @@ if ($device['os'] == "siklu") {
     $oid = "rbSysVoltage.0";
     $oids = snmp_walk($device, "$oid", "-OsqnU", "RADIO-BRIDGE-MIB");
     if ($debug) { echo($oids."\n"); }
-    if ($oids) echo("Siklu Voltage ");
+    if (!empty($oids)) echo("Siklu Voltage ");
     $divisor = 1;
     $type = "siklu";
-    if ($oids) {
+    if (!empty($oids)) {
         list(,$current) = explode(' ',$oids);
         $index = $oid;
         $descr = "System voltage";
diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php
index 4b0999169b..017abb7374 100644
--- a/includes/polling/functions.inc.php
+++ b/includes/polling/functions.inc.php
@@ -13,6 +13,8 @@ function poll_sensor($device, $class, $unit)
     {
       if ($device['os'] == 'siklu') {
           $mib = ":RADIO-BRIDGE-MIB";
+      } else {
+          $mib = '';
       }
       if ($class == "temperature")
       {