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

fixed utf-8/latin1 encoding

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@4693 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2014-01-19 17:33:16 +00:00
parent 7a2ffa1515
commit e84f17e8db
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
FHEM/32_withings.pm
View File

@ -6,6 +6,7 @@ package main;
use strict; use strict;
use warnings; use warnings;
use Encode qw(encode_utf8);
use JSON; use JSON;
use LWP::Simple; use LWP::Simple;
use HTTP::Request; use HTTP::Request;
@ -174,7 +175,7 @@ withings_getToken($)
my $request = HTTP::Request->new('GET', $URL, $header); my $request = HTTP::Request->new('GET', $URL, $header);
my $response = $agent->request($request); my $response = $agent->request($request);
my $json = decode_json($response->content); my $json = JSON->new->utf8(0)->decode($response->content);
my $once = $json->{body}{once}; my $once = $json->{body}{once};
$hash->{Token} = $once; $hash->{Token} = $once;
@ -213,7 +214,7 @@ withings_getSessionKey($)
my $request = HTTP::Request->new('GET', $URL, $header); my $request = HTTP::Request->new('GET', $URL, $header);
my $response = $agent->request($request); my $response = $agent->request($request);
my $json = decode_json($response->content); my $json = JSON->new->utf8(0)->decode($response->content);
foreach my $account (@{$json->{body}{account}}) { foreach my $account (@{$json->{body}{account}}) {
next if( !defined($account->{id}) ); next if( !defined($account->{id}) );
$hash->{AccountID} = $account->{id} if($account->{email} eq $hash->{Login}); $hash->{AccountID} = $account->{id} if($account->{email} eq $hash->{Login});
@ -360,7 +361,7 @@ withings_getUsers($)
my $request = HTTP::Request->new('GET', $URL, $header); my $request = HTTP::Request->new('GET', $URL, $header);
my $response = $agent->request($request); my $response = $agent->request($request);
my $json = decode_json($response->content); my $json = JSON->new->utf8(0)->decode($response->content);
my @users = (); my @users = ();
foreach my $user (@{$json->{body}{users}}) { foreach my $user (@{$json->{body}{users}}) {
@ -384,7 +385,7 @@ withings_getDevices($)
my $request = HTTP::Request->new('GET', $URL, $header); my $request = HTTP::Request->new('GET', $URL, $header);
my $response = $agent->request($request); my $response = $agent->request($request);
my $json = decode_json($response->content); my $json = JSON->new->utf8(0)->decode($response->content);
my @devices = (); my @devices = ();
foreach my $association (@{$json->{body}{associations}}) { foreach my $association (@{$json->{body}{associations}}) {
@ -410,7 +411,7 @@ withings_getDeviceDetail($$)
my $request = HTTP::Request->new('GET', $URL, $header); my $request = HTTP::Request->new('GET', $URL, $header);
my $response = $agent->request($request); my $response = $agent->request($request);
my $json = decode_json($response->content); my $json = JSON->new->utf8(0)->decode($response->content);
return $json->{body}; return $json->{body};
} }
@ -435,7 +436,7 @@ withings_getDeviceReadings($$)
my $request = HTTP::Request->new('GET', $URL, $header); my $request = HTTP::Request->new('GET', $URL, $header);
my $response = $agent->request($request); my $response = $agent->request($request);
my $json = decode_json($response->content); my $json = JSON->new->utf8(0)->decode($response->content);
if(open(FH, "</tmp/getmeashf.txt")) { if(open(FH, "</tmp/getmeashf.txt")) {
my $content; my $content;
@ -446,7 +447,7 @@ withings_getDeviceReadings($$)
} }
close(FH); close(FH);
$json = decode_json($content); $json = JSON->new->utf8(0)->decode($content);
} }
return $json; return $json;
@ -464,7 +465,7 @@ withings_getUserDetail($$)
my $request = HTTP::Request->new('GET', $URL, $header); my $request = HTTP::Request->new('GET', $URL, $header);
my $response = $agent->request($request); my $response = $agent->request($request);
my $json = decode_json($response->content); my $json = JSON->new->utf8(0)->decode($response->content);
return $json->{body}{users}[0]; return $json->{body}{users}[0];
} }
@ -560,7 +561,7 @@ withings_pollUser($)
$url .= "&userid=$hash->{User}&publickey=$hash->{Key}"; $url .= "&userid=$hash->{User}&publickey=$hash->{Key}";
$url .= "&lastupdate=$lastupdate" if( $lastupdate ); $url .= "&lastupdate=$lastupdate" if( $lastupdate );
my $ret = get($url); my $ret = get($url);
my $json = decode_json($ret); my $json = JSON->new->utf8(0)->decode($ret);
$hash->{status} = $json->{status}; $hash->{status} = $json->{status};
if( $hash->{status} == 0 ) { if( $hash->{status} == 0 ) {