X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=curweather%2Fcurweather.php;h=e28cc2b3044adc6978128aedf631b055199b64fd;hb=d6f727974b7c29c2966c194b2069faeb196ed8c2;hp=120545fd488aaa28948f5a86ab994879d2cab666;hpb=22cc81cbc5b422d2d4a6d5660c15dcc4574f1484;p=friendica-addons.git diff --git a/curweather/curweather.php b/curweather/curweather.php index 120545fd..e28cc2b3 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -8,73 +8,71 @@ * Author: Tobias Diekershoff * */ -use Cmfcmf\OpenWeatherMap; -use Cmfcmf\OpenWeatherMap\AbstractCache; -use Cmfcmf\OpenWeatherMap\Exception as OWMException; -// Must point to composer's autoload file. -require('vendor/autoload.php'); +require_once('include/network.php'); +require_once("mod/proxy.php"); +require_once('include/text.php'); + +// 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'); + $cached = unserialize($cached); + if ($cdate + $cachetime > $now->getTimestamp()) { + return $cached; + } + } + try { + $res = new SimpleXMLElement(fetch_url($url)); + } catch (Exception $e) { + info(t('Error fetching weather data.\nError was: '.$e->getMessage())); + return false; + } + if ((string)$res->temperature['unit']==='metric') { + $tunit = '°C'; + $wunit = 'm/s'; + } else { + $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], + 'lat' => (string) $res->city->coord['lat'], + 'lon' => (string) $res->city->coord['lon'], + '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' => $desc, + 'wind' => (string)$res->wind->speed['name'].' ('.(string)$res->wind->speed['value'].$wunit.')', + '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), CACHE_HOUR); + return $r; +} function curweather_install() { register_hook('network_mod_init', 'addon/curweather/curweather.php', 'curweather_network_mod_init'); register_hook('plugin_settings', 'addon/curweather/curweather.php', 'curweather_plugin_settings'); register_hook('plugin_settings_post', 'addon/curweather/curweather.php', 'curweather_plugin_settings_post'); - } function curweather_uninstall() { unregister_hook('network_mod_init', 'addon/curweather/curweather.php', 'curweather_network_mod_init'); unregister_hook('plugin_settings', 'addon/curweather/curweather.php', 'curweather_plugin_settings'); unregister_hook('plugin_settings_post', 'addon/curweather/curweather.php', 'curweather_plugin_settings_post'); - -} - -// The caching mechanism is taken from the cache example of the -// OpenWeatherMap-PHP-API library and a bit customized to allow admins to set -// the caching time depending on the plans they got from openweathermap.org - -class ExampleCache extends AbstractCache -{ - private function urlToPath($url) - { - $tmp = sys_get_temp_dir(); - $dir = $tmp . DIRECTORY_SEPARATOR . "OpenWeatherMapPHPAPI"; - if (!is_dir($dir)) { - mkdir($dir); - } - - $path = $dir . DIRECTORY_SEPARATOR . md5($url); - return $path; - } - - /** - * @inheritdoc - */ - public function isCached($url) - { - $path = $this->urlToPath($url); - if (!file_exists($path) || filectime($path) + $this->seconds < time()) { - return false; - } - return true; - } - /** - * @inheritdoc - */ - public function getCached($url) - { - return file_get_contents($this->urlToPath($url)); - } - /** - * @inheritdoc - */ - public function setCached($url, $content) - { - file_put_contents($this->urlToPath($url), $content); - } } - function curweather_network_mod_init(&$fk_app,&$b) { if(! intval(get_pconfig(local_user(),'curweather','curweather_enable'))) @@ -82,9 +80,10 @@ function curweather_network_mod_init(&$fk_app,&$b) { $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 @@ -100,41 +99,38 @@ function curweather_network_mod_init(&$fk_app,&$b) { $cachetime = intval(get_config('curweather','cachetime')); if ($units==="") $units = 'metric'; - // Get OpenWeatherMap object. Don't use caching (take a look into - // Example_Cache.php to see how it works). - //$owm = new OpenWeatherMap(); - $owm = new OpenWeatherMap(null, new ExampleCache(), $cachetime); - - try { - $weather = $owm->getWeather($rpt, $units, $lang, $appid); - $temp = $weather->temperature->getValue(); - if ( $units === 'metric') { - $temp .= '°C'; - } else { - $temp .= '°F'; - }; - $rhumid = $weather->humidity; - $pressure = $weather->pressure; - $wind = $weather->wind->speed->getDescription().', '.$weather->wind->speed . " " . $weather->wind->direction; - $description = $weather->clouds->getDescription(); - } catch(OWMException $e) { - info ( 'OpenWeatherMap exception: ' . $e->getMessage() . ' (Code ' . $e->getCode() . ').'); - } catch(\Exception $e) { - info ('General exception: ' . $e->getMessage() . ' (Code ' . $e->getCode() . ').'); + $ok = true; + + $res = getWeather($rpt, $units, $lang, $appid, $cachetime); + if ($res===false) + $ok = false; + + if ($ok) { + $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'], + '$description' => $res['descripion'], + '$temp' => $res['temperature'], + '$relhumidity' => array('caption'=>t('Relative Humidity'), 'val'=>$res['humidity']), + '$pressure' => array('caption'=>t('Pressure'), 'val'=>$res['pressure']), + '$wind' => array('caption'=>t('Wind'), 'val'=> $res['wind']), + '$lastupdate' => t('Last Updated').': '.$res['update'].'UTC', + '$databy' => t('Data by'), + '$showonmap' => t('Show on map') + )); + } else { + $t = get_markup_template('widget-error.tpl', 'addon/curweather/'); + $curweather = replace_macros( $t, array( + '$problem' => t('There was a problem accessing the weather data. But have a look'), + '$rpt' => $rpt, + '$atOWM' => t('at OpenWeatherMap') + )); } - $curweather = '
-
-

'.t("Current Weather").': '.$weather->city->name.'

'; - - $curweather .= "$description; $temp
"; - $curweather .= t('Relative Humidity').": $rhumid
"; - $curweather .= t('Pressure').": $pressure
"; - $curweather .= t('Wind').": $wind
"; - $curweather .= ''. t('Data by').': OpenWeatherMap. '.t('Show on map').''; - - $curweather .= '
'; - $fk_app->page['aside'] = $curweather.$fk_app->page['aside']; } @@ -161,7 +157,7 @@ function curweather_plugin_settings(&$a,&$s) { $curweather_loc = get_pconfig(local_user(), 'curweather', 'curweather_loc'); $curweather_units = get_pconfig(local_user(), 'curweather', 'curweather_units'); $appid = get_config('curweather','appid'); - if (x($appid)) { + if ($appid=="") { $noappidtext = t('No APPID found, please contact your admin to optain one.'); } else { $noappidtext = ''; @@ -174,7 +170,7 @@ function curweather_plugin_settings(&$a,&$s) { $s = replace_macros ($t, array( '$submit' => t('Save Settings'), '$header' => t('Current Weather').' '.t('Settings'), - '$noappidtext' => t('No APPID found, please contact your admin to optain one.'), + '$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')),