';
+ // $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 = PConfig::get(local_user(), 'curweather', 'curweather_loc');
+
+
+ // set the language to the browsers language and use metric units
+ $lang = $_SESSION['language'];
+ $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;
+
+ $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')
+ ));
+ }
$fk_app->page['aside'] = $curweather.$fk_app->page['aside'];
@@ -61,8 +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']));
+ 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);
}
@@ -73,36 +156,53 @@ function curweather_plugin_settings(&$a,&$s) {
if(! local_user())
return;
- /* Add our stylesheet to the curweather so we can make our settings look nice */
-
- $a->page['htmlhead'] .= '' . "\r\n";
-
/* Get the current state of our config variable */
- $curweather_loc = get_pconfig(local_user(), 'curweather', 'curweather_loc');
- $enable = intval(get_pconfig(local_user(),'curweather','curweather_enable'));
+ $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 obtain one.');
+ } else {
+ $noappidtext = '';
+ }
+ $enable = intval(PConfig::get(local_user(),'curweather','curweather_enable'));
$enable_checked = (($enable) ? ' checked="checked" ' : '');
-
- /* Add some HTML to the existing form */
-
- $s .= '
';
- $s .= '
' . t('Current Weather') . '
';
- $s .= '
';
- $s .= '
Find the location code for the airport/weather station nearest you here.
';
+ // load template and replace the macros
+ $t = get_markup_template("settings.tpl", "addon/curweather/" );
+ $s = replace_macros ($t, array(
+ '$submit' => t('Save Settings'),
+ '$header' => t('Current Weather').' '.t('Settings'),
+ '$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 temperature should be displayed in °C or °F'), array('metric'=>'°C', 'imperial'=>'°F')),
+ '$enabled' => array( 'curweather_enable', t('Show weather data'), $enable, '')
+ ));
+ return;
}
-
-
+// Config stuff for the admin panel to let the admin of the node set a APPID
+// for accessing the API of openweathermap
+function curweather_plugin_admin_post (&$a) {
+ if(! is_site_admin())
+ return;
+ if ($_POST['curweather-submit']) {
+ 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 = 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'),
+ '$cachetime' => array('cachetime', t('Caching Interval'), $cachetime, t('For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'), array('0'=>t('no cache'), '300'=>'5 '.t('minutes'), '900'=>'15 '.t('minutes'), '1800'=>'30 '.t('minutes'), '3600'=>'60 '.t('minutes'))),
+ '$appid' => array('appid', t('Your APPID'), $appid, t('Your API key provided by OpenWeatherMap'))
+ ));
+}