mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10_MQTT2_DEVICE.pm: fix escaping readingList for autocreate (Forum #115743)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23171 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2020-11-17 18:40:22 +00:00
parent 8c96bb76c5
commit b830ad48f2
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/10_MQTT2_DEVICE.pm
View File

@@ -246,16 +246,14 @@ MQTT2_DEVICE_Parse($$)
$add = makeReadingName($add); # Convert non-valid characters to _ $add = makeReadingName($add); # Convert non-valid characters to _
} }
$topic =~ s,([\^\$\[\]()\.\\]),\\$1,g; my $reTopic = $topic;
$topic =~ s,\s,.,g; $reTopic =~ s#([^A-Z0-9_/-])#"\\x".sprintf("%02x",ord($1))#ige;
for my $ch (@{$cidArr}) { for my $ch (@{$cidArr}) {
my $nn = $ch->{NAME}; my $nn = $ch->{NAME};
next if(!AttrVal($nn, "autocreate", 1)); # device autocreate next if(!AttrVal($nn, "autocreate", 1)); # device autocreate
my $rl = AttrVal($nn, "readingList", ""); my $rl = AttrVal($nn, "readingList", "");
$rl .= "\n" if($rl); $rl .= "\n" if($rl);
my $reTopic = $topic;
$reTopic =~ s#([^A-Z0-9_/-])#"\\x".sprintf("%02x",ord($1))#ige;
my $regex = ($cid eq $newCid ? "$cid:" : "").$reTopic.":.*"; my $regex = ($cid eq $newCid ? "$cid:" : "").$reTopic.":.*";
CommandAttr(undef, "$nn readingList $rl$regex $add") CommandAttr(undef, "$nn readingList $rl$regex $add")
if(index($rl, $regex) == -1); # Forum #84372 if(index($rl, $regex) == -1); # Forum #84372