diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index fe38de500..d4e09927e 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -2466,7 +2466,7 @@ FW_Notify($$) my $dt = $dev->{TYPE}; for(my $i = 0; $i < $max; $i++) { my $line = ("$tn $dt $dn ".$events->[$i]."
"); - push @data,$line if($line =~ m/$h->{filter}/); + eval { push @data,$line if($line =~ m/$h->{filter}/) } } } } diff --git a/fhem/www/pgm2/console.js b/fhem/www/pgm2/console.js index 4bb18c082..cedb09103 100644 --- a/fhem/www/pgm2/console.js +++ b/fhem/www/pgm2/console.js @@ -84,6 +84,11 @@ consStart() { text:"Cancel", click:function(){ $(this).dialog('close'); }}, { text:"OK", click:function(){ var val = $("#filtertext").val().trim(); + try { + new RegExp(val ? val : ".*"); + } catch(e) { + return FW_okDialog(e); + } consFilter = val ? val : ".*"; $(this).dialog('close'); $("a#eventFilter").html(consFilter);