diff --git a/includes/discovery/temperatures.php b/includes/discovery/temperatures.php
index 9109d803e8..4086000fb9 100755
--- a/includes/discovery/temperatures.php
+++ b/includes/discovery/temperatures.php
@@ -1,164 +1,201 @@
 <?php
-  $id = $device['device_id'];
-  $hostname = $device['hostname'];
-  $community = $device['community'];
-  $snmpver = $device['snmpver'];
-  $port = $device['port'];
+$id = $device['device_id'];
+$hostname = $device['hostname'];
+$community = $device['community'];
+$snmpver = $device['snmpver'];
+$port = $device['port'];
 
-  echo("Temperatures : ");
+echo("Temperatures : ");
 
-  ## JunOS Temperatures
-  if($device['os'] == "junos") {
-    echo("JunOS ");
-    $oids = shell_exec($config['snmpwalk'] . " -m JUNIPER-MIB -$snmpver -CI -Osqn -c $community $hostname:$port 1.3.6.1.4.1.2636.3.1.13.1.7");
-    $oids = trim($oids);
-    foreach(explode("\n", $oids) as $data) {
-     $data = trim($data);
-     $data = substr($data, 29);
-     if($data) {
+## JunOS Temperatures
+if ($device['os'] == "junos") 
+{
+  echo("JunOS ");
+  $oids = shell_exec($config['snmpwalk'] . " -m JUNIPER-MIB -$snmpver -CI -Osqn -c $community $hostname:$port 1.3.6.1.4.1.2636.3.1.13.1.7");
+  $oids = trim($oids);
+  foreach(explode("\n", $oids) as $data) 
+  {
+    $data = trim($data);
+    $data = substr($data, 29);
+    if ($data) 
+    {
       list($oid) = explode(" ", $data);
       $temp_oid  = "1.3.6.1.4.1.2636.3.1.13.1.7.$oid";
       $descr_oid = "1.3.6.1.4.1.2636.3.1.13.1.5.$oid";
       $descr = trim(shell_exec($config['snmpget'] . " -m JUNIPER-MIB -O qv -$snmpver -c $community $hostname:$port $descr_oid"));
       $temp = trim(shell_exec($config['snmpget'] . " -m JUNIPER-MIB -O qv -$snmpver -c $community $hostname:$port $temp_oid"));
-      if(!strstr($descr, "No") && !strstr($temp, "No") && $descr != "" && $temp != "0") {
+      if (!strstr($descr, "No") && !strstr($temp, "No") && $descr != "" && $temp != "0") 
+      {
         $descr = str_replace("\"", "", $descr);
         $descr = str_replace("temperature", "", $descr);
         $descr = str_replace("temp", "", $descr);
         $descr = str_replace("sensor", "", $descr);
         $descr = trim($descr);
-        if(mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') {
+        if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0')
+        {
           $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr'," . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
           mysql_query($query);
           echo("+");
         } elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'"), 0) != $descr) {
           mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'");
           echo("U");
-        } else { echo("."); }
+        } else { 
+          echo("."); 
+        }
         $temp_exists[] = "$id $temp_oid";
       }
-     }
     }
   }
+}
 
-  ## Papouch TME Temperatures
-  if($device['os'] == "papouch-tme") {
-    echo("Papouch TME ");
-    $descr = trim(shell_exec($config['snmpget'] . " -O qv -$snmpver -c $community $hostname:$port SNMPv2-SMI::enterprises.18248.1.1.3.0"));
-    $temp = trim(shell_exec($config['snmpget'] . " -O qv -$snmpver -c $community $hostname:$port SNMPv2-SMI::enterprises.18248.1.1.1.0")) / 10;
-    if(!strstr($descr, "No") && !strstr($temp, "No") && $descr != "" && $temp != "0") 
+
+## Papouch TME Temperatures
+if ($device['os'] == "papouch-tme") 
+{
+  echo("Papouch TME ");
+  $descr = trim(shell_exec($config['snmpget'] . " -O qv -$snmpver -c $community $hostname:$port SNMPv2-SMI::enterprises.18248.1.1.3.0"));
+  $temp = trim(shell_exec($config['snmpget'] . " -O qv -$snmpver -c $community $hostname:$port SNMPv2-SMI::enterprises.18248.1.1.1.0")) / 10;
+  if (!strstr($descr, "No") && !strstr($temp, "No") && $descr != "" && $temp != "0") 
+  {
+    $temp_oid = "SNMPv2-SMI::enterprises.18248.1.1.1.0";
+    $descr = trim(str_replace("\"", "", $descr));
+    if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') 
     {
-      $temp_oid = "SNMPv2-SMI::enterprises.18248.1.1.1.0";
-      $descr = trim(str_replace("\"", "", $descr));
-      if(mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') 
+      $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`, `temp_precision`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr',10," . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
+      mysql_query($query);
+      echo("+");
+    } elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'"), 0) != $descr)
+    {
+      echo("U");
+      mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'");
+    } else {
+      echo(".");
+    }
+    $temp_exists[] = "$id $temp_oid";
+  }
+}
+
+## Observer-Style Temperatures
+if ($device['os'] == "linux") 
+{
+  $oids = shell_exec($config['snmpwalk'] . " -$snmpver -m SNMPv2-SMI -Osqn -CI -c $community $hostname:$port .1.3.6.1.4.1.2021.7891 | sed s/.1.3.6.1.4.1.2021.7891.// | grep '.1.1 ' | grep -v '.101.' | cut -d'.' -f 1");
+  $oids = trim($oids);
+  if ($oids) echo("Observer-Style ");
+  foreach(explode("\n",$oids) as $oid) 
+  {
+    $oid = trim($oid);
+    if ($oid != "") 
+    {
+      $descr_query = $config['snmpget'] . " -$snmpver -m SNMPv2-SMI -Osqn -c $community $hostname:$port .1.3.6.1.4.1.2021.7891.$oid.2.1 | sed s/.1.3.6.1.4.1.2021.7891.$oid.2.1\ //";
+      $descr = trim(str_replace("\"", "", shell_exec($descr_query)));
+      $fulloid = ".1.3.6.1.4.1.2021.7891.$oid.101.1";
+      if (!mysql_result(mysql_query("SELECT count(temp_id) FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'"), 0)) 
       {
-        $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`, `temp_precision`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr',10," . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
-        mysql_query($query);
         echo("+");
-      } elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'"), 0) != $descr) {
+        mysql_query("INSERT INTO `temperature` (`temp_host`,`temp_oid`,`temp_descr`,`temp_limit`) VALUES ('$id', '$fulloid', '$descr'," . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ")");
+      } 
+      elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'"), 0) != $descr) 
+      {
         echo("U");
-        mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'");
-      } else {
+	  mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'");
+      }
+      else 
+      {
         echo(".");
       }
-      $temp_exists[] = "$id $temp_oid";
+      $temp_exists[] = "$id $fulloid";
     }
   }
+} 
 
-  ## Begin Observer-Style
-  if($device['os'] == "linux") {
-    $oids = shell_exec($config['snmpwalk'] . " -$snmpver -m SNMPv2-SMI -Osqn -CI -c $community $hostname:$port .1.3.6.1.4.1.2021.7891 | sed s/.1.3.6.1.4.1.2021.7891.// | grep '.1.1 ' | grep -v '.101.' | cut -d'.' -f 1");
-    $oids = trim($oids);
-    if ($oids) echo("Observer-Style ");
-    foreach(explode("\n",$oids) as $oid) {
-      $oid = trim($oid);
-      if($oid != "") {
-        $descr_query = $config['snmpget'] . " -$snmpver -m SNMPv2-SMI -Osqn -c $community $hostname:$port .1.3.6.1.4.1.2021.7891.$oid.2.1 | sed s/.1.3.6.1.4.1.2021.7891.$oid.2.1\ //";
-        $descr = trim(str_replace("\"", "", shell_exec($descr_query)));
-        $fulloid = ".1.3.6.1.4.1.2021.7891.$oid.101.1";
-        if(!mysql_result(mysql_query("SELECT count(temp_id) FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'"), 0)) {
-          echo("+");
-          mysql_query("INSERT INTO `temperature` (`temp_host`,`temp_oid`,`temp_descr`,`temp_limit`) VALUES ('$id', '$fulloid', '$descr'," . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ")");
-        } elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'"), 0) != $descr) {
-          echo("U");
-	  mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'");
-        } else {
-          echo(".");
-        }
-        $temp_exists[] = "$id $fulloid";
-      }
-    }
-  } ## End Observer-Style
-
-  ## Dell Temperatures
-  if(strstr($device['hardware'], "dell")) {
-    $oids = shell_exec($config['snmpwalk'] . " -m MIB-Dell-10892 -$snmpver -CI -Osqn -c $community $hostname:$port .1.3.6.1.4.1.674.10892.1.700.20.1.8");
-    $oids = trim($oids);
-    if ($oids) echo("Dell OMSA ");
-    foreach(explode("\n",$oids) as $oid) {
-      $oid = substr(trim($oid), 36);
-      list($oid) = explode(" ", $oid);
-      if($oid != "") {
-        $descr_query = $config['snmpget'] . " -m MIB-Dell-10892 -$snmpver  -Onvq -c $community $hostname:$port .1.3.6.1.4.1.674.10892.1.700.20.1.8.$oid";
-        $descr = trim(str_replace("\"", "", shell_exec($descr_query)));
-        $fulloid = ".1.3.6.1.4.1.674.10892.1.700.20.1.6.$oid";
-        if(!mysql_result(mysql_query("SELECT count(temp_id) FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'"), 0)) {
-          mysql_query("INSERT INTO `temperature` (`temp_host`,`temp_oid`,`temp_descr`, `temp_precision`, `temp_limit`) VALUES ('$id', '$fulloid', '$descr', '10', " . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ")");
+## Dell Temperatures
+if (strstr($device['hardware'], "dell")) 
+{
+  $oids = shell_exec($config['snmpwalk'] . " -m MIB-Dell-10892 -$snmpver -CI -Osqn -c $community $hostname:$port .1.3.6.1.4.1.674.10892.1.700.20.1.8");
+  $oids = trim($oids);
+  if ($oids) echo("Dell OMSA ");
+  foreach(explode("\n",$oids) as $oid) 
+  {
+    $oid = substr(trim($oid), 36);
+    list($oid) = explode(" ", $oid);
+    if ($oid != "") 
+    {
+      $descr_query = $config['snmpget'] . " -m MIB-Dell-10892 -$snmpver  -Onvq -c $community $hostname:$port .1.3.6.1.4.1.674.10892.1.700.20.1.8.$oid";
+      $descr = trim(str_replace("\"", "", shell_exec($descr_query)));
+      $fulloid = ".1.3.6.1.4.1.674.10892.1.700.20.1.6.$oid";
+      if (!mysql_result(mysql_query("SELECT count(temp_id) FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'"), 0)) 
+      {
+        mysql_query("INSERT INTO `temperature` (`temp_host`,`temp_oid`,`temp_descr`, `temp_precision`, `temp_limit`) VALUES ('$id', '$fulloid', '$descr', '10', " . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ")");
 	  echo("+");
-        } elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'"), 0) != $descr) {
-          mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'");
-          echo("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'");
-          echo("U");
-        } else {
-          echo(".");
-        }
-        $temp_exists[] = "$id $fulloid";
+      } 
+      elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'"), 0) != $descr) 
+      {
+        mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'");
+        echo("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$fulloid'");
+        echo("U");
       }
-    } 
-  } ## End Dell Sensors
+      else
+      {
+        echo(".");
+      }
+      $temp_exists[] = "$id $fulloid";
+    }
+  } 
+}
 
-  ## LMSensors Temperatures
-  if($device['os'] == "linux") {
-    $oids = shell_exec($config['snmpwalk'] . " -m LM-SENSORS-MIB -$snmpver -CI -Osqn -c $community $hostname:$port lmTempSensorsDevice");
-    if($debug) { echo($oids."\n"); }
-    $oids = trim($oids);
-    if ($oids) echo("LM-SENSORS ");
-    foreach(explode("\n", $oids) as $data) {
-      $data = trim($data);
-      if($data) {
-        list($oid,$descr) = explode(" ", $data,2);
-        if (substr($descr,0,5) == "temp-")
+## LMSensors Temperatures
+if ($device['os'] == "linux") 
+{
+  $oids = shell_exec($config['snmpwalk'] . " -m LM-SENSORS-MIB -$snmpver -CI -Osqn -c $community $hostname:$port lmTempSensorsDevice");
+  if ($debug) { echo($oids."\n"); }
+  $oids = trim($oids);
+  if ($oids) echo("LM-SENSORS ");
+  foreach(explode("\n", $oids) as $data) 
+  {
+    $data = trim($data);
+    if ($data) 
+    {
+      list($oid,$descr) = explode(" ", $data,2);
+      if (substr($descr,0,5) == "temp-")
+      {
+        $split_oid = explode('.',$oid);
+        $temp_id = $split_oid[count($split_oid)-1];
+        $temp_oid  = "1.3.6.1.4.1.2021.13.16.2.1.3.$temp_id";
+        $temp  = trim(shell_exec($config['snmpget'] . " -m LM-SENSORS-MIB -O qv -$snmpver -c $community $hostname:$port $temp_oid")) / 1000;
+        $descr = str_ireplace("temp-", "", $descr);
+        $descr = trim($descr);
+        if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') 
         {
-          $split_oid = explode('.',$oid);
-          $temp_id = $split_oid[count($split_oid)-1];
-          $temp_oid  = "1.3.6.1.4.1.2021.13.16.2.1.3.$temp_id";
-          $temp  = trim(shell_exec($config['snmpget'] . " -m LM-SENSORS-MIB -O qv -$snmpver -c $community $hostname:$port $temp_oid")) / 1000;
-          $descr = str_ireplace("temp-", "", $descr);
-          $descr = trim($descr);
-          if(mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') {
-            $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`, `temp_precision`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr',1000, " . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
-            mysql_query($query);
-            echo("+");
-          } elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'"), 0) != $descr) {
-            echo("U");
-            mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'");
-          } else {
-            echo("."); 
-          } 
-          $temp_exists[] = "$id $temp_oid";
-        }
+          $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`, `temp_precision`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr',1000, " . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
+          mysql_query($query);
+          echo("+");
+        } 
+        elseif (mysql_result(mysql_query("SELECT `temp_descr` FROM temperature WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'"), 0) != $descr) 
+        {
+          echo("U");
+          mysql_query("UPDATE temperature SET `temp_descr` = '$descr' WHERE `temp_host` = '$id' AND `temp_oid` = '$temp_oid'");
+        } 
+        else 
+        {
+          echo("."); 
+        } 
+        $temp_exists[] = "$id $temp_oid";
       }
     }
-  } ## End LMSensors Temperatures
+  }
+}
 
-  ## Supermicro Temperatures
-  if($device['os'] == "linux") {
-    $oids = shell_exec($config['snmpwalk'] . " -m SUPERMICRO-HEALTH-MIB -$snmpver -CI -Osqn -c $community $hostname:$port 1.3.6.1.4.1.10876.2.1.1.1.1.3 | sed s/1.3.6.1.4.1.10876.2.1.1.1.1.3.//g");
-    $oids = trim($oids);
-    if ($oids) echo("Supermicro ");
-    foreach(explode("\n", $oids) as $data) {
-     $data = trim($data);
-     if($data) {
+## Supermicro Temperatures
+if ($device['os'] == "linux") 
+{
+  $oids = shell_exec($config['snmpwalk'] . " -m SUPERMICRO-HEALTH-MIB -$snmpver -CI -Osqn -c $community $hostname:$port 1.3.6.1.4.1.10876.2.1.1.1.1.3 | sed s/1.3.6.1.4.1.10876.2.1.1.1.1.3.//g");
+  $oids = trim($oids);
+  if ($oids) echo("Supermicro ");
+  foreach(explode("\n", $oids) as $data) 
+  {
+    $data = trim($data);
+    if ($data) 
+    {
       list($oid,$type) = explode(" ", $data);
       if ($type == 2)
       {
@@ -170,67 +207,83 @@
         $limit = trim(shell_exec($config['snmpget'] . " -m SUPERMICRO-HEALTH-MIB -O qv -$snmpver -c $community $hostname:$port $limit_oid"));
         $descr = str_ireplace("temperature", "", $descr);
         $descr = trim($descr);
-        if(mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') {
+        if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') 
+        {
           $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`, `temp_current`, `temp_limit`) values ('$id', '$temp_oid', '$descr', '$temp', '$limit')";
           mysql_query($query);
           echo("+");
-        } else { echo("."); }
+        } 
+        else 
+        { 
+          echo("."); 
+        }
         $temp_exists[] = "$id $temp_oid";
       }
-     }
     }
-  } ## End Supermicro Temperatures
+  }
+}
 
-  ## Cisco Temperatures
-  if($device['os'] == "ios") {
-    echo("Cisco ");
-    $oids = shell_exec($config['snmpwalk'] . " -m CISCO-ENVMON-MIB -$snmpver -CI -Osqn -c $community $hostname:$port .1.3.6.1.4.1.9.9.13.1.3.1.2 | sed s/.1.3.6.1.4.1.9.9.13.1.3.1.2.//g");
-    $oids = trim($oids);
-    foreach(explode("\n", $oids) as $data) {
-     $data = trim($data);
-     if($data) {
+## Cisco Temperatures
+if ($device['os'] == "ios") 
+{
+  echo("Cisco ");
+  $oids = shell_exec($config['snmpwalk'] . " -m CISCO-ENVMON-MIB -$snmpver -CI -Osqn -c $community $hostname:$port .1.3.6.1.4.1.9.9.13.1.3.1.2 | sed s/.1.3.6.1.4.1.9.9.13.1.3.1.2.//g");
+  $oids = trim($oids);
+  foreach(explode("\n", $oids) as $data) 
+  {
+    $data = trim($data);
+    if ($data) 
+    {
       list($oid) = explode(" ", $data);
       $temp_oid  = ".1.3.6.1.4.1.9.9.13.1.3.1.3.$oid";
       $descr_oid = ".1.3.6.1.4.1.9.9.13.1.3.1.2.$oid";
       $descr = trim(shell_exec($config['snmpget'] . " -m CISCO-ENVMON-MIB -O qv -$snmpver -c $community $hostname:$port $descr_oid"));
       $temp  = trim(shell_exec($config['snmpget'] . " -m CISCO-ENVMON-MIB -O qv -$snmpver -c $community $hostname:$port $temp_oid"));
-      if(!strstr($descr, "No") && !strstr($temp, "No") && $descr != "" ) {
+      if (!strstr($descr, "No") && !strstr($temp, "No") && $descr != "" ) 
+      {
         $descr = str_replace("\"", "", $descr);
         $descr = str_replace("temperature", "", $descr);
         $descr = str_replace("temp", "", $descr);
         $descr = trim($descr);
-        if(mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') {
+        if (mysql_result(mysql_query("SELECT count(temp_id) FROM `temperature` WHERE temp_oid = '$temp_oid' AND temp_host = '$id'"),0) == '0') 
+        {
           $query = "INSERT INTO temperature (`temp_host`, `temp_oid`, `temp_descr`, `temp_limit`, `temp_current`) values ('$id', '$temp_oid', '$descr', " . ($config['defaults']['temp_limit'] ? $config['defaults']['temp_limit'] : '60') . ", '$temp')";
           mysql_query($query);
           echo("+");
-        } else { echo("."); }
+        }
+        else 
+        { 
+          echo(".");
+        }
         $temp_exists[] = "$id $temp_oid";
       }
-     }
-    } 
-  } ## End Cisco Temperatures
-
+    }
+  } 
+}
 
 ## Delete removed sensors
 
 $sql = "SELECT * FROM temperature AS T, devices AS D WHERE T.temp_host = D.device_id AND D.device_id = '".$device['device_id']."'";
 $query = mysql_query($sql);
 
-while ($sensor = mysql_fetch_array($query)) {
-        unset($exists);
-        $i = 0;
-        while ($i < count($temp_exists) && !$exists) {
-            $thistemp = $sensor['temp_host'] . " " . $sensor['temp_oid'];
-            if ($temp_exists[$i] == $thistemp) { $exists = 1; }
-            $i++;
-        }
-        if(!$exists) { 
-          echo("-");
-          mysql_query("DELETE FROM temperature WHERE temp_id = '" . $sensor['temp_id'] . "'"); 
-        }
+while ($sensor = mysql_fetch_array($query)) 
+{
+  unset($exists);
+  $i = 0;
+  while ($i < count($temp_exists) && !$exists) 
+  {
+    $thistemp = $sensor['temp_host'] . " " . $sensor['temp_oid'];
+    if ($temp_exists[$i] == $thistemp) { $exists = 1; }
+    $i++;
+  }
+  
+  if (!$exists) 
+  { 
+    echo("-");
+    mysql_query("DELETE FROM temperature WHERE temp_id = '" . $sensor['temp_id'] . "'"); 
+  }
 }
 
 unset($temp_exists); echo("\n");
 
-
 ?>