Merge pull request #1182 from annando/deprecated

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

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 6645a46bda4d6738fafb62c0d41d787a2050e5a3..303fbbf942116290586c6d92c8e4e5044893b2c0 100644 (file)
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -10,13 +10,11 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
+use Friendica\Core\Cache\Duration;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
-use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
 
 function curweather_install()
@@ -26,18 +24,11 @@ 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)
 {
        $url = "http://api.openweathermap.org/data/2.5/weather?q=" . $loc . "&appid=" . $appid . "&lang=" . $lang . "&units=" . $units . "&mode=xml";
-       $cached = Cache::get('curweather'.md5($url));
+       $cached = DI::cache()->get('curweather'.md5($url));
        $now = new DateTime();
 
        if (!is_null($cached)) {
@@ -50,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'])) {
-                       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;
                }
 
@@ -91,7 +82,7 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
        ];
 
        DI::pConfig()->set(local_user(), 'curweather', 'last', $now->getTimestamp());
-       Cache::set('curweather'.md5($url), serialize($r), Cache::HOUR);
+       DI::cache()->set('curweather'.md5($url), serialize($r), Duration::HOUR);
 
        return $r;
 }
@@ -116,10 +107,10 @@ function curweather_network_mod_init(App $a, &$b)
        $rpt = DI::pConfig()->get(local_user(), 'curweather', 'curweather_loc');
 
        // Set the language to the browsers language or default and use metric units
-       $lang = Session::get('language', Config::get('system', 'language'));
+       $lang = Session::get('language', DI::config()->get('system', 'language'));
        $units = DI::pConfig()->get( local_user(), 'curweather', 'curweather_units');
-       $appid = Config::get('curweather', 'appid');
-       $cachetime = intval(Config::get('curweather', 'cachetime'));
+       $appid = DI::config()->get('curweather', 'appid');
+       $cachetime = intval(DI::config()->get('curweather', 'cachetime'));
 
        if ($units === "") {
                $units = 'metric';
@@ -171,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)
@@ -184,7 +173,7 @@ function curweather_addon_settings(App $a, &$s)
        /* Get the current state of our config variable */
        $curweather_loc = DI::pConfig()->get(local_user(), 'curweather', 'curweather_loc');
        $curweather_units = DI::pConfig()->get(local_user(), 'curweather', 'curweather_units');
-       $appid = Config::get('curweather', 'appid');
+       $appid = DI::config()->get('curweather', 'appid');
 
        if ($appid == "") {
                $noappidtext = DI::l10n()->t('No APPID found, please contact your admin to obtain one.');
@@ -220,10 +209,8 @@ function curweather_addon_admin_post(App $a)
        }
 
        if (!empty($_POST['curweather-submit'])) {
-               Config::set('curweather', 'appid',     trim($_POST['appid']));
-               Config::set('curweather', 'cachetime', trim($_POST['cachetime']));
-
-               info(DI::l10n()->t('Curweather settings saved.' . PHP_EOL));
+               DI::config()->set('curweather', 'appid',     trim($_POST['appid']));
+               DI::config()->set('curweather', 'cachetime', trim($_POST['cachetime']));
        }
 }
 
@@ -233,8 +220,8 @@ function curweather_addon_admin(App $a, &$o)
                return;
        }
 
-       $appid = Config::get('curweather', 'appid');
-       $cachetime = Config::get('curweather', 'cachetime');
+       $appid = DI::config()->get('curweather', 'appid');
+       $cachetime = DI::config()->get('curweather', 'cachetime');
 
        $t = Renderer::getMarkupTemplate("admin.tpl", "addon/curweather/" );