From a96f6064ead663f8e4e78efc523968c5d7893d40 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Sun, 8 Apr 2012 16:21:52 +0000
Subject: [PATCH] correctly case dBm instead of Dbm, minor fixes

git-svn-id: http://www.observium.org/svn/observer/trunk@2997 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/print-menubar.php                      | 2 +-
 includes/discovery/processors/hrdevice.inc.php       | 2 +-
 includes/discovery/temperatures/cisco-envmon.inc.php | 2 +-
 includes/functions.php                               | 6 ++++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index d4ed3be361..89301fd6a5 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -374,7 +374,7 @@ if ($sep && array_keys($menu_sensors))
 
 foreach (array_keys($menu_sensors) as $item)
 {
-  echo('<li><a href="health/metric='.$item.'/"><img src="images/icons/'.$item.'.png" border="0" align="absmiddle" /> '.ucfirst($item).'</a></li>');
+  echo('<li><a href="health/metric='.$item.'/"><img src="images/icons/'.$item.'.png" border="0" align="absmiddle" /> '.nicecase($item).'</a></li>');
   unset($menu_sensors[$item]);$sep++;
 }
 
diff --git a/includes/discovery/processors/hrdevice.inc.php b/includes/discovery/processors/hrdevice.inc.php
index 41b307860e..2737c1e97a 100755
--- a/includes/discovery/processors/hrdevice.inc.php
+++ b/includes/discovery/processors/hrdevice.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-echo("hrDevice ");
+echo(" hrDevice: ");
 $hrDevice_oids = array('hrDevice','hrProcessorLoad');
 unset($hrDevice_array);
 foreach ($hrDevice_oids as $oid) { $hrDevice_array = snmpwalk_cache_oid($device, $oid, $hrDevice_array, "HOST-RESOURCES-MIB:HOST-RESOURCES-TYPES"); }
diff --git a/includes/discovery/temperatures/cisco-envmon.inc.php b/includes/discovery/temperatures/cisco-envmon.inc.php
index c4d19967bd..998e9916f1 100644
--- a/includes/discovery/temperatures/cisco-envmon.inc.php
+++ b/includes/discovery/temperatures/cisco-envmon.inc.php
@@ -2,7 +2,7 @@
 
 if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = '".$device['device_id']."' AND `sensor_class` = 'temperature' AND (`sensor_type` = 'cisco-entity-sensor' OR `sensor_type` = 'entity-sensor')"),0) == "0" && ($device['os_group'] == "cisco"))
 {
-  echo("CISCO-ENVMON-MIB ");
+  echo("CISCO-ENVMON-MIB: ");
   $oids = snmp_walk($device, ".1.3.6.1.4.1.9.9.13.1.3.1.2", "-Osqn", "CISCO-ENVMON-MIB");
   $oids = str_replace('.1.3.6.1.4.1.9.9.13.1.3.1.2.','',$oids);
   $oids = trim($oids);
diff --git a/includes/functions.php b/includes/functions.php
index 802324ee00..133ad9a51e 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -18,6 +18,12 @@ include_once($config['install_dir'] . "/includes/services.inc.php");
 include_once($config['install_dir'] . "/includes/dbFacile.php");
 include_once($config['install_dir'] . "/includes/console_colour.php");
 
+function nicecase($item)
+{
+  if ($item == "dbm") { return "dBm"; }
+  else return ucfirst($item);
+}
+
 function mac_clean_to_readable($mac)
 {
   $r = substr($mac, 0, 2);