X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=curweather%2Fcurweather.php;h=f614840a24e7af239e83380157ce8b3a8596ce6c;hb=6948a15f1c5563928e5e2a108621038ce4bdb76a;hp=d1ef63b88b65862862879500e188638f947ab6ac;hpb=85b5715a44ee7e9b7075bfac5338bf8eadfe9a58;p=friendica-addons.git diff --git a/curweather/curweather.php b/curweather/curweather.php index d1ef63b8..f614840a 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -2,7 +2,7 @@ /** * Name: Current Weather * Description: Shows current weather conditions for user's location on their network page. - * Version: 1.1 + * Version: 1.2 * Author: Tony Baldwin * Author: Fabio Comuni * Author: Tobias Diekershoff @@ -10,38 +10,28 @@ */ use Friendica\App; -use Friendica\Core\Addon; -use Friendica\Core\Cache; -use Friendica\Core\Config; -use Friendica\Core\L10n; -use Friendica\Core\PConfig; +use Friendica\Core\Cache\Enum\Duration; +use Friendica\Core\Hook; use Friendica\Core\Renderer; -use Friendica\Util\Network; +use Friendica\DI; use Friendica\Util\Proxy as ProxyUtils; function curweather_install() { - Addon::registerHook('network_mod_init' , 'addon/curweather/curweather.php', 'curweather_network_mod_init'); - Addon::registerHook('addon_settings' , 'addon/curweather/curweather.php', 'curweather_addon_settings'); - Addon::registerHook('addon_settings_post', 'addon/curweather/curweather.php', 'curweather_addon_settings_post'); -} - -function curweather_uninstall() -{ - Addon::unregisterHook('network_mod_init' , 'addon/curweather/curweather.php', 'curweather_network_mod_init'); - Addon::unregisterHook('addon_settings' , 'addon/curweather/curweather.php', 'curweather_addon_settings'); - Addon::unregisterHook('addon_settings_post', 'addon/curweather/curweather.php', 'curweather_addon_settings_post'); + Hook::register('network_mod_init' , 'addon/curweather/curweather.php', 'curweather_network_mod_init'); + Hook::register('addon_settings' , 'addon/curweather/curweather.php', 'curweather_addon_settings'); + Hook::register('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)) { - $cdate = PConfig::get(local_user(), 'curweather', 'last'); + $cdate = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'last'); $cached = unserialize($cached); if ($cdate + $cachetime > $now->getTimestamp()) { @@ -50,10 +40,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(L10n::t('Error fetching weather data. Error was: '.$e->getMessage())); + DI::sysmsg()->addNotice(DI::l10n()->t('Error fetching weather data. Error was: ' . $e->getMessage())); $_SESSION['curweather_notice_shown'] = true; } @@ -62,7 +52,7 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti unset($_SESSION['curweather_notice_shown']); - if ((string) $res->temperature['unit'] === 'metric') { + if (in_array((string) $res->temperature['unit'], ['celsius', 'metric'])) { $tunit = '°C'; $wunit = 'm/s'; } else { @@ -90,19 +80,19 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti 'icon' => (string) $res->weather['icon'], ]; - PConfig::set(local_user(), 'curweather', 'last', $now->getTimestamp()); - Cache::set('curweather'.md5($url), serialize($r), Cache::HOUR); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'curweather', 'last', $now->getTimestamp()); + DI::cache()->set('curweather'.md5($url), serialize($r), Duration::HOUR); return $r; } -function curweather_network_mod_init(App $a, &$b) +function curweather_network_mod_init(string &$body) { - if (!intval(PConfig::get(local_user(), 'curweather', 'curweather_enable'))) { + if (!intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_enable'))) { return; } - $a->page['htmlhead'] .= '' . "\r\n"; + DI::page()['htmlhead'] .= '' . "\r\n"; // $rpt value is needed for location // $lang will be taken from the browser session to honour user settings @@ -113,15 +103,15 @@ function curweather_network_mod_init(App $a, &$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 = PConfig::get(local_user(), 'curweather', 'curweather_loc'); + $rpt = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_loc'); // Set the language to the browsers language or default and use metric units - $lang = defaults($_SESSION, 'language', Config::get('system', 'language')); - $units = PConfig::get( local_user(), 'curweather', 'curweather_units'); - $appid = Config::get('curweather', 'appid'); - $cachetime = intval(Config::get('curweather', 'cachetime')); + $lang = DI::session()->get('language', DI::config()->get('system', 'language')); + $units = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_units'); + $appid = DI::config()->get('curweather', 'appid'); + $cachetime = intval(DI::config()->get('curweather', 'cachetime')); - if ($units === "") { + if ($units === '') { $units = 'metric'; } @@ -136,122 +126,116 @@ function curweather_network_mod_init(App $a, &$b) if ($ok) { $t = Renderer::getMarkupTemplate("widget.tpl", "addon/curweather/" ); $curweather = Renderer::replaceMacros($t, [ - '$title' => L10n::t("Current Weather"), + '$title' => DI::l10n()->t("Current Weather"), '$icon' => ProxyUtils::proxifyUrl('http://openweathermap.org/img/w/'.$res['icon'].'.png'), '$city' => $res['city'], '$lon' => $res['lon'], '$lat' => $res['lat'], '$description' => $res['descripion'], '$temp' => $res['temperature'], - '$relhumidity' => ['caption'=>L10n::t('Relative Humidity'), 'val'=>$res['humidity']], - '$pressure' => ['caption'=>L10n::t('Pressure'), 'val'=>$res['pressure']], - '$wind' => ['caption'=>L10n::t('Wind'), 'val'=> $res['wind']], - '$lastupdate' => L10n::t('Last Updated').': '.$res['update'].'UTC', - '$databy' => L10n::t('Data by'), - '$showonmap' => L10n::t('Show on map') + '$relhumidity' => ['caption'=>DI::l10n()->t('Relative Humidity'), 'val'=>$res['humidity']], + '$pressure' => ['caption'=>DI::l10n()->t('Pressure'), 'val'=>$res['pressure']], + '$wind' => ['caption'=>DI::l10n()->t('Wind'), 'val'=> $res['wind']], + '$lastupdate' => DI::l10n()->t('Last Updated').': '.$res['update'].'UTC', + '$databy' => DI::l10n()->t('Data by'), + '$showonmap' => DI::l10n()->t('Show on map') ]); } else { $t = Renderer::getMarkupTemplate('widget-error.tpl', 'addon/curweather/'); $curweather = Renderer::replaceMacros( $t, [ - '$problem' => L10n::t('There was a problem accessing the weather data. But have a look'), + '$problem' => DI::l10n()->t('There was a problem accessing the weather data. But have a look'), '$rpt' => $rpt, - '$atOWM' => L10n::t('at OpenWeatherMap') + '$atOWM' => DI::l10n()->t('at OpenWeatherMap') ]); } - $a->page['aside'] = $curweather . $a->page['aside']; + DI::page()['aside'] = $curweather . DI::page()['aside']; } -function curweather_addon_settings_post(App $a, $post) +function curweather_addon_settings_post($post) { - if (!local_user() || empty($_POST['curweather-settings-submit'])) { + if (!DI::userSession()->getLocalUserId() || empty($_POST['curweather-settings-submit'])) { return; } - 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(L10n::t('Current Weather settings updated.') . EOL); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_loc' , trim($_POST['curweather_loc'])); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_enable', intval($_POST['curweather_enable'])); + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_units' , trim($_POST['curweather_units'])); } -function curweather_addon_settings(App $a, &$s) +function curweather_addon_settings(array &$data) { - if (!local_user()) { + if (!DI::userSession()->getLocalUserId()) { return; } - /* Get the current state of our config variable */ - $curweather_loc = PConfig::get(local_user(), 'curweather', 'curweather_loc'); - $curweather_units = PConfig::get(local_user(), 'curweather', 'curweather_units'); - $appid = Config::get('curweather', 'appid'); + $curweather_loc = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_loc'); + $curweather_units = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_units'); + $appid = DI::config()->get('curweather', 'appid'); - if ($appid == "") { - $noappidtext = L10n::t('No APPID found, please contact your admin to obtain one.'); + if ($appid == '') { + $noappidtext = DI::l10n()->t('No APPID found, please contact your admin to obtain one.'); } else { $noappidtext = ''; } - $enable = intval(PConfig::get(local_user(), 'curweather', 'curweather_enable')); - $enable_checked = (($enable) ? ' checked="checked" ' : ''); - - // load template and replace the macros - $t = Renderer::getMarkupTemplate("settings.tpl", "addon/curweather/" ); - - $s = Renderer::replaceMacros($t, [ - '$submit' => L10n::t('Save Settings'), - '$header' => L10n::t('Current Weather').' '.L10n::t('Settings'), - '$noappidtext' => $noappidtext, - '$info' => L10n::t('Enter either the name of your location or the zip code.'), - '$curweather_loc' => [ 'curweather_loc', L10n::t('Your Location'), $curweather_loc, L10n::t('Identifier of your location (name or zip code), e.g. Berlin,DE or 14476,DE.') ], - '$curweather_units' => [ 'curweather_units', L10n::t('Units'), $curweather_units, L10n::t('select if the temperature should be displayed in °C or °F'), ['metric'=>'°C', 'imperial'=>'°F']], - '$enabled' => [ 'curweather_enable', L10n::t('Show weather data'), $enable, ''] + $enabled = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_enable')); + + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/curweather/'); + $html = Renderer::replaceMacros($t, [ + '$noappidtext' => $noappidtext, + '$info' => DI::l10n()->t('Enter either the name of your location or the zip code.'), + '$curweather_loc' => ['curweather_loc', DI::l10n()->t('Your Location'), $curweather_loc, DI::l10n()->t('Identifier of your location (name or zip code), e.g. Berlin,DE or 14476,DE.')], + '$curweather_units' => ['curweather_units', DI::l10n()->t('Units'), $curweather_units, DI::l10n()->t('select if the temperature should be displayed in °C or °F'), ['metric' => '°C', 'imperial' => '°F']], + '$enabled' => ['curweather_enable', DI::l10n()->t('Show weather data'), $enabled, ''], ]); - return; + $data = [ + 'addon' => 'curweather', + 'title' => DI::l10n()->t('Current Weather Settings'), + 'html' => $html, + ]; } // Config stuff for the admin panel to let the admin of the node set a APPID // for accessing the API of openweathermap -function curweather_addon_admin_post(App $a) +function curweather_addon_admin_post() { - if (!is_site_admin()) { + if (!DI::userSession()->isSiteAdmin()) { return; } if (!empty($_POST['curweather-submit'])) { - Config::set('curweather', 'appid', trim($_POST['appid'])); - Config::set('curweather', 'cachetime', trim($_POST['cachetime'])); - - info(L10n::t('Curweather settings saved.' . PHP_EOL)); + DI::config()->set('curweather', 'appid', trim($_POST['appid'])); + DI::config()->set('curweather', 'cachetime', trim($_POST['cachetime'])); } } -function curweather_addon_admin(App $a, &$o) +function curweather_addon_admin(string &$o) { - if (!is_site_admin()) { + if (!DI::userSession()->isSiteAdmin()) { 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/" ); + $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/curweather/' ); $o = Renderer::replaceMacros($t, [ - '$submit' => L10n::t('Save Settings'), + '$submit' => DI::l10n()->t('Save Settings'), '$cachetime' => [ 'cachetime', - L10n::t('Caching Interval'), + DI::l10n()->t('Caching Interval'), $cachetime, - L10n::t('For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'), [ - '0' => L10n::t('no cache'), - '300' => '5 ' . L10n::t('minutes'), - '900' => '15 ' . L10n::t('minutes'), - '1800' => '30 ' . L10n::t('minutes'), - '3600' => '60 ' . L10n::t('minutes') + DI::l10n()->t('For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'), [ + '0' => DI::l10n()->t('no cache'), + '300' => '5 ' . DI::l10n()->t('minutes'), + '900' => '15 ' . DI::l10n()->t('minutes'), + '1800' => '30 ' . DI::l10n()->t('minutes'), + '3600' => '60 ' . DI::l10n()->t('minutes') ] ], - '$appid' => ['appid', L10n::t('Your APPID'), $appid, L10n::t('Your API key provided by OpenWeatherMap')] + '$appid' => ['appid', DI::l10n()->t('Your APPID'), $appid, DI::l10n()->t('Your API key provided by OpenWeatherMap')] ]); }