X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=curweather%2Fcurweather.php;h=303fbbf942116290586c6d92c8e4e5044893b2c0;hb=c4c2536052614d3bdaf8e3ed88cc99f38e476dae;hp=d9a1d20299a45abce55c87dd56b01b2c68d21caf;hpb=3f84caeec5071a88af90f229ec4f93449ea86e2d;p=friendica-addons.git diff --git a/curweather/curweather.php b/curweather/curweather.php index d9a1d202..303fbbf9 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -15,7 +15,6 @@ use Friendica\Core\Hook; use Friendica\Core\Renderer; use Friendica\Core\Session; use Friendica\DI; -use Friendica\Util\Network; use Friendica\Util\Proxy as ProxyUtils; function curweather_install() @@ -25,13 +24,6 @@ function curweather_install() Hook::register('addon_settings_post', 'addon/curweather/curweather.php', 'curweather_addon_settings_post'); } -function curweather_uninstall() -{ - Hook::unregister('network_mod_init' , 'addon/curweather/curweather.php', 'curweather_network_mod_init'); - Hook::unregister('addon_settings' , 'addon/curweather/curweather.php', 'curweather_addon_settings'); - Hook::unregister('addon_settings_post', 'addon/curweather/curweather.php', 'curweather_addon_settings_post'); -} - // get the weather data from OpenWeatherMap function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cachetime = 0) { @@ -49,10 +41,10 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti } try { - $res = new SimpleXMLElement(Network::fetchUrl($url)); + $res = new SimpleXMLElement(DI::httpClient()->fetch($url)); } catch (Exception $e) { if (empty($_SESSION['curweather_notice_shown'])) { - notice(DI::l10n()->t('Error fetching weather data. Error was: '.$e->getMessage())); + notice(DI::l10n()->t('Error fetching weather data. Error was: ' . $e->getMessage())); $_SESSION['curweather_notice_shown'] = true; }