From d5bc1d1172e84b8d1ec63fb471ec51333539a488 Mon Sep 17 00:00:00 2001 From: markusbloch <> Date: Thu, 13 Dec 2018 10:52:26 +0000 Subject: [PATCH] FB_CALLMONITOR: removed klicktel.de for reverse search as the service is not available anymore (Forum: #83358) git-svn-id: https://svn.fhem.de/fhem/trunk@17966 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 2 ++ fhem/FHEM/72_FB_CALLMONITOR.pm | 43 +--------------------------------- 2 files changed, 3 insertions(+), 42 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 5e26463fc..0c55510ff 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # 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. + - change: 72_FB_CALLMONITOR: removed klicktel.de for reverse search, as + the service is not available anymore - bugfix: 49_SSCam: fix in autocreateCams and take snapshot - feature: 98_MediaList.pm: new readings: sortby and status for better integration in FTUI diff --git a/fhem/FHEM/72_FB_CALLMONITOR.pm b/fhem/FHEM/72_FB_CALLMONITOR.pm index c4a8c08e3..4964fa40b 100755 --- a/fhem/FHEM/72_FB_CALLMONITOR.pm +++ b/fhem/FHEM/72_FB_CALLMONITOR.pm @@ -740,48 +740,9 @@ FB_CALLMONITOR_reverseSearch($$) return $hash->{helper}{CACHE}{$number}; } } - - # Ask klicktel.de - if($method eq "klicktel.de") - { - unless(($number =~ /^0?[1-9]/ and $country_code eq "0049") or $number =~ /^0049/) - { - Log3 $name, 4, "FB_CALLMONITOR ($name) - skip using klicktel.de for reverse search of $number because of non-german number"; - } - else - { - $number =~ s/^0049/0/; # remove country code - Log3 $name, 1, "FB_CALLMONITOR ($name) - WARNING: using klicktel.de for reverse search is DEPRECATED please use dasoertliche.de instead"; - Log3 $name, 4, "FB_CALLMONITOR ($name) - using klicktel.de for reverse search of $number"; - - $result = GetFileFromURL("http://openapi.klicktel.de/searchapi/invers?key=0de6139a49055c37b9b2d7bb3933cb7b&number=".$number, 5, undef, 1); - - if(not defined($result)) - { - if(AttrVal($name, "reverse-search-cache", "0") eq "1") - { - $status = "timeout"; - undef($result); - } - } - else - { - if($result =~ /"displayname":"([^"]*?)"/) - { - $invert_match = $1; - $invert_match = FB_CALLMONITOR_html2txt($invert_match); - FB_CALLMONITOR_writeToCache($hash, $number, $invert_match); - undef($result); - return $invert_match; - } - - $status = "unknown"; - } - } - } # Ask dasoertliche.de - elsif($method eq "dasoertliche.de") + if($method eq "dasoertliche.de") { unless(($number =~ /^0?[1-9]/ and $country_code eq "0049") or $number =~ /^0049/) { @@ -1025,8 +986,6 @@ FB_CALLMONITOR_reverseSearch($$) } } } - - else { Log3 $name, 3, "FB_CALLMONITOR ($name) - unknown reverse search method $method";