From f7cb4789a25c7b7d348aed141d29d95a9cfa79a8 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Tue, 5 Nov 2019 19:06:03 +0000 Subject: [PATCH] fhem.pl/10_MQTT2_DEVICE.pm: fix json detection (Forum #104956) git-svn-id: https://svn.fhem.de/fhem/trunk@20460 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_MQTT2_DEVICE.pm | 2 +- fhem/fhem.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/10_MQTT2_DEVICE.pm b/fhem/FHEM/10_MQTT2_DEVICE.pm index 0940d2c3c..8a78313fd 100644 --- a/fhem/FHEM/10_MQTT2_DEVICE.pm +++ b/fhem/FHEM/10_MQTT2_DEVICE.pm @@ -215,7 +215,7 @@ MQTT2_DEVICE_Parse($$) my $cidArr = $modules{MQTT2_DEVICE}{defptr}{cid}{$newCid}; return if(!$cidArr); my $add; - if(length($value) < 10000 && $value =~ m/^{.*}$/s) { + if(length($value) < 10000 && $value =~ m/^\s*{.*}\s*$/s) { my $ret = json2nameValue($value); if(keys %{$ret}) { $topic =~ m,.*/([^/]+),; diff --git a/fhem/fhem.pl b/fhem/fhem.pl index b5dbabf4d..d8dccc86a 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -5203,7 +5203,7 @@ json2nameValue($;$$) return (undef, $in); } - $in = $1 if($in =~ m/^{(.*)}$/s); + $in = $1 if($in =~ m/^\s*{(.*)}\s*$/s); my $err; while($in =~ m/^\s*"([^"]+)"\s*:\s*(.*)$/s) {