From 1ac71b68acac482a7491ca991c151c2b7e6891d4 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 17 Jul 2022 09:10:15 +0000 Subject: [PATCH] 01_FHEMWEB.pm: Fix stacktrace,UnicodeEncoding+Umlaut in roomname (Forum #128362) git-svn-id: https://svn.fhem.de/fhem/trunk@26240 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index b4779c518..6dcd5e69f 100644 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -468,7 +468,8 @@ FW_Read($$) } @FW_httpheader; if(!$hash->{encoding}) { my $ct = $FW_httpheader{"Content-Type"}; - $hash->{encoding} = ($ct && $ct =~ m/charset\s*=\s*(\S*)/i ? $1 : $FW_encoding); + $hash->{encoding} = + ($ct && $ct =~ m/charset\s*=\s*(\S*)/i ? $1 : $FW_encoding); } delete($hash->{HDR}); @@ -679,7 +680,7 @@ FW_initInform($$) $FW_id2inform{$FW_id} = $me if($FW_id); my $filter = $me->{inform}{filter}; - $filter =~ s/([[\]().+?])/\\$1/g if($filter =~ m/room=/); # Forum #80390 + $filter =~ s/([[\]().+*?])/\\$1/g; #80390, #128362 $filter = "NAME=.*" if($filter eq "room=all"); $filter = "room!=.+" if($filter eq "room=Unsorted"); @@ -1982,8 +1983,10 @@ FW_sortIndex($) sub FW_showRoom() { + my $roomRe = $FW_room; + $roomRe =~ s/([[\]().+*?])/\\$1/g; return 0 if(!$FW_room || - AttrVal($FW_wname,"forbiddenroom","") =~ m/\b$FW_room\b/); + AttrVal($FW_wname,"forbiddenroom","") =~ m/\b$roomRe\b/); %FW_hiddengroup = (); foreach my $r (split(",",AttrVal($FW_wname, "hiddengroup", ""))) {