X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=curweather%2Fcurweather.php;h=6197c96174c746895189aba5ce79c88febb80efc;hb=83f427a5779147b36ee7700c6761dacc79dd6db7;hp=93e9af9e2ae663a36e17d0ac13383ad1be55933b;hpb=2b1d28f05a61ef4862d9ac16c450c98a6b74ce49;p=friendica-addons.git
diff --git a/curweather/curweather.php b/curweather/curweather.php
index 93e9af9e..6197c961 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -10,7 +10,12 @@
*/
require_once('include/network.php');
-include_once('include/text.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) {
@@ -18,7 +23,7 @@ function getWeather( $loc, $units='metric', $lang='en', $appid='', $cachetime=0)
$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;
@@ -37,6 +42,11 @@ function getWeather( $loc, $units='metric', $lang='en', $appid='', $cachetime=0)
$tunit = '°F';
$wunit = 'mph';
}
+ if ( trim((string)$res->weather['value']) == trim((string)$res->clouds['name']) ) {
+ $desc = (string)$res->clouds['name'];
+ } else {
+ $desc = (string)$res->weather['value'].', '.(string)$res->clouds['name'];
+ }
$r = array(
'city'=> (string) $res->city['name'][0],
'country' => (string) $res->city->country[0],
@@ -45,12 +55,13 @@ function getWeather( $loc, $units='metric', $lang='en', $appid='', $cachetime=0)
'temperature' => (string) $res->temperature['value'][0].$tunit,
'pressure' => (string) $res->pressure['value'].(string)$res->pressure['unit'],
'humidity' => (string) $res->humidity['value'].(string)$res->humidity['unit'],
- 'descripion' => (string)$res->weather['value'].', '.(string)$res->clouds['name'],
+ 'descripion' => $desc,
'wind' => (string)$res->wind->speed['name'].' ('.(string)$res->wind->speed['value'].$wunit.')',
- 'update' => (string)$res->lastupdate['value']
+ 'update' => (string)$res->lastupdate['value'],
+ 'icon' => (string)$res->weather['icon']
);
- set_pconfig(local_user(), 'curweather', 'last', $now->getTimestamp());
- Cache::set('curweather'.md5($url), serialize($r));
+ PConfig::set(local_user(), 'curweather', 'last', $now->getTimestamp());
+ Cache::set('curweather'.md5($url), serialize($r), CACHE_HOUR);
return $r;
}
@@ -68,27 +79,28 @@ 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'] .= '' . "\r\n";
- // the OpenWeatherMap-PHP-APIlib does all the work here
- // the $rpt value is needed for location
+ // $rpt value is needed for location
// $lang will be taken from the browser session to honour user settings
+ // TODO $lang does not work if the default settings are used
+ // and not all response strings are translated
// $units can be set in the settings by the user
// $appid is configured by the admin in the admin panel
// 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;
@@ -101,6 +113,7 @@ function curweather_network_mod_init(&$fk_app,&$b) {
$t = get_markup_template("widget.tpl", "addon/curweather/" );
$curweather = replace_macros ($t, array(
'$title' => t("Current Weather"),
+ '$icon' => proxy_url('http://openweathermap.org/img/w/'.$res['icon'].'.png'),
'$city' => $res['city'],
'$lon' => $res['lon'],
'$lat' => $res['lat'],
@@ -130,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);
}
@@ -145,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
@@ -164,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. Berlin,DE or 14476,DE.') ),
- '$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 °C or °F'), array('metric'=>'°C', 'imperial'=>'°F')),
'$enabled' => array( 'curweather_enable', t('Show weather data'), $enable, '')
));
return;
@@ -176,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'),