X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=curweather%2Fcurweather.php;h=6197c96174c746895189aba5ce79c88febb80efc;hb=83f427a5779147b36ee7700c6761dacc79dd6db7;hp=e28cc2b3044adc6978128aedf631b055199b64fd;hpb=fd9cfc7f31f93f23afc597622d75ee777db4e3ec;p=friendica-addons.git

diff --git a/curweather/curweather.php b/curweather/curweather.php
index e28cc2b3..6197c961 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -13,13 +13,17 @@ require_once('include/network.php');
 require_once("mod/proxy.php");
 require_once('include/text.php');
 
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+
 //  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));
     $now = new DateTime();
     if (!is_null($cached)) {
-	$cdate = get_pconfig(local_user(), 'curweather', 'last');
+	$cdate = PConfig::get(local_user(), 'curweather', 'last');
 	$cached = unserialize($cached);
 	if ($cdate + $cachetime > $now->getTimestamp()) {
 	    return $cached;
@@ -56,7 +60,7 @@ function getWeather( $loc, $units='metric', $lang='en', $appid='', $cachetime=0)
 	'update' => (string)$res->lastupdate['value'],
 	'icon' => (string)$res->weather['icon']
     );
-    set_pconfig(local_user(), 'curweather', 'last', $now->getTimestamp());
+    PConfig::set(local_user(), 'curweather', 'last', $now->getTimestamp());
     Cache::set('curweather'.md5($url), serialize($r), CACHE_HOUR);
     return $r;
 }
@@ -75,7 +79,7 @@ function curweather_uninstall() {
 
 function curweather_network_mod_init(&$fk_app,&$b) {
 
-    if(! intval(get_pconfig(local_user(),'curweather','curweather_enable')))
+    if(! intval(PConfig::get(local_user(),'curweather','curweather_enable')))
         return;
 
     $fk_app->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $fk_app->get_baseurl() . '/addon/curweather/curweather.css' . '" media="all" />' . "\r\n";
@@ -89,14 +93,14 @@ function curweather_network_mod_init(&$fk_app,&$b) {
     // those parameters will be used to get: cloud status, temperature, preassure
     // and relative humidity for display, also the relevent area of the map is
     // linked from lat/log of the reply of OWMp
-    $rpt = get_pconfig(local_user(), 'curweather', 'curweather_loc');
+    $rpt = PConfig::get(local_user(), 'curweather', 'curweather_loc');
 
 
     //  set the language to the browsers language and use metric units
     $lang = $_SESSION['language'];
-    $units = get_pconfig( local_user(), 'curweather', 'curweather_units');
-    $appid = get_config('curweather','appid');
-    $cachetime = intval(get_config('curweather','cachetime'));
+    $units = PConfig::get( local_user(), 'curweather', 'curweather_units');
+    $appid = Config::get('curweather','appid');
+    $cachetime = intval(Config::get('curweather','cachetime'));
     if ($units==="")
 	$units = 'metric';
     $ok = true;
@@ -139,9 +143,9 @@ function curweather_network_mod_init(&$fk_app,&$b) {
 function curweather_plugin_settings_post($a,$post) {
 	if(! local_user() || (! x($_POST,'curweather-settings-submit')))
 		return;
-	set_pconfig(local_user(),'curweather','curweather_loc',trim($_POST['curweather_loc']));
-	set_pconfig(local_user(),'curweather','curweather_enable',intval($_POST['curweather_enable']));
-	set_pconfig(local_user(),'curweather','curweather_units',trim($_POST['curweather_units']));
+	PConfig::set(local_user(),'curweather','curweather_loc',trim($_POST['curweather_loc']));
+	PConfig::set(local_user(),'curweather','curweather_enable',intval($_POST['curweather_enable']));
+	PConfig::set(local_user(),'curweather','curweather_units',trim($_POST['curweather_units']));
 
 	info( t('Current Weather settings updated.') . EOL);
 }
@@ -154,15 +158,15 @@ function curweather_plugin_settings(&$a,&$s) {
 
 	/* Get the current state of our config variable */
 
-	$curweather_loc = get_pconfig(local_user(), 'curweather', 'curweather_loc');
-	$curweather_units = get_pconfig(local_user(), 'curweather', 'curweather_units');
-	$appid = get_config('curweather','appid');
+	$curweather_loc = PConfig::get(local_user(), 'curweather', 'curweather_loc');
+	$curweather_units = PConfig::get(local_user(), 'curweather', 'curweather_units');
+	$appid = Config::get('curweather','appid');
 	if ($appid=="") { 
-		$noappidtext = t('No APPID found, please contact your admin to optain one.');
+		$noappidtext = t('No APPID found, please contact your admin to obtain one.');
 	} else {
 	    $noappidtext = '';
 	}
-	$enable = intval(get_pconfig(local_user(),'curweather','curweather_enable'));
+	$enable = intval(PConfig::get(local_user(),'curweather','curweather_enable'));
 	$enable_checked = (($enable) ? ' checked="checked" ' : '');
 	
 	// load template and replace the macros
@@ -173,7 +177,7 @@ function curweather_plugin_settings(&$a,&$s) {
 		'$noappidtext' => $noappidtext,
 		'$info' => t('Enter either the name of your location or the zip code.'),
 		'$curweather_loc' => array( 'curweather_loc', t('Your Location'), $curweather_loc, t('Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.') ),
-		'$curweather_units' => array( 'curweather_units', t('Units'), $curweather_units, t('select if the temperatur should be displayed in °C or °F'), array('metric'=>'°C', 'imperial'=>'°F')),
+		'$curweather_units' => array( 'curweather_units', t('Units'), $curweather_units, t('select if the temperature should be displayed in &deg;C or &deg;F'), array('metric'=>'°C', 'imperial'=>'°F')),
 		'$enabled' => array( 'curweather_enable', t('Show weather data'), $enable, '')
 	    ));
 	return;
@@ -185,16 +189,16 @@ function curweather_plugin_admin_post (&$a) {
 	if(! is_site_admin())
 	    return;
 	if ($_POST['curweather-submit']) {
-	    set_config('curweather','appid',trim($_POST['appid']));
-	    set_config('curweather','cachetime',trim($_POST['cachetime']));
+	    Config::set('curweather','appid',trim($_POST['appid']));
+	    Config::set('curweather','cachetime',trim($_POST['cachetime']));
 	    info( t('Curweather settings saved.'.EOL));
 	}
 }
 function curweather_plugin_admin (&$a, &$o) {
     if(! is_site_admin())
 	    return;
-    $appid = get_config('curweather','appid');
-    $cachetime = get_config('curweather','cachetime');
+    $appid = Config::get('curweather','appid');
+    $cachetime = Config::get('curweather','cachetime');
     $t = get_markup_template("admin.tpl", "addon/curweather/" );
     $o = replace_macros ($t, array(
 	'$submit' => t('Save Settings'),