diff --git a/fhem/FHEM/02_RSS.pm b/fhem/FHEM/02_RSS.pm index 43d68c778..99f5e8481 100644 --- a/fhem/FHEM/02_RSS.pm +++ b/fhem/FHEM/02_RSS.pm @@ -12,6 +12,7 @@ use strict; use warnings; use GD; use vars qw(%data); +use HttpUtils; # we can # use vars qw(%FW_types); # device types, @@ -232,7 +233,7 @@ RSS_itemGif { return if($host eq ""); return if($filename eq ""); ($x,$y)= RSS_xy($S,$x,$y); - my $data = GetHttpFile($host,$filename); + my $data = GetFileFromURL("http://$host$filename"); return unless(defined($data)); my $I= GD::Image->newFromGifData($data); my ($width,$height)= $I->getBounds(); diff --git a/fhem/FHEM/24_NetIO230B.pm b/fhem/FHEM/24_NetIO230B.pm index 9ba42bc7b..1446d01cb 100644 --- a/fhem/FHEM/24_NetIO230B.pm +++ b/fhem/FHEM/24_NetIO230B.pm @@ -46,6 +46,7 @@ use strict; use warnings; use Data::Dumper; use IO::Socket; +use HttpUtils; use constant PARAM_NAME => 1; use constant PARAM_HOST => 2; @@ -120,7 +121,7 @@ NetIO230B_Request($@) my $URL=''; my $log=''; - my $response = GetHttpFile($hash->{HOST}.":80","/tgi/control.tgi?l=p:". $hash->{USER}.":".$hash->{PASS}."&p=l"); + my $response = GetFileFromURL("http://".$hash->{HOST}."/tgi/control.tgi?l=p:". $hash->{USER}.":".$hash->{PASS}."&p=l"); if(!$response or length($response)==0) { Log 3, "NetIO230B_Request failed: ".$log; diff --git a/fhem/FHEM/59_Twilight.pm b/fhem/FHEM/59_Twilight.pm index 3e0a71abd..8a97b707d 100644 --- a/fhem/FHEM/59_Twilight.pm +++ b/fhem/FHEM/59_Twilight.pm @@ -8,6 +8,7 @@ package main; use strict; use warnings; use POSIX; +uset HttpUtils; sub dayofyear { my ($day1,$month,$year)=@_; @@ -274,7 +275,7 @@ sub Twilight_getWeatherHorizon{ #condition codes are described in FHEM wiki and in the documentation of the yahoo weather API my $hash=shift; my $location=$hash->{WEATHER}; - my $xml = GetHttpFile("weather.yahooapis.com:80","/forecastrss?w=".$location."&u=c",4.0); + my $xml = GetFileFromURL("http://weather.yahooapis.com/forecastrss?w=".$location."&u=c",4.0); my $current; if($xml=~/code="(.*)"(\ *)temp/){ if(defined($1)){ diff --git a/fhem/FHEM/59_Weather.pm b/fhem/FHEM/59_Weather.pm index a200c3276..53a6194a7 100755 --- a/fhem/FHEM/59_Weather.pm +++ b/fhem/FHEM/59_Weather.pm @@ -120,7 +120,7 @@ sub Weather_RetrieveDataDirectly($) my $lang= $hash->{LANG}; my $fc = undef; - my $xml = GetHttpFile("www.google.com:80", "/ig/api?weather=" . $location . "&hl=" . $lang); + my $xml = GetFileFromURL("http://www.google.com/ig/api?weather=" . $location . "&hl=" . $lang); return 0 if($xml eq ""); foreach my $l (split("<",$xml)) { #Log 1, "DEBUG WEATHER: line=\"$l\""; diff --git a/fhem/FHEM/HttpUtils.pm b/fhem/FHEM/HttpUtils.pm index c8e3c88d2..8454d2866 100644 --- a/fhem/FHEM/HttpUtils.pm +++ b/fhem/FHEM/HttpUtils.pm @@ -83,4 +83,13 @@ GetFileFromURL($@) return $ret; } +################## +# Compatibility mode +sub +GetHttpFile($$) +{ + my ($host,$port) = @_; + return GetFileFromURL("http://$host$file); +} + 1;