Fill in template hash properly

diff --git a/status/monitor.pl b/status/monitor.pl
index db11a30..2446b11 100755 (executable)
--- a/status/monitor.pl
+++ b/status/monitor.pl
@@ -460,6 +460,9 @@ if ($tmpl && $tmpl->{$type}) {
                        'STATUS' => $text{'mon_'.$suffix},
                        uc($suffix) => 1,
                      );
+       foreach my $s (@monitor_statuses) {
+               $hash{uc($s)} ||= 0;
+               }
        foreach my $k (keys %$serv) {
                $hash{'SERVICE_'.uc($k)} = $serv->{$k};
                }

diff --git a/status/status-lib.pl b/status/status-lib.pl
index 87f8852..d77d75a 100644 (file)
--- a/status/status-lib.pl
+++ b/status/status-lib.pl
@@ -17,6 +17,8 @@ $templates_dir = "$module_config_directory/templates";
 %monitor_os_support = ( 'traffic' => { 'os_support' => '*-linux freebsd' },
                      );
 
+@monitor_statuses = ( 'up', 'down', 'un', 'webmin', 'timed', 'isdown' );
+
 # list_services()
 # Returns a list of all services this module knows how to get status on.
 # If this is the first time the function is called a default set of services