X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=curweather%2Fcurweather.php;h=2b8682d157168316df0a46ccb7641e6082867fd1;hb=d7de9d9bf729806cd362f50b1a968b6c21f3f094;hp=d3e002ddd1c10b264e5067ac5bd15f51710b7a3d;hpb=8f49ff2054bdef193bca10fb757007d95bff2d4d;p=friendica-addons.git

diff --git a/curweather/curweather.php b/curweather/curweather.php
index d3e002dd..2b8682d1 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -11,12 +11,10 @@
 
 use Friendica\App;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 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()
@@ -26,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)
 {
@@ -50,10 +41,10 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
 	}
 
 	try {
-		$res = new SimpleXMLElement(Network::fetchUrl($url));
+		$res = new SimpleXMLElement(DI::httpRequest()->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;
 		}
 
@@ -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/" );