Move Config::get() to DI::config()->get()

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

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 6645a46bda4d6738fafb62c0d41d787a2050e5a3..4507fadb70955f420009f76281898d874180516c 100644 (file)
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -10,9 +10,9 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Cache\Duration;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
@@ -37,7 +37,7 @@ function curweather_uninstall()
 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)) {
@@ -91,7 +91,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 +116,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';
@@ -184,7 +184,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.');
@@ -233,8 +233,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/" );