From fcef68950419ee0927351174b007223191ea3850 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 21 May 2012 16:52:02 +0000
Subject: [PATCH] fix dell omsa temperatures. from robje.

git-svn-id: http://www.observium.org/svn/observer/trunk@3222 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/topnav.inc.php                 |  6 +++---
 includes/discovery/temperatures/dell.inc.php | 12 ++++++++++++
 includes/functions.php                       | 12 ++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/html/includes/topnav.inc.php b/html/includes/topnav.inc.php
index 1ed7d6254..b79dbea58 100644
--- a/html/includes/topnav.inc.php
+++ b/html/includes/topnav.inc.php
@@ -20,9 +20,9 @@ foreach (dbFetchRows("SELECT * FROM `devices` ORDER BY `hostname`") as $device)
 
 if($_SESSION['userlevel'] >= 5)
 {
-  $devices['up']        = dbFetchCell("SELECT COUNT(*) FROM devices  WHERE status = '1' AND `ignore` = '0'");
-  $devices['down']      = dbFetchCell("SELECT COUNT(*) FROM devices WHERE status = '0' AND `ignore` = '0'");
-  $devices['ignored']   = dbFetchCell("SELECT COUNT(*) FROM devices WHERE `ignore` = '1'");
+  $devices['up']        = dbFetchCell("SELECT COUNT(*) FROM devices  WHERE status = '1' AND `ignore` = '0'  AND `disabled` = '0'");
+  $devices['down']      = dbFetchCell("SELECT COUNT(*) FROM devices WHERE status = '0' AND `ignore` = '0'  AND `disabled` = '0'");
+  $devices['ignored']   = dbFetchCell("SELECT COUNT(*) FROM devices WHERE `ignore` = '1'  AND `disabled` = '0'");
   $devices['disabled']  = dbFetchCell("SELECT COUNT(*) FROM devices WHERE `disabled` = '1'");
 
   $ports['count']       = dbFetchCell("SELECT COUNT(*) FROM ports WHERE deleted = '0'");
diff --git a/includes/discovery/temperatures/dell.inc.php b/includes/discovery/temperatures/dell.inc.php
index 27527b3bb..af93f3dee 100644
--- a/includes/discovery/temperatures/dell.inc.php
+++ b/includes/discovery/temperatures/dell.inc.php
@@ -1,5 +1,17 @@
 <?php
 
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package    observium
+ * @subpackage discovery
+ * @author     Adam Armstrong <adama@memetic.org>
+ * @copyright  (C) 2006 - 2012 Adam Armstrong
+ *
+ */
+
 # MIB-Dell-10892::temperatureProbechassisIndex.1.1 = INTEGER: 1
 # MIB-Dell-10892::temperatureProbeIndex.1.1 = INTEGER: 1
 # MIB-Dell-10892::temperatureProbeStateCapabilities.1.1 = INTEGER: 0
diff --git a/includes/functions.php b/includes/functions.php
index 472294ee9..2f80ec4f6 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1,5 +1,17 @@
 <?php
 
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package    observium
+ * @subpackage functions
+ * @author     Adam Armstrong <adama@memetic.org>
+ * @copyright  (C) 2006 - 2012 Adam Armstrong
+ *
+ */
+
 ## Include from PEAR
 
 include_once("Net/IPv4.php");