X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=curweather%2Fcurweather.php;h=2b8682d157168316df0a46ccb7641e6082867fd1;hb=7a49da0d70490561fa6849d6fc27c78398d9d3ca;hp=460a148f57027e0b6af497c07d843c3e47ec248d;hpb=febc835a2d90509a54a41dca07dba1d8e3ed6d07;p=friendica-addons.git
diff --git a/curweather/curweather.php b/curweather/curweather.php
index 460a148f..2b8682d1 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -10,15 +10,11 @@
*/
use Friendica\App;
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
+use Friendica\Core\Cache\Duration;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\DI;
-use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils;
function curweather_install()
@@ -28,18 +24,11 @@ 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)
{
$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)) {
@@ -52,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(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;
}
@@ -93,7 +82,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;
}
@@ -118,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';
@@ -138,26 +127,26 @@ 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')
]);
}
@@ -173,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(L10n::t('Current Weather settings updated.') . EOL);
}
function curweather_addon_settings(App $a, &$s)
@@ -186,10 +173,10 @@ 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 = L10n::t('No APPID found, please contact your admin to obtain one.');
+ $noappidtext = DI::l10n()->t('No APPID found, please contact your admin to obtain one.');
} else {
$noappidtext = '';
}
@@ -201,13 +188,13 @@ function curweather_addon_settings(App $a, &$s)
$t = Renderer::getMarkupTemplate("settings.tpl", "addon/curweather/" );
$s = Renderer::replaceMacros($t, [
- '$submit' => L10n::t('Save Settings'),
- '$header' => L10n::t('Current Weather').' '.L10n::t('Settings'),
+ '$submit' => DI::l10n()->t('Save Settings'),
+ '$header' => DI::l10n()->t('Current Weather').' '.DI::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, '']
+ '$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'), $enable, '']
]);
return;
@@ -222,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(L10n::t('Curweather settings saved.' . PHP_EOL));
+ DI::config()->set('curweather', 'appid', trim($_POST['appid']));
+ DI::config()->set('curweather', 'cachetime', trim($_POST['cachetime']));
}
}
@@ -235,25 +220,25 @@ 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/" );
$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')]
]);
}