Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

30_HUEBridge.pm, 37_plex.pm: use decode_json instead of from_json everywhere. see forum https://forum.fhem.de/index.php/topic,66679.msg580269/topicseen.html#msg580269

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@13362 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2017-02-08 18:47:04 +00:00
parent f19bcaaa02
commit f33d327ae0
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
FHEM/30_HUEBridge.pm
View File

@ -15,15 +15,6 @@ use Data::Dumper;
use HttpUtils;
my $HUEBridge_isFritzBox = undef;
sub
HUEBridge_isFritzBox()
{
$HUEBridge_isFritzBox = int( qx( [ -f /usr/bin/ctlmgr_ctl ] && echo 1 || echo 0 ) ) if( !defined( $HUEBridge_isFritzBox) );
return $HUEBridge_isFritzBox;
}
sub HUEBridge_Initialize($)
{
my ($hash) = @_;
@ -74,7 +65,7 @@ HUEBridge_Detect($)
my $host = '';
if( defined($ret) && $ret ne '' && $ret =~ m/^[\[{].*[\]}]$/ ) {
my $obj = eval { from_json($ret) };
my $obj = eval { decode_json($ret) };
Log3 $name, 2, "$name: json error: $@ in $ret" if( $@ );
if( defined($obj->[0])
@ -1117,14 +1108,8 @@ HUEBridge_HTTP_Call($$$;$)
return undef;
}
my $decoded;
if( HUEBridge_isFritzBox() ) {
$decoded = eval { decode_json($ret) };
Log3 $name, 2, "$name: json error: $@ in $ret" if( $@ );
} else {
$decoded = eval { from_json($ret) };
Log3 $name, 2, "$name: json error: $@ in $ret" if( $@ );
}
my $decoded = eval { decode_json($ret) };
Log3 $name, 2, "$name: json error: $@ in $ret" if( $@ );
return HUEBridge_ProcessResponse($hash, $decoded);
}
@ -1183,7 +1168,7 @@ HUEBridge_HTTP_Call2($$$$;$)
return undef;
}
my $json = eval { from_json($data) };
my $json = eval { decode_json($data) };
Log3 $name, 2, "$name: json error: $@ in $data" if( $@ );
return undef if( !$json );
@ -1233,7 +1218,7 @@ HUEBridge_dispatch($$$;$)
my $queryAfterSet = AttrVal( $name,'queryAfterSet', 1 );
if( !$json ) {
$json = eval { from_json($data) } if( !$json );
$json = eval { decode_json($data) } if( !$json );
Log3 $name, 2, "$name: json error: $@ in $data" if( $@ );
}
return undef if( !$json );

2
FHEM/37_plex.pm
View File

@ -4066,7 +4066,7 @@ Log 1, "!!!!!!!!!!";
$hash->{buf} = substr($hash->{buf},$i+$len);
if( $op == 0x01 ) {
my $obj = eval { from_json($data) };
my $obj = eval { decode_json($data) };
if( $obj ) {
my $phash = $hash->{phash};