Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2024-06-17 05:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

75_MSG: fix utf8 encoding (Forum #39983)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@19215 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2019-04-18 11:55:19 +00:00
parent 4eac9d4d3e
commit 3f403d5a5e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
FHEM/75_MSG.pm
View File

@ -25,6 +25,7 @@ use strict;
use warnings;
use Data::Dumper;
use Time::HiRes qw(time);
use Encode;
use utf8;
# initialize ##################################################################
@ -235,19 +236,19 @@ s/^[\s\t ]*([!]?(([A-Za-z0-9%+._-])*@([%+a-z0-9A-Z.-]+))[\w,@.!?|:]*)[\s\t ]+//
# Use JSON module if possible
eval {
require JSON;
import JSON qw( decode_json );
require JSON::PP;
import JSON::PP qw( decode_json );
};
if ($@) {
Log3 $globalDevName, 3,
"msg: Error loading Perl::JSON. "
"msg: Error loading JSON::PP. "
. "Please switch to new syntax to use user parameters";
}
else {
Log3 $globalDevName, 4,
"msg: Please switch to new syntax to use user parameters";
my $o;
eval '$o = decode_json( Encode::encode_utf8($1) ); 1';
eval '$o = decode_json( encode_utf8($1) ); 1';
if ($@) {
Log3 $globalDevName, 5,
"msg: Error decoding JSON for user parameters: $@";
@ -1954,18 +1955,19 @@ m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
Log3 $logDevice, 5,
"msg $device: "
. "$type[$i] route command (Perl): $cmd";
eval $cmd;
unless ( !$@ || $@ =~ m/^[\s\t\n ]*$/ )
#eval $cmd;
my $ret = AnalyzePerlCommand(undef, $cmd);
unless ( !$ret || $ret =~ m/^[\s\t\n ]*$/ )
{
$error = 1;
$loopReturn3 .= "$gatewayDev: $@\n";
$loopReturn3 .= "$gatewayDev: $ret\n";
}
}
else {
Log3 $logDevice, 5,
"msg $device: "
. "$type[$i] route command (fhem): $cmd";
my $ret = fhem $cmd, 1;
my $ret = AnalyzeCommandChain(undef,$cmd);
unless ( !$ret
|| $ret =~ m/^[\s\t\n ]*$/ )
{