From a90c13a2af08fd2ac0fbff5c614ba4cc7f6dac57 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Mon, 7 Aug 2023 15:28:24 +0000 Subject: [PATCH] 01_FHEMWEB.pm: fix the quoting for attribute types (Forum #134526) git-svn-id: https://svn.fhem.de/fhem/trunk@27823 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index e58ef05c5..83919336a 100644 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -1600,8 +1600,16 @@ FW_doDetail($) $attrList =~ s/\bgroup\b/group:$groupList/; $attrList = FW_widgetOverride($d, $attrList, "attr"); - $attrList =~ s/\\/\\\\/g; - $attrList =~ s/'/\\'/g; + if($attrList =~ m/[\\']/) { + $attrList =~ s/([\\'])/\\$1/g; + foreach my $k (keys %attrTypeHash) { # Forum #134526 + if($k =~ m/[\\']/) { + my $nk = $k; + $nk =~ s/([\\'])/\\$1/g; + $attrTypeHash{$nk} = $attrTypeHash{$k}; + } + } + } FW_pO FW_detailSelect($d, "attr", $attrList, undef, \%attrTypeHash); FW_makeTable("Attributes", $d, $attr{$d}, "deleteattr"); @@ -2028,7 +2036,7 @@ sub FW_showRoom() { my $roomRe = $FW_room; - $roomRe =~ s/([[\]().+*?])/\\$1/g; + $roomRe =~ s/([[\\\]().+*?])/\\$1/g; return 0 if(!$FW_room || AttrVal($FW_wname,"forbiddenroom","") =~ m/\b$roomRe\b/);