From d1c7886d665edab1f6575fe2a1c699a8a36d864e Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Thu, 16 Jul 2015 09:45:17 -0300
Subject: [PATCH] Updated old code and fixed some code standards

---
 .../temperatures/powerconnect.inc.php         | 39 ++++++-------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/includes/discovery/temperatures/powerconnect.inc.php b/includes/discovery/temperatures/powerconnect.inc.php
index e70a468ee..fef53599c 100644
--- a/includes/discovery/temperatures/powerconnect.inc.php
+++ b/includes/discovery/temperatures/powerconnect.inc.php
@@ -1,47 +1,32 @@
 <?php
-if ($device['os'] == "powerconnect")
+if ($device['os'] == 'powerconnect')
 {
-    $sysObjectId = snmp_get ($device, "SNMPv2-MIB::sysObjectID.0", "-Ovqn");
+    $sysObjectId = snmp_get ($device, 'SNMPv2-MIB::sysObjectID.0', '-Ovqn');
     switch ($sysObjectId) {
         /**
         * Dell Powerconnect 5548
         * Operating Temperature: 0º C to 45º C
         */
-        case ".1.3.6.1.4.1.674.10895.3031":
-        $temperature = trim(snmp_get($device, ".1.3.6.1.4.1.89.53.15.1.9.1", "-Ovq"));
-        discover_sensor($valid['sensor'], 'temperature', $device , ".1.3.6.1.4.1.89.53.15.1.9.1", 0 , "powerconnect" , "Internal Temperature" , '1', '1', "0" , NULL, NULL, "45", $temperature);
+        case '.1.3.6.1.4.1.674.10895.3031':
+        $temperature = trim(snmp_get($device, '.1.3.6.1.4.1.89.53.15.1.9.1', '-Ovq'));
+        discover_sensor($valid['sensor'], 'temperature', $device , '.1.3.6.1.4.1.89.53.15.1.9.1', 0 , 'powerconnect' , 'Internal Temperature' , '1', '1', '0' , NULL, NULL, '45', $temperature);
         break;
         /**
         * Dell Powerconnect 3548
         * Operating Temperature: 0º C to 45º C
         */
-        case ".1.3.6.1.4.1.674.10895.3017":
+        case '.1.3.6.1.4.1.674.10895.3017':
         $temperature = trim(snmp_get($device, ".1.3.6.1.4.1.89.53.15.1.9.1", "-Ovq"));
-        discover_sensor($valid['sensor'], 'temperature', $device , ".1.3.6.1.4.1.89.53.15.1.9.1", 0 , "powerconnect" , "Internal Temperature" , '1', '1', "0" , NULL, NULL, "45", $temperature);
+        discover_sensor($valid['sensor'], 'temperature', $device , '.1.3.6.1.4.1.89.53.15.1.9.1', 0 , 'powerconnect' , 'Internal Temperature' , '1', '1', '0' , NULL, NULL, '45', $temperature);
         break;
         default :
         /**
-        * Defaul Discovery for powerconnect series
-        *  Dell-Vendor-MIB::dellLanExtension.6132.1.1.1.1.4.4.0 = STRING: "5 Sec (6.99%),    1 Min (6.72%),   5 Min (9.06%)"
+        * Default Temperature Discovery
+        * Operating Temperature: 0º C to 45º C
         */
-        $temps = snmp_walk($device, "boxServicesTempSensorTemperature", "-OsqnU", "FASTPATH-BOXSERVICES-PRIVATE-MIB");
-        if ($debug) {
-            echo($temps."\n");
-        }
-        $index = 0;
-        foreach (explode("\n",$temps) as $oids)
-        {
-            echo("Powerconnect ");
-            list($oid,$current) = explode(' ',$oids);
-            $divisor = "1";
-            $multiplier = "1";
-            $type = "powerconnect";
-            $index++;
-            $descr = "Internal Temperature";
-            if (count(explode("\n",$temps)) > 1) {
-                $descr .= " $index";
-            }
-            discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $type, $descr, $divisor, $multiplier, NULL, NULL, NULL, NULL, $current);
+        $temperature = snmp_get($device, 'boxServicesTempSensorTemperature.0', '-Ovq','FASTPATH-BOXSERVICES-PRIVATE-MIB');
+        if (is_numeric($temperature)) {
+            discover_sensor($valid['sensor'], 'temperature', $device , '.1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.4.0', 0 , 'powerconnect' , 'Internal Temperature' , '1', '1', '0' , NULL, NULL, '45', $temperature);
         }
     }
 }