diff --git a/fhem/CHANGED b/fhem/CHANGED index cae48ff1f..9aecfa984 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 50_SSChatBot: fix cannot send after receiving anything - feature 76_SMAPortal: integrate SMA EV Charger - change: 14_SD_BELL: revised code Perl::Critic - feature: 14_SD_UT.pm diff --git a/fhem/FHEM/50_SSChatBot.pm b/fhem/FHEM/50_SSChatBot.pm index 8a8bcc622..829427a11 100644 --- a/fhem/FHEM/50_SSChatBot.pm +++ b/fhem/FHEM/50_SSChatBot.pm @@ -135,6 +135,7 @@ BEGIN { # Versions History intern my %vNotesIntern = ( + "1.12.1" => "28.11.2020 fix cannot send after received anything, fix greedy regex in _botCGIcheckData ", "1.12.0" => "23.11.2020 generate event CHAT_INITIALIZED when users are once loaded, Forum: https://forum.fhem.de/index.php/topic,105714.msg1103700.html#msg1103700 ". "postpone new operation is one ist still running ", "1.11.7" => "01.11.2020 quotation marks can be used in text tag of received messages (__botCGIcheckData) ", @@ -1477,8 +1478,6 @@ sub _botCGIdata { Log3($name, 4, "$name - received data decoded:\n".Dumper($h)); - $hash->{OPMODE} = "receiveData"; - # ausgehende Datenfelder (Chat -> FHEM), die das Chat senden kann # =============================================================== # token: bot token @@ -1575,10 +1574,10 @@ sub __botCGIcheckData { $args = urlDecode($args); my $ca = $args; - my ($teco) = $ca =~ /text="(.*)"/x; # " im Text-Tag escapen (V: 1.11.7) + my ($teco) = $ca =~ /text="(.*?)"/x; # " im Text-Tag escapen (V: 1.11.7), fix greedy Regex V1.12.1 if ($teco) { $teco =~ s/"/_ESC_/gx; - $ca =~ s/text="(.*)"/text="$teco"/x; + $ca =~ s/text="(.*?)"/text="$teco"/x; # fix greedy Regex V1.12.1 } my($a,$h) = parseParams($ca); @@ -1602,9 +1601,9 @@ sub __botCGIcheckData { } my $dat = { - name => $name, - args => $args, - h => $h, + name => $name, + args => $args, + h => $h, }; return ('','',$dat);