===================================================================
RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- nagios/check_hw_sensors/check_hw_sensors	2009/11/10 23:26:13	1.36
+++ nagios/check_hw_sensors/check_hw_sensors	2009/11/10 23:41:12	1.37
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# $RedRiver: check_hw_sensors,v 1.35 2009/11/10 23:15:15 andrew Exp $
+# $RedRiver: check_hw_sensors,v 1.36 2009/11/10 23:26:13 andrew Exp $
 ########################################################################
 # check_hw_sensors *** A nagios check for OpenBSD sysctl hw.sensors
 #
@@ -69,7 +69,7 @@
 }
 
 if ($opt_V) {
-    print_revision( $PROGNAME, '$Revision: 1.36 $ ' );
+    print_revision( $PROGNAME, '$Revision: 1.37 $ ' );
     exit $ERRORS{'OK'};
 }
 
@@ -130,9 +130,8 @@
     }
     $CHECK_SENSOR = $SENSOR;
 
-    $CHECKS{$SENSOR}{'warn'} = $WARNING;
-    $CHECKS{$SENSOR}{'crit'} = $CRITICAL;
-
+    $CHECKS{$SENSOR}{'warn'} = $WARNING  if $WARNING;
+    $CHECKS{$SENSOR}{'crit'} = $CRITICAL if $CRITICAL;
 }
 elsif ( defined $FILENAME ) {
     %CHECKS = read_file($FILENAME);
@@ -144,7 +143,9 @@
 
 my $have_results = 0;
 $state = 'OK';
-foreach my $error ( reverse sort { $ERRORS{$a} <=> $ERRORS{$b} } keys %ERRORS ) {
+foreach
+    my $error ( reverse sort { $ERRORS{$a} <=> $ERRORS{$b} } keys %ERRORS )
+{
     if ( exists $STATES{$error} ) {
         $have_results++;
         $state = $error if $ERRORS{$state} < $ERRORS{$error};
@@ -152,9 +153,8 @@
         if ($NAGIOS_OUTPUT) {
             print $error . ' (' . scalar( @{ $STATES{$error} } ) . ')';
             if ( $error ne 'OK' ) {
-                s/\s+/ /gxms;
                 print '<br>';
-                print map {" - $_<br>"} @{ $STATES{$error} };
+                print map { s/\s+//xms; " - $_<br>" } @{ $STATES{$error} };
             }
         }
         else {
@@ -324,7 +324,7 @@
             $r = check_sensor( $sensor, $C->{ $sensor->{id} } );
             $data = $sensor->{id} . '=' . $sensor->{output};
         }
-        elsif ( !$O->{ignore_status} && $sensor->{status} ) {
+        elsif ( $sensor->{status} && !$O->{IGNORE_STATUS} ) {
             $r = check_sensor( $sensor, { STATUS => 1 } );
             $data = $sensor->{id} . '=' . $sensor->{output};
         }
@@ -529,7 +529,7 @@
 
 EOL
 
-    print_revision( $PROGNAME, '$Revision: 1.36 $' );
+    print_revision( $PROGNAME, '$Revision: 1.37 $' );
 
     print $LICENSE;