Handle bad regexps

diff --git a/status/edit_mon.cgi b/status/edit_mon.cgi
index 8a4903c..e2cd5e4 100755 (executable)
--- a/status/edit_mon.cgi
+++ b/status/edit_mon.cgi
@@ -219,14 +219,11 @@ if ($type =~ /^(\S+)::(\S+)$/) {
        # From another module
        ($mod, $mtype) = ($1, $2);
        &foreign_require($mod, "status_monitor.pl");
-       $html = &foreign_call($mod, "status_monitor_dialog", $mtype, $serv);
-       if ($html) {
-               print "<p>\n";
-               print &ui_table_start($text{'mon_header3'}, "width=100%", 4,
-                                     \@tds);
-               print $html;
-               print &ui_table_end();
-               }
+       print "<p>\n";
+       print &ui_table_start($text{'mon_header3'}, "width=100%", 4,
+                             \@tds);
+       print &foreign_call($mod, "status_monitor_dialog", $mtype, $serv);
+       print &ui_table_end();
        }
 else {
        # From this module

diff --git a/status/http-monitor.pl b/status/http-monitor.pl
index 28f61ef..94a8472 100644 (file)
--- a/status/http-monitor.pl
+++ b/status/http-monitor.pl
@@ -44,9 +44,11 @@ eval {
                        }
                eval {
                        # Check for regexp match
-                       if ($data !~ /$re/i) {
-                               $up = 0;
-                               }
+                       eval {
+                               if ($data !~ /$re/i) {
+                                       $up = 0;
+                                       }
+                               };
                        };
                }