FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 13:24:56 +00:00
Code Issues Releases Wiki Activity

console.js/FHEMWEB.pm: check for bad filter (Forum #43111)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9703 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-10-28 07:22:39 +00:00
parent a928c2f734
commit 47223f8214
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/01_FHEMWEB.pm
View File

@ -2466,7 +2466,7 @@ FW_Notify($$)
my $dt = $dev->{TYPE}; my $dt = $dev->{TYPE};
for(my $i = 0; $i < $max; $i++) { for(my $i = 0; $i < $max; $i++) {
my $line = ("$tn $dt $dn ".$events->[$i]."<br>"); my $line = ("$tn $dt $dn ".$events->[$i]."<br>");
push @data,$line if($line =~ m/$h->{filter}/); eval { push @data,$line if($line =~ m/$h->{filter}/) }
} }
} }
} }

5
fhem/www/pgm2/console.js
View File

@ -84,6 +84,11 @@ consStart()
{ text:"Cancel", click:function(){ $(this).dialog('close'); }}, { text:"Cancel", click:function(){ $(this).dialog('close'); }},
{ text:"OK", click:function(){ { text:"OK", click:function(){
var val = $("#filtertext").val().trim(); var val = $("#filtertext").val().trim();
try {
new RegExp(val ? val : ".*");
} catch(e) {
return FW_okDialog(e);
}
consFilter = val ? val : ".*"; consFilter = val ? val : ".*";
$(this).dialog('close'); $(this).dialog('close');
$("a#eventFilter").html(consFilter); $("a#eventFilter").html(consFilter);