Merge pull request #1180 from annando/more-q

[friendica-addons.git] / curweather / curweather.php

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 575c5503a3a9a64cc9afb8237d28253d17430822..303fbbf942116290586c6d92c8e4e5044893b2c0 100644 (file)
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -24,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)
 {
@@ -48,10 +41,10 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
        }
 
        try {
-               $res = new SimpleXMLElement(DI::httpRequest()->fetch($url));
+               $res = new SimpleXMLElement(DI::httpClient()->fetch($url));
        } catch (Exception $e) {
                if (empty($_SESSION['curweather_notice_shown'])) {
-                       info(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;
                }
 
@@ -169,8 +162,6 @@ function curweather_addon_settings_post(App $a, $post)
        DI::pConfig()->set(local_user(), 'curweather', 'curweather_loc'   , trim($_POST['curweather_loc']));
        DI::pConfig()->set(local_user(), 'curweather', 'curweather_enable', intval($_POST['curweather_enable']));
        DI::pConfig()->set(local_user(), 'curweather', 'curweather_units' , trim($_POST['curweather_units']));
-
-       info(DI::l10n()->t('Current Weather settings updated.') . EOL);
 }
 
 function curweather_addon_settings(App $a, &$s)
@@ -220,8 +211,6 @@ function curweather_addon_admin_post(App $a)
        if (!empty($_POST['curweather-submit'])) {
                DI::config()->set('curweather', 'appid',     trim($_POST['appid']));
                DI::config()->set('curweather', 'cachetime', trim($_POST['cachetime']));
-
-               info(DI::l10n()->t('Curweather settings saved.' . PHP_EOL));
        }
 }