| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | /* This file is part of the wp-forecast plugin for wordpress */ |
| 3 | 3 | |
| 4 | -/* Copyright 2006-2009 Hans Matzen (email : webmaster at tuxlog dot de) | |
| 4 | +/* Copyright 2006-2011 Hans Matzen (email : webmaster at tuxlog dot de) | |
| 5 | 5 | |
| 6 | 6 | This program is free software; you can redistribute it and/or modify |
| 7 | 7 | it under the terms of the GNU General Public License as published by |
| 8 | 8 | the Free Software Foundation; either version 2 of the License, or |
| @@ -259,9 +259,9 @@ | ||
| 259 | 259 | { |
| 260 | 260 | pdebug(1,"Start of bug_get_locations ()"); |
| 261 | 261 | |
| 262 | 262 | // start_element() - wird vom XML-Parser bei öffnenden Tags aufgerufen |
| 263 | - function s_element( $parser, $name, $attribute ) | |
| 263 | + function bug_s_element( $parser, $name, $attribute ) | |
| 264 | 264 | { |
| 265 | 265 | global $loc,$i; |
| 266 | 266 | if ($name == "AWS:LOCATION") { |
| 267 | 267 | $loc[$i]=array(); |
| @@ -275,9 +275,9 @@ | ||
| 275 | 275 | } |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | 278 | // end_element() - dummy function |
| 279 | - function e_element( $parser, $name ){} | |
| 279 | + function bug_e_element( $parser, $name ){} | |
| 280 | 280 | |
| 281 | 281 | // Instanz des XML-Parsers erzeugen |
| 282 | 282 | $parser = xml_parser_create(); |
| 283 | 283 | |
| @@ -284,9 +284,9 @@ | ||
| 284 | 284 | // Parameter des XML-Parsers setzen |
| 285 | 285 | xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, true ); |
| 286 | 286 | |
| 287 | 287 | // Handler für Elemente ( öffnende / schließende Tags ) setzen |
| 288 | - xml_set_element_handler( $parser, "s_element", "e_element" ); | |
| 288 | + xml_set_element_handler( $parser, "bug_s_element", "bug_e_element" ); | |
| 289 | 289 | |
| 290 | 290 | // try to parse the xml |
| 291 | 291 | if( !xml_parse( $parser, $xml,true ) ) |
| 292 | 292 | { |
| @@ -369,9 +369,9 @@ | ||
| 369 | 369 | $weather_arr['winddir']=translate_winddir($w["winddirection"],"wp-forecast_".$wpf_language); |
| 370 | 370 | $weather_arr['windgusts']=windstr($metric,$w["wgusts"],$windunit); |
| 371 | 371 | list($dummy, $weather_arr['sunrise']) = split(" ",$w['sunrise'],2); |
| 372 | 372 | list($dummy, $weather_arr['sunset'] ) = split(" ",$w['sunset'] ,2); |
| 373 | - $weather_arr['copyright']='<a href="http://www.weatherbug.com">© 2010 WeatherBug</a>'; | |
| 373 | + $weather_arr['copyright']='<a href="http://www.weatherbug.com">© '.date("Y").' WeatherBug</a>'; | |
| 374 | 374 | |
| 375 | 375 | // additional info |
| 376 | 376 | $weather_arr['lat']=$w['lat']; |
| 377 | 377 | $weather_arr['lon']=$w['lon']; |
