phpwiki-checkins Mailing List for PhpWiki

Revision: 9805
 http://sourceforge.net/p/phpwiki/code/9805
Author: vargenau
Date: 2016年02月16日 12:00:24 +0000 (2016年2月16日)
Log Message:
-----------
Remove call to nonexistent setTightness
Modified Paths:
--------------
 trunk/lib/InlineParser.php
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2016年02月16日 11:52:24 UTC (rev 9804)
+++ trunk/lib/InlineParser.php	2016年02月16日 12:00:24 UTC (rev 9805)
@@ -1256,7 +1256,6 @@
 and is_a($markup, 'Markup_plugin')
 ) {
 $current =& $output->_content[count($output->_content) - 1];
- $current->setTightness(true, true);
 }
 $output->pushContent($match->prematch);
 $text = $match->postmatch;
@@ -1280,13 +1279,7 @@
 else
 $current = $markup->markup($match->match, $body);
 $input = $match->postmatch;
- if (isset($markup) and is_object($markup)
- and is_a($markup, 'Markup_plugin')
- ) {
- $current->setTightness(true, true);
- }
 $output->pushContent($match->prematch, $current);
-
 $match = $regexps->match($input);
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9804
 http://sourceforge.net/p/phpwiki/code/9804
Author: vargenau
Date: 2016年02月16日 11:52:24 +0000 (2016年2月16日)
Log Message:
-----------
Remove html_entities (unused)
Modified Paths:
--------------
 trunk/lib/InlineParser.php
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2016年02月12日 11:35:42 UTC (rev 9803)
+++ trunk/lib/InlineParser.php	2016年02月16日 11:52:24 UTC (rev 9804)
@@ -1144,35 +1144,6 @@
 }
 }
 
-// "..." => "…" browser specific display (not cached?)
-// Support some HTML::Entities: (C) for copy, --- for mdash, -- for ndash
-// TODO: "--" => "&emdash;" browser specific display (not cached?)
-
-class Markup_html_entities extends SimpleMarkup
-{
- //public $_match_regexp = '(: \.\.\.|\-\-|\-\-\-|\(C\) )';
-
- function __construct()
- {
- $this->_entities = array('...' => '…',
- '--' => '–',
- '---' => '—',
- '(C)' => '©',
- '©' => '©',
- '™' => '™',
- );
- $this->_match_regexp =
- '(: ' .
- join('|', array_map('preg_quote', array_keys($this->_entities))) .
- ' )';
- }
-
- function markup($match)
- {
- return HTML::raw($this->_entities[$match]);
- }
-}
-
 class Markup_isonumchars extends SimpleMarkup
 {
 public $_match_regexp = '\&\#\d{2,5};';
@@ -1219,7 +1190,7 @@
 'wikicreole_underline',
 'old_emphasis', 'nestled_emphasis',
 'html_emphasis', 'html_abbr', 'plugin', 'plugin_wikicreole',
- 'isonumchars', 'isohexchars', /*'html_entities'*/
+ 'isonumchars', 'isohexchars',
 );
 if (defined('DISABLE_MARKUP_WIKIWORD') and DISABLE_MARKUP_WIKIWORD)
 $markup_types = array_remove($markup_types, 'wikiword');
@@ -1364,7 +1335,7 @@
 parent::__construct
 (array('linebreak',
 'html_emphasis', 'html_abbr', 'plugin', 'plugin_wikicreole',
- 'isonumchars', 'isohexchars', /*'html_entities',*/
+ 'isonumchars', 'isohexchars',
 ));
 }
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9803
 http://sourceforge.net/p/phpwiki/code/9803
Author: vargenau
Date: 2016年02月12日 11:35:42 +0000 (2016年2月12日)
Log Message:
-----------
Add variable initialisation
Modified Paths:
--------------
 trunk/lib/main.php
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2016年02月11日 20:05:46 UTC (rev 9802)
+++ trunk/lib/main.php	2016年02月12日 11:35:42 UTC (rev 9803)
@@ -1004,6 +1004,9 @@
 
 if ($userid = $this->getCookieVar(getCookieName())) {
 if (!empty($userid) and substr($userid, 0, 2) != 's:') {
+ if (!isset($this->_user)) {
+ $this->_user = new stdClass();
+ }
 $this->_user->_authhow = 'cookie';
 return $userid;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9802
 http://sourceforge.net/p/phpwiki/code/9802
Author: vargenau
Date: 2016年02月11日 20:05:46 +0000 (2016年2月11日)
Log Message:
-----------
Fix preg_match
Modified Paths:
--------------
 trunk/lib/phpweather-2.2.2/phpweather.php
Modified: trunk/lib/phpweather-2.2.2/phpweather.php
===================================================================
--- trunk/lib/phpweather-2.2.2/phpweather.php	2016年02月11日 18:12:10 UTC (rev 9801)
+++ trunk/lib/phpweather-2.2.2/phpweather.php	2016年02月11日 20:05:46 UTC (rev 9802)
@@ -609,7 +609,7 @@
 $decoded_metar['precipitation']['mm_24h'] =
 number_format($regs[1]*0.254, 2, '.', '');
 	}
- } elseif (preg_match('/^4/([0-9]{3})/', $part, $regs)) {
+ } elseif (preg_match('#^4/([0-9]{3})#', $part, $regs)) {
 
 /*
 * Snow depth in inches
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9801
 http://sourceforge.net/p/phpwiki/code/9801
Author: vargenau
Date: 2016年02月11日 18:12:10 +0000 (2016年2月11日)
Log Message:
-----------
Use PDO syntax
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PDO_mysql.php
Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php	2016年02月11日 18:00:42 UTC (rev 9800)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php	2016年02月11日 18:12:10 UTC (rev 9801)
@@ -43,7 +43,7 @@
 }
 
 if ($this->_serverinfo['version'] > 401.0) {
- mysql_query("SET NAMES 'UTF-8'");
+ $this->_dbh->query("SET NAMES 'UTF-8'");
 }
 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9800
 http://sourceforge.net/p/phpwiki/code/9800
Author: vargenau
Date: 2016年02月11日 18:00:42 +0000 (2016年2月11日)
Log Message:
-----------
Add variable initialisation
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PDO.php
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2016年02月11日 17:46:56 UTC (rev 9799)
+++ trunk/lib/WikiDB/backend/PDO.php	2016年02月11日 18:00:42 UTC (rev 9800)
@@ -47,6 +47,9 @@
 unset($parsed['phptype']);
 unset($parsed['dbsyntax']);
 $dbparams['dsn'] = $driver . ":";
+ if (!isset($this->_dbh)) {
+ $this->_dbh = new stdClass();
+ }
 $this->_dbh->database = $parsed['database'];
 // mysql needs to map database=>dbname, hostspec=>host. TODO for the others.
 $dsnmap = array('mysql' => array('database' => 'dbname', 'hostspec' => 'host')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9799
 http://sourceforge.net/p/phpwiki/code/9799
Author: vargenau
Date: 2016年02月11日 17:46:56 +0000 (2016年2月11日)
Log Message:
-----------
Add variable initialisation
Modified Paths:
--------------
 trunk/lib/WikiDB/backend/PDO.php
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2016年02月11日 10:04:41 UTC (rev 9798)
+++ trunk/lib/WikiDB/backend/PDO.php	2016年02月11日 17:46:56 UTC (rev 9799)
@@ -1318,7 +1318,7 @@
 {
 $dbh = &$this->_dbh;
 $log_tbl = $entry->_accesslog->logtable;
- $dbh->prepare("INSERT INTO $log_tbl"
+ $sth = $dbh->prepare("INSERT INTO $log_tbl"
 . " (time_stamp,remote_host,remote_user,request_method,request_line,request_args,"
 . "request_file,request_uri,request_time,status,bytes_sent,referer,agent,request_duration)"
 . " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9798
 http://sourceforge.net/p/phpwiki/code/9798
Author: vargenau
Date: 2016年02月11日 10:04:41 +0000 (2016年2月11日)
Log Message:
-----------
Replace ereg with preg
Modified Paths:
--------------
 trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php
 trunk/lib/phpweather-2.2.2/config/pw_validator_range.php
 trunk/lib/phpweather-2.2.2/data_retrieval.php
 trunk/lib/phpweather-2.2.2/db/pw_db_dba.php
 trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php
 trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php
 trunk/lib/phpweather-2.2.2/db_updater.php
 trunk/lib/phpweather-2.2.2/output/pw_images.php
 trunk/lib/phpweather-2.2.2/phpweather.php
 trunk/lib/phpweather-2.2.2/pw_utilities.php
Modified: trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php	2016年02月11日 09:33:23 UTC (rev 9797)
+++ trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php	2016年02月11日 10:04:41 UTC (rev 9798)
@@ -41,7 +41,7 @@
 */
 function validate($value) {
 $this->value = $value;
- return ereg($this->regex, $value);
+ return preg_match('/' . addcslashes($this->regex, '/') . '/', $value);
 }
 
 /**
Modified: trunk/lib/phpweather-2.2.2/config/pw_validator_range.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_validator_range.php	2016年02月11日 09:33:23 UTC (rev 9797)
+++ trunk/lib/phpweather-2.2.2/config/pw_validator_range.php	2016年02月11日 10:04:41 UTC (rev 9798)
@@ -62,7 +62,7 @@
 
 if ($this->empty_ok && empty($value)) return true;
 
- return (ereg('^[-+]?[0-9]+$', $value) && $this->low <= $value && $value <= $this->high);
+ return (preg_match('/^[-+]?[0-9]+$/', $value) && $this->low <= $value && $value <= $this->high);
 }
 
 /**
Modified: trunk/lib/phpweather-2.2.2/data_retrieval.php
===================================================================
--- trunk/lib/phpweather-2.2.2/data_retrieval.php	2016年02月11日 09:33:23 UTC (rev 9797)
+++ trunk/lib/phpweather-2.2.2/data_retrieval.php	2016年02月11日 10:04:41 UTC (rev 9798)
@@ -372,7 +372,7 @@
 /* The remaining lines are the METAR itself. This will merge the
 * remaining lines into one line by removing new-lines:
 */
- $metar = ereg_replace("[\n\r ]+", ' ', trim(implode(' ', $metar_data)));
+ $metar = preg_replace("/[\n\r ]+/", ' ', trim(implode(' ', $metar_data)));
 
 $date = explode(':', strtr($date, '/ ', '::'));
 if ($date[2] > gmdate('j')) {
@@ -388,7 +388,7 @@
 $date[1], $date[2], $date[0]);
 $metar_time = $timestamp;
 
- if (!ereg('[0-9]{6}Z', $metar)) {
+ if (!preg_match('/[0-9]{6}Z/', $metar)) {
 /* Some reports don't even have a time-part, so we insert the
 * current time. This might not be the time of the report, but
 * it was broken anyway :-)
@@ -613,7 +613,7 @@
 /* The remaining lines are the TAF itself. This will merge the
 * remaining lines into one line by removing new-lines:
 */
- $taf = ereg_replace("[\n\r ]+", ' ', trim(implode(' ', $taf_data)));
+ $taf = preg_replace("/[\n\r ]+/", ' ', trim(implode(' ', $taf_data)));
 
 $date = explode(':', strtr($date, '/ ', '::'));
 if ($date[2] > gmdate('j')) {
@@ -625,7 +625,7 @@
 $timestamp = gmmktime($date[3], $date[4], 0,
 $date[1], $date[2], $date[0]);
 
- if (!ereg('[0-9]{6}Z', $taf)) {
+ if (!preg_match('/[0-9]{6}Z/', $taf)) {
 /* Some reports don't even have a time-part, so we insert the
 * current time. This might not be the time of the report, but
 * it was broken anyway :-)
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_dba.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_dba.php	2016年02月11日 09:33:23 UTC (rev 9797)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_dba.php	2016年02月11日 10:04:41 UTC (rev 9798)
@@ -46,7 +46,7 @@
 function pw_db_dba($input) {
 /* We have to load the DBA extension on some systems: */
 if (!extension_loaded('dba')) {
- if (ereg('win', PHP_OS)) {
+ if (preg_match('/win/', PHP_OS)) {
 dl('php_dba.dll');
 } else {
 dl('dba.so');
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php	2016年02月11日 09:33:23 UTC (rev 9797)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php	2016年02月11日 10:04:41 UTC (rev 9798)
@@ -23,7 +23,7 @@
 function pw_db_mysql($input) {
 /* We have to load the MySQL extension on some systems: */
 if (!extension_loaded('mysql')) {
- if (ereg('win', PHP_OS)) {
+ if (preg_match('/win/', PHP_OS)) {
 dl('mysql.dll');
 } else {
 dl('mysql.so');
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php	2016年02月11日 09:33:23 UTC (rev 9797)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php	2016年02月11日 10:04:41 UTC (rev 9798)
@@ -35,7 +35,7 @@
 function pw_db_pgsql($input = array()) {
 /* We have to load the PgSQL extension on some systems: */
 if (!extension_loaded('pgsql')) {
- if (ereg('win', PHP_OS)) {
+ if (preg_match('/win/', PHP_OS)) {
 dl('pgsql.dll');
 } else {
 dl('pgsql.so');
Modified: trunk/lib/phpweather-2.2.2/db_updater.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db_updater.php	2016年02月11日 09:33:23 UTC (rev 9797)
+++ trunk/lib/phpweather-2.2.2/db_updater.php	2016年02月11日 10:04:41 UTC (rev 9798)
@@ -12,15 +12,15 @@
 
 if (!empty($filename) &&
 file_exists($filename) &&
- ereg('[012][0-9]Z.TXT', $filename)) {
+ preg_match('/[012][0-9]Z.TXT/', $filename)) {
 $fn = $filename;
 } elseif (!empty($argv[0]) &&
 file_exists($argv[0]) &&
- ereg('[012][0-9]Z.TXT', $argv[0])) {
+ preg_match('/[012][0-9]Z.TXT/', $argv[0])) {
 $fn = $argv[0];
 } elseif (!empty($argv[1]) &&
 file_exists($argv[1]) &&
- ereg('[012][0-9]Z.TXT', $argv[1])) {
+ preg_match('/[012][0-9]Z.TXT/', $argv[1])) {
 $fn = $argv[1];
 } else {
 print_usage();
Modified: trunk/lib/phpweather-2.2.2/output/pw_images.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_images.php	2016年02月11日 09:33:23 UTC (rev 9797)
+++ trunk/lib/phpweather-2.2.2/output/pw_images.php	2016年02月11日 10:04:41 UTC (rev 9798)
@@ -251,23 +251,23 @@
 for ($i = 0; $i < $num_parts; $i++) {
 $part = $parts[$i];
 
- if (ereg('RMK|TEMPO|BECMG', $part)) {
+ if (preg_match('/RMK|TEMPO|BECMG/', $part)) {
 /* The rest of the METAR is either a remark or temporary
 information. We skip the rest of the METAR. */
 break;
- } elseif (ereg('([0-9]{2})([0-9]{2})([0-9]{2})Z', $part, $regs)) {
+ } elseif (preg_match('/([0-9]{2})([0-9]{2})([0-9]{2})Z/', $part, $regs)) {
 if (($regs[2] < 6) || ($regs[2] > 18)) {
 $night = 1;
 }
 }
- elseif (ereg('^(-|\+|VC)?(TS|SH|FZ|BL|DR|MI|BC|PR|RA|DZ|SN|SG|GR|GS|PE|IC|UP|BR|FG|FU|VA|DU|SA|HZ|PY|PO|SQ|FC|SS|DS)+$', $part)) {
+ elseif (preg_match('/^(-|\+|VC)?(TS|SH|FZ|BL|DR|MI|BC|PR|RA|DZ|SN|SG|GR|GS|PE|IC|UP|BR|FG|FU|VA|DU|SA|HZ|PY|PO|SQ|FC|SS|DS)+$/', $part)) {
 /*
 * Is this the current weather group?
 */
 
 // Get the intensity and get rid of it in the $part string
 $intensity = '';
- if (ereg('^(-|\+|VC)(..)*$',$part)) {
+ if (preg_match('/^(-|\+|VC)(..)*$/',$part)) {
 if ($part[0] == '-') {
 $intensity = '-';
 $part = substr($part,1);
@@ -284,11 +284,11 @@
 // Now, take only the precipitation types that have images.
 // Ignore the others In case more then one exist, take only the
 // first one (highest predominance).
- ereg('(TS|RA|DZ|SN|SG|GR|GS|PE|IC|BR|FG)(..)*$',$part,$match);
+ preg_match('/(TS|RA|DZ|SN|SG|GR|GS|PE|IC|BR|FG)(..)*$/',$part,$match);
 if (!empty($match[1])) {
 $phenomena = $match[1];
 } else {
- ereg('(..)(TS|RA|DZ|SN|SG|GR|GS|PE|IC|BR|FG)(..)*$',$part,$match);
+ preg_match('/(..)(TS|RA|DZ|SN|SG|GR|GS|PE|IC|BR|FG)(..)*$/',$part,$match);
 if (!empty($match[2])) {
 $phenomena = $match[2];
 } else {
@@ -300,13 +300,13 @@
 // I.e. drizzle (DZ) and rain (RA) are both considered to be
 // rain (as far as the images are concerned). Add intensity only
 // in case of rain and snow.
- if (ereg('^(Snow|Hail)$',$this->phenomena_array[$phenomena])) {
+ if (preg_match('/^(Snow|Hail)$/',$this->phenomena_array[$phenomena])) {
 if ($intensity == '') {
 $intensity = '-';
 }
 }
 
- if (ereg('^(Rain|Snow|Hail)$',$this->phenomena_array[$phenomena])) {
+ if (preg_match('/^(Rain|Snow|Hail)$/',$this->phenomena_array[$phenomena])) {
 $phenomena_group = $intensity . $this->phenomena_array[$phenomena];
 } else {
 $phenomena_group = $this->phenomena_array[$phenomena];
@@ -319,13 +319,13 @@
 // clouds, thus find the highest cloudcoverage layer, by
 // maximizing the $maxcoverage param
 
- elseif (ereg('(SKC|CLR)(...)', $part, $regs)) {
+ elseif (preg_match('/(SKC|CLR)(...)/', $part, $regs)) {
 $maxcoverage = max($maxcoverage,$this->coverage[$regs[1]]);
 // if ($maxcoverage < $this->coverage[$regs[1]]) {
 // $maxcoverage = $this->coverage[$regs[1]];
 // }
 }
- elseif (ereg('^(VV|FEW|SCT|BKN|OVC)([0-9]{3})(CB|TCU)?$', $part, $regs)) {
+ elseif (preg_match('/^(VV|FEW|SCT|BKN|OVC)([0-9]{3})(CB|TCU)?$/', $part, $regs)) {
 $maxcoverage = max($maxcoverage,$this->coverage[$regs[1]]);
 // if ($maxcoverage < $this->coverage[$regs[1]]) {
 // $maxcoverage = $this->coverage[$regs[1]];
Modified: trunk/lib/phpweather-2.2.2/phpweather.php
===================================================================
--- trunk/lib/phpweather-2.2.2/phpweather.php	2016年02月11日 09:33:23 UTC (rev 9797)
+++ trunk/lib/phpweather-2.2.2/phpweather.php	2016年02月11日 10:04:41 UTC (rev 9798)
@@ -196,7 +196,7 @@
 for ($i = 0; $i < $num_parts; $i++) {
 $part = $parts[$i];
 
- if (ereg('RMK|TEMPO|BECMG|INTER', $part)) {
+ if (preg_match('/RMK|TEMPO|BECMG|INTER/', $part)) {
 /* The rest of the METAR is either a remark or temporary
 * information. We keep the remark.
 */
@@ -214,13 +214,13 @@
 * Type of Report: SPECI
 */
 	$decoded_metar['type'] = 'SPECI';
- } elseif (ereg('^[A-Z]{4}$', $part) &&
+ } elseif (preg_match('/^[A-Z]{4}$/', $part) &&
 empty($decoded_metar['icao'])) {
 /*
 * Station Identifier
 */
 	$decoded_metar['icao'] = $part;
-// } elseif (ereg('([0-9]{2})([0-9]{2})([0-9]{2})Z', $part, $regs)) {
+// } elseif (preg_match('/([0-9]{2})([0-9]{2})([0-9]{2})Z/', $part, $regs)) {
 // /*
 // * Date and Time of Report.
 // *
@@ -249,12 +249,12 @@
 // $regs[3], 0, $month, $regs[1], gmdate('Y'));
 
 
- } elseif (ereg('(AUTO|COR|RTD|CC[A-Z]|RR[A-Z])', $part, $regs)) {
+ } elseif (preg_match('/(AUTO|COR|RTD|CC[A-Z]|RR[A-Z])/', $part, $regs)) {
 /*
 * Report Modifier: AUTO, COR, CCx or RRx
 */
 $decoded_metar['report_mod'] = $regs[1];
- } elseif (ereg('([0-9]{3}|VRB)([0-9]{2,3})G?([0-9]{2,3})?(KT|MPS|KMH)', $part, $regs)) {
+ } elseif (preg_match('/([0-9]{3}|VRB)([0-9]{2,3})G?([0-9]{2,3})?(KT|MPS|KMH)/', $part, $regs)) {
 
 /* Wind Group */
 
@@ -277,7 +277,7 @@
 			 $decoded_metar['wind']['gust_meters_per_second'],
 			 $decoded_metar['wind']['gust_miles_per_hour']);
 	}
- } elseif (ereg('^([0-9]{3})V([0-9]{3})$', $part, $regs) &&
+ } elseif (preg_match('/^([0-9]{3})V([0-9]{3})$/', $part, $regs) &&
 !empty($decoded_metar['wind'])) {
 
 /*
@@ -285,7 +285,7 @@
 */
 $decoded_metar['wind']['var_beg'] = $regs[1];
 	$decoded_metar['wind']['var_end'] = $regs[2];
- } elseif (ereg('^([0-9]{4})([NS]?[EW]?)$', $part, $regs)) {
+ } elseif (preg_match('/^([0-9]{4})([NS]?[EW]?)$/', $part, $regs)) {
 /*
 * Visibility in meters (4 digits only)
 */
@@ -319,13 +319,13 @@
 	}
 $decoded_metar['visibility'][] = $group;
 
- } elseif (ereg('^[0-9]$', $part)) {
+ } elseif (preg_match('/^[0-9]$/', $part)) {
 /*
 * Temp Visibility Group, single digit followed by space.
 */
 $temp_visibility_miles = $part;
- } elseif (ereg('^M?(([0-9]?)[ ]?([0-9])(/?)([0-9]*))SM$',
- $temp_visibility_miles . ' ' . $part, $regs)) {
+ } elseif (preg_match('#^M?(([0-9]?)[ ]?([0-9])(/?)([0-9]*))SM$#',
+ $temp_visibility_miles . ' ' . $part, $regs)) {
 /*
 * Visibility Group
 */
@@ -370,8 +370,8 @@
 $decoded_metar['visibility'][] = $group;
 $decoded_metar['clouds'][]['condition'] = 'CAVOK';
 
- } elseif (ereg('^R([0-9]{2})([RLC]?)/([MP]?)([0-9]{4})' .
- '([DNU]?)V?(P?)([0-9]{4})?([DNU]?)$', $part, $regs)) {
+ } elseif (preg_match('#^R([0-9]{2})([RLC]?)/([MP]?)([0-9]{4})' .
+ '([DNU]?)V?(P?)([0-9]{4})?([DNU]?)$#', $part, $regs)) {
 /* Runway-group */
 unset($group);
 $group['nr'] = $regs[1];
@@ -427,12 +427,12 @@
 	}
 $decoded_metar['runway'][] = $group;
 
- } elseif (ereg('^(VC)?' . /* Proximity */
+ } elseif (preg_match('/^(VC)?' . /* Proximity */
 		 '(-|\+)?' . /* Intensity */
 		 '(MI|PR|BC|DR|BL|SH|TS|FZ)?' . /* Descriptor */
 		 '((DZ|RA|SN|SG|IC|PL|GR|GS|UP)+)?' . /* Precipitation */
 		 '(BR|FG|FU|VA|DU|SA|HZ|PY)?' . /* Obscuration */
-		 '(PO|SQ|FC|SS)?$', /* Other */
+		 '(PO|SQ|FC|SS)?$/', /* Other */
 		 $part, $regs)) {
 /*
 * Current weather-group.
@@ -449,8 +449,8 @@
 /* Cloud-group */
 $decoded_metar['clouds'][]['condition'] = $part;
 
- } elseif (ereg('^(VV|FEW|SCT|BKN|OVC)([0-9]{3}|///)' .
- '(CB|TCU)?$', $part, $regs)) {
+ } elseif (preg_match('#^(VV|FEW|SCT|BKN|OVC)([0-9]{3}|///)' .
+ '(CB|TCU)?$#', $part, $regs)) {
 /* We have found (another) a cloud-layer-group. */
 unset($group);
 
@@ -473,7 +473,7 @@
 	}
 $decoded_metar['clouds'][] = $group;
 
- } elseif (ereg('^(M?[0-9]{2})/(M?[0-9]{2}|//)?$', $part, $regs)) {
+ } elseif (preg_match('#^(M?[0-9]{2})/(M?[0-9]{2}|//)?$#', $part, $regs)) {
 /*
 * Temperature/Dew Point Group.
 */
@@ -491,7 +491,7 @@
 $decoded_metar['temperature']['dew_f'] =
 round(strtr($regs[2], 'M', '-') * (9/5) + 32);
 	}
- } elseif (ereg('A([0-9]{4})', $part, $regs)) {
+ } elseif (preg_match('/A([0-9]{4})/', $part, $regs)) {
 /*
 * Altimeter.
 * The pressure measured in inHg.
@@ -506,7 +506,7 @@
 round($regs[1] * 0.33864);
 	$decoded_metar['altimeter']['atm'] =
 number_format($regs[1] * 3.3421e-4, 3, '.', '');
- } elseif (ereg('Q([0-9]{4})', $part, $regs)) {
+ } elseif (preg_match('/Q([0-9]{4})/', $part, $regs)) {
 /*
 * Altimeter.
 * The specification doesn't say anything about
@@ -523,7 +523,7 @@
 number_format($regs[1] * 0.02953, 2);
 $decoded_metar['altimeter']['atm'] =
 number_format($regs[1] * 9.8692e-4, 3, '.', '');
- } elseif (ereg('^T([0-9]{4})([0-9]{4})', $part, $regs)) {
+ } elseif (preg_match('/^T([0-9]{4})([0-9]{4})/', $part, $regs)) {
 
 /*
 * Temperature/Dew Point Group, coded to tenth of degree Celsius.
@@ -534,11 +534,11 @@
 	$this->store_temp($regs[2] / 10,
 			 $decoded_metar['temperature']['dew_c'],
 			 $decoded_metar['temperature']['dew_f']);
- } elseif (ereg('^T([0-9]{4}$)', $part, $regs)) {
+ } elseif (preg_match('/^T([0-9]{4}$)/', $part, $regs)) {
 	$this->store_temp($regs[1],
 			 $decoded_metar['temperature']['temp_c'],
 			 $decoded_metar['temperature']['temp_f']);
- } elseif (ereg('^1([0-9]{4}$)', $part, $regs)) {
+ } elseif (preg_match('/^1([0-9]{4}$)/', $part, $regs)) {
 
 /*
 * 6 hour maximum temperature Celsius, coded to tenth of degree
@@ -546,7 +546,7 @@
 	$this->store_temp($regs[1] / 10,
 			 $decoded_metar['temp_min_max']['max6h_c'],
 			 $decoded_metar['temp_min_max']['max6h_f']);
- } elseif (ereg('^2([0-9]{4}$)', $part, $regs)) {
+ } elseif (preg_match('/^2([0-9]{4}$)/', $part, $regs)) {
 
 /*
 * 6 hour minimum temperature Celsius, coded to tenth of degree
@@ -554,7 +554,7 @@
 	$this->store_temp($regs[1] / 10,
 			 $decoded_metar['temp_min_max']['min6h_c'],
 			 $decoded_metar['temp_min_max']['min6h_f']);
- } elseif (ereg('^4([0-9]{4})([0-9]{4})$', $part, $regs)) {
+ } elseif (preg_match('/^4([0-9]{4})([0-9]{4})$/', $part, $regs)) {
 
 /*
 * 24 hour maximum and minimum temperature Celsius, coded to
@@ -566,7 +566,7 @@
 	$this->store_temp($regs[2] / 10,
 			 $decoded_metar['temp_min_max']['min24h_c'],
 			 $decoded_metar['temp_min_max']['min24h_f']);
- } elseif (ereg('^P([0-9]{4})', $part, $regs)) {
+ } elseif (preg_match('/^P([0-9]{4})/', $part, $regs)) {
 
 /*
 * Precipitation during last hour in hundredths of an inch
@@ -580,7 +580,7 @@
 $decoded_metar['precipitation']['mm'] =
 number_format($regs[1]*0.254, 2);
 	}
- } elseif (ereg('^6([0-9]{4})', $part, $regs)) {
+ } elseif (preg_match('/^6([0-9]{4})/', $part, $regs)) {
 
 /*
 * Precipitation during last 3 or 6 hours in hundredths of an
@@ -595,7 +595,7 @@
 $decoded_metar['precipitation']['mm_6h'] =
 number_format($regs[1]*0.254, 2);
 	}
- } elseif (ereg('^7([0-9]{4})', $part, $regs)) {
+ } elseif (preg_match('/^7([0-9]{4})/', $part, $regs)) {
 
 /*
 * Precipitation during last 24 hours in hundredths of an inch.
@@ -609,7 +609,7 @@
 $decoded_metar['precipitation']['mm_24h'] =
 number_format($regs[1]*0.254, 2, '.', '');
 	}
- } elseif (ereg('^4/([0-9]{3})', $part, $regs)) {
+ } elseif (preg_match('/^4/([0-9]{3})/', $part, $regs)) {
 
 /*
 * Snow depth in inches
@@ -924,7 +924,7 @@
 	for($i=$first_i;$i<$num_parts;$i++) {
 	 $part = $parts[$i];
 
-	 if (ereg('^([0-9]{3}|VRB)([0-9]{2,3})G?([0-9]{2,3})?(KT)', $part, $regs)) {
+	 if (preg_match('/^([0-9]{3}|VRB)([0-9]{2,3})G?([0-9]{2,3})?(KT)/', $part, $regs)) {
 	 /* Wind Group */
 
 	 $decoded_period['desc']['wind']['deg'] = $regs[1];
@@ -945,14 +945,14 @@
 				 $decoded_period['desc']['wind']['gust_meters_per_second'],
 				 $decoded_period['desc']['wind']['gust_miles_per_hour']);
 	 }
-	 } elseif (ereg('^([0-9]{3})V([0-9]{3})$', $part, $regs) &&
+	 } elseif (preg_match('/^([0-9]{3})V([0-9]{3})$/', $part, $regs) &&
 		 !empty($decoded_period['desc']['wind']['deg'])) {
 	 /*
 	 * Variable wind-direction
 	 */
 	 $decoded_period['desc']['wind']['var_beg'] = $regs[1];
 	 $decoded_period['desc']['wind']['var_end'] = $regs[2];
-	 } elseif (ereg('^([0-9]{4})([NS]?[EW]?)$', $part, $regs)) {
+	 } elseif (preg_match('/^([0-9]{4})([NS]?[EW]?)$/', $part, $regs)) {
 	 /*
 	 * Visibility in meters (4 digits only)
 	 */
@@ -986,7 +986,7 @@
 	 }
 	 $decoded_period['desc']['visibility'][] = $group;
 
-	 } elseif (ereg('^[0-9]$', $part)) {
+	 } elseif (preg_match('/^[0-9]$/', $part)) {
 	 /*
 	 * Temp Visibility Group, single digit followed by space.
 	 */
@@ -1002,7 +1002,7 @@
 	 $group['meter'] = round($vis_miles * 1609.3);
 	 $decoded_period['desc']['visibility'][] = $group;
 
-	 } elseif (ereg('^[M]?(([0-9]?)[ ]?([0-9])(/?)([0-9]*))SM$',
+	 } elseif (preg_match('#^[M]?(([0-9]?)[ ]?([0-9])(/?)([0-9]*))SM$#',
 			 $temp_visibility_miles . ' ' . $part, $regs)) {
 	 /*
 	 * Visibility Group
@@ -1035,12 +1035,12 @@
 
 	 $decoded_period['desc']['visibility'][] = $group;
 
-	 } elseif (ereg('^(VC)?' . /* Proximity */
+	 } elseif (preg_match('/^(VC)?' . /* Proximity */
 			 '(-|\+)?' . /* Intensity */
-			 '(MI|PR|BC|DR|BL|SH|TS|FZ|NSW)?' . /* Descriptor */
+			 '(MI|PR|BC|DR|BL|SH|TS|FZ|NSW)?' . /* Descriptor */
 			 '((DZ|RA|SN|SG|IC|PL|GR|GS|UP)+)?' . /* Precipitation */
 			 '(BR|FG|FU|VA|DU|SA|HZ|PY)?' . /* Obscuration */
-			 '(PO|SQ|FC|SS)?$', /* Other */
+			 '(PO|SQ|FC|SS)?$/', /* Other */
 			 $part, $regs)) {
 	 /*
 	 * Current weather-group.
@@ -1057,8 +1057,8 @@
 	 /* Cloud-group */
 	 $decoded_period['desc']['clouds'][]['condition'] = $part;
 
-	 } elseif (ereg('^(VV|FEW|SCT|BKN|OVC)([0-9]{3}|///)' .
-			 '(CB|TCU)?$', $part, $regs)) {
+	 } elseif (preg_match('#^(VV|FEW|SCT|BKN|OVC)([0-9]{3}|///)' .
+			 '(CB|TCU)?$#', $part, $regs)) {
 	 /* We have found (another) a cloud-layer-group. */
 	 unset($group);
 
@@ -1081,7 +1081,7 @@
 	 }
 	 $decoded_period['desc']['clouds'][] = $group;
 
-	 } elseif (ereg('^WS([0-9]{3})/([0-9]{3})([0-9]{2})KT$', $part, $regs)) {
+	 } elseif (preg_match('#^WS([0-9]{3})/([0-9]{3})([0-9]{2})KT$#', $part, $regs)) {
 	 /* We have found a Wind Shear group. example WS011/27050KT */
 	 unset($ws);
 	 if ($regs[1] == '000') {
Modified: trunk/lib/phpweather-2.2.2/pw_utilities.php
===================================================================
--- trunk/lib/phpweather-2.2.2/pw_utilities.php	2016年02月11日 09:33:23 UTC (rev 9797)
+++ trunk/lib/phpweather-2.2.2/pw_utilities.php	2016年02月11日 10:04:41 UTC (rev 9798)
@@ -91,7 +91,7 @@
 
 $dir = opendir(dirname(__FILE__) . '/output');
 while($file = readdir($dir)) {
- if (ereg("^pw_${type}_([a-z][a-z])(_[A-Z][A-Z])?\.php$", $file, $regs)) {
+ if (preg_match("/^pw_${type}_([a-z][a-z])(_[A-Z][A-Z])?\.php$/", $file, $regs)) {
 $output[$regs[1] . $regs[2]] = $languages[$regs[1] . $regs[2]];
 }
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9797
 http://sourceforge.net/p/phpwiki/code/9797
Author: vargenau
Date: 2016年02月11日 09:33:23 +0000 (2016年2月11日)
Log Message:
-----------
Set charset to UTF-8
Modified Paths:
--------------
 trunk/lib/phpweather-2.2.2/index.php
 trunk/lib/phpweather-2.2.2/output/pw_text.php
 trunk/lib/phpweather-2.2.2/output/pw_text_cs.php
 trunk/lib/phpweather-2.2.2/output/pw_text_da.php
 trunk/lib/phpweather-2.2.2/output/pw_text_de.php
 trunk/lib/phpweather-2.2.2/output/pw_text_en_US.php
 trunk/lib/phpweather-2.2.2/output/pw_text_es.php
 trunk/lib/phpweather-2.2.2/output/pw_text_fi.php
 trunk/lib/phpweather-2.2.2/output/pw_text_fr.php
 trunk/lib/phpweather-2.2.2/output/pw_text_hu.php
 trunk/lib/phpweather-2.2.2/output/pw_text_it.php
 trunk/lib/phpweather-2.2.2/output/pw_text_nl.php
 trunk/lib/phpweather-2.2.2/output/pw_text_no.php
 trunk/lib/phpweather-2.2.2/output/pw_text_pl.php
 trunk/lib/phpweather-2.2.2/output/pw_text_pt.php
 trunk/lib/phpweather-2.2.2/output/pw_text_sk.php
 trunk/lib/phpweather-2.2.2/output/pw_text_sv.php
 trunk/lib/phpweather-2.2.2/output/pw_text_tr.php
Modified: trunk/lib/phpweather-2.2.2/index.php
===================================================================
--- trunk/lib/phpweather-2.2.2/index.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/index.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -118,7 +118,7 @@
 }
 
 if (empty($text)) {
- header('Content-Type: text/html; charset=ISO-8859-1');
+ header('Content-Type: text/html; charset=UTF-8');
 } else {
 header('Content-Type: text/html; charset=' . $text->get_charset());
 }
Modified: trunk/lib/phpweather-2.2.2/output/pw_text.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -53,9 +53,7 @@
 *
 * header("Content-Type: text/html; charset=$charset");
 *
- * @return string The character encoding, e.g. ISO-8859-1 for
- * Western languages, ISO-8859-2 for Central European languages and
- * so on.
+ * @return string The character encoding, e.g. UTF-8
 */
 function get_charset() {
 return $this->strings['charset'];
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_cs.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_cs.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_cs.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -27,7 +27,7 @@
 */
 function pw_text_cs($weather, $input = array())
 {
- $this->strings['charset'] = 'ISO-8859-2';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Lituji, nejsou dostupné žádné informace pro %s%s%s.';
 $this->strings['list_sentences_and'] = ' a ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_da.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_da.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_da.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -17,7 +17,7 @@
 * @param array This is just passed on to pw_text().
 */
 function pw_text_da($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-1';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Desværre! Der er ingen data for %s%s%s.';
 $this->strings['list_sentences_and'] = ' og ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_de.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_de.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_de.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -19,7 +19,7 @@
 */
 function pw_text_de($weather, $input = array())
 {
- $this->strings['charset'] = 'ISO-8859-1';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Für %s%s%s stehen keine DATEN zur Verfügung.';
 $this->strings['list_sentences_and'] = ' und ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_en_US.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_en_US.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_en_US.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -18,7 +18,7 @@
 * @param array This is just passed on to pw_text().
 */
 function pw_text_en_US($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-1';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Sorry! There\'s no data available for %s%s%s.';
 $this->strings['list_sentences_and'] = ' and ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_es.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_es.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_es.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -18,7 +18,7 @@
 * @param array This is just passed on to pw_text().
 */
 function pw_text_es($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-1';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Datos no disponibles para %s%s%s.';
 $this->strings['list_sentences_and'] = ' y ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_fi.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_fi.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_fi.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -18,7 +18,7 @@
 * @param array This is just passed on to pw_text().
 */
 function pw_text_fi($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-1';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Valitan! Ei tietoja saatavilla %s%s%s sääasemalle.';
 $this->strings['list_sentences_and'] = ' ja ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_fr.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_fr.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_fr.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -20,7 +20,7 @@
 * @param array This is just passed on to pw_text().
 */
 function pw_text_fr($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-1';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Désolé! Pas d\'infos disponibles pour %s%s%s.';
 $this->strings['list_sentences_and'] = ' et ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_hu.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_hu.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_hu.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -21,7 +21,7 @@
 *		 Ezt a paramétert átadjuk pw_text() -nek.
 */
 function pw_text_hu($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-2';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Sajnos nincs adat %s%s%s számára.';
 $this->strings['list_sentences_and'] = ' és ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_it.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_it.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_it.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -18,7 +18,7 @@
 * @param array This is just passed on to pw_text().
 */
 function pw_text_it($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-1';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Spiacente! Nessun dato disponibile per %s%s%s.';
 $this->strings['list_sentences_and'] = ' e ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_nl.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_nl.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_nl.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -22,7 +22,7 @@
 * @param array This is just passed on to pw_text().
 */
 function pw_text_nl($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-1';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Sorry! Er is geen informatie beschikbaar voor %s%s%s.';
 $this->strings['list_sentences_and'] = ' en ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_no.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_no.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_no.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -17,7 +17,7 @@
 * @param array This is just passed on to pw_text().
 */
 function pw_text_no($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-1';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Beklager! Det var ingen ingen data tilgjengelig for %s%s%s.';
 $this->strings['list_sentences_and'] = ' og ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_pl.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_pl.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_pl.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -18,7 +18,7 @@
 * @param array This is just passed on to pw_text().
 */
 function pw_text_pl($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-2';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Przepraszamy! Nie ma danych dostępnych dla %s%s%s.';
 $this->strings['list_sentences_and'] = ' i ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_pt.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_pt.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_pt.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -18,7 +18,7 @@
 * @param array This is just passed on to pw_text().
 */
 function pw_text_pt($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-1';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Dado não disponiveis para %s%s%s.';
 $this->strings['list_sentences_and'] = ' e ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_sk.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_sk.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_sk.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -24,7 +24,7 @@
 */
 function pw_text_sk($weather, $input = array())
 {
- $this->strings['charset'] = 'ISO-8859-2';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Ľutujem, momentálne nie sú dostupné žiadne informácie pre %s%s%s.';
 $this->strings['list_sentences_and'] = ' a ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_sv.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_sv.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_sv.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -18,7 +18,7 @@
 * @param array This is just passed on to pw_text().
 */
 function pw_text_sv($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-1';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Beklagar! Det finns ingen data tillgänglig för %s%s%s.';
 $this->strings['list_sentences_and'] = ' och ';
 $this->strings['list_sentences_comma'] = ', ';
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_tr.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_tr.php	2016年02月11日 09:30:06 UTC (rev 9796)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_tr.php	2016年02月11日 09:33:23 UTC (rev 9797)
@@ -17,7 +17,7 @@
 * @param array This is just passed on to pw_text().
 */
 function pw_text_tr($weather, $input = array()) {
- $this->strings['charset'] = 'ISO-8859-9';
+ $this->strings['charset'] = 'UTF-8';
 $this->strings['no_data'] = 'Üzgünüz! %s%s%s için veri bulunmuyor.';
 $this->strings['list_sentences_and'] = ' ve ';
 $this->strings['list_sentences_comma'] = ', ';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9796
 http://sourceforge.net/p/phpwiki/code/9796
Author: vargenau
Date: 2016年02月11日 09:30:06 +0000 (2016年2月11日)
Log Message:
-----------
Convert from ISO-8859-9 to UTF-8
Modified Paths:
--------------
 trunk/lib/phpweather-2.2.2/output/pw_text_tr.php
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_tr.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_tr.php	2016年02月11日 09:26:31 UTC (rev 9795)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_tr.php	2016年02月11日 09:30:06 UTC (rev 9796)
@@ -22,9 +22,9 @@
 $this->strings['list_sentences_and'] = ' ve ';
 $this->strings['list_sentences_comma'] = ', ';
 $this->strings['list_sentences_final_and'] = ', ve ';
- $this->strings['location'] = '%s%s%s için hazýrlanan rapor.';
+ $this->strings['location'] = '%s%s%s için hazırlanan rapor.';
 $this->strings['minutes'] = ' dakika';
- $this->strings['time_format'] = 'Rapor %s önce saat %s%s%s UTC de hazýrlanmýþ.';
+ $this->strings['time_format'] = 'Rapor %s önce saat %s%s%s UTC de hazırlanmış.';
 $this->strings['time_minutes'] = 've %s%s%s dakika';
 $this->strings['time_one_hour'] = '%sone%s saat %s';
 $this->strings['time_several_hours'] = '%s%s%s saat %s';
@@ -37,31 +37,31 @@
 $this->strings['kilometers'] = ' kilometre';
 $this->strings['miles'] = ' mil';
 $this->strings['and'] = ' ve ';
- $this->strings['plus'] = ' artý ';
+ $this->strings['plus'] = ' artı ';
 $this->strings['with'] = ' ile ';
- $this->strings['wind_blowing'] = 'Rüzgarýn esme hýzý ';
- $this->strings['wind_with_gusts'] = ' deðerine kadar ulaþan gust ';
+ $this->strings['wind_blowing'] = 'Rüzgarın esme hızı ';
+ $this->strings['wind_with_gusts'] = ' değerine kadar ulaşan gust ';
 $this->strings['wind_from'] = ' , yönü ';
 $this->strings['wind_variable'] = ' %svariable% yönünde.';
- $this->strings['wind_varying'] = ', %s%s%s (%s%s°%s) ve %s%s%s (%s%s°%s) arasýnda deðiþken';
+ $this->strings['wind_varying'] = ', %s%s%s (%s%s°%s) ve %s%s%s (%s%s°%s) arasında değişken';
 $this->strings['wind_calm'] = 'Rüzgar %scalm%';
 $this->strings['wind_dir'] = array(
 'kuzey',
- 'kuzey/kuzeydoðu',
- 'kuzeydoðu',
- 'batý/kuzeydoðu',
- 'doðu',
- 'doðu/güneydoðu',
- 'güneydoðu',
- 'güney/güneydoðu',
+ 'kuzey/kuzeydoğu',
+ 'kuzeydoğu',
+ 'batı/kuzeydoğu',
+ 'doğu',
+ 'doğu/güneydoğu',
+ 'güneydoğu',
+ 'güney/güneydoğu',
 'güney',
- 'güney/güneybatý',
- 'güneybatý',
- 'batý/güneybatý',
- 'batý',
- 'batý/kuzeybatý',
- 'kuzeybatý',
- 'kuzey/kuzeybatý',
+ 'güney/güneybatı',
+ 'güneybatı',
+ 'batı/güneybatı',
+ 'batı',
+ 'batı/kuzeybatı',
+ 'kuzeybatı',
+ 'kuzey/kuzeybatı',
 'kuzey');
 $this->strings['wind_dir_short'] = array(
 'K',
@@ -83,66 +83,66 @@
 'K');
 $this->strings['wind_dir_short_long'] = array(
 'K' => 'kuzey',
- 'KD' => 'kuzeydoðu',
- 'D' => 'doðu',
- 'GDE' => 'güneydoðu',
+ 'KD' => 'kuzeydoğu',
+ 'D' => 'doğu',
+ 'GDE' => 'güneydoğu',
 'G' => 'güney',
- 'GB' => 'güneybatý',
- 'B' => 'batý',
- 'KB' => 'kuzeybatý'
+ 'GB' => 'güneybatı',
+ 'B' => 'batı',
+ 'KB' => 'kuzeybatı'
 );
- $this->strings['temperature'] = 'Sýcaklýk ';
+ $this->strings['temperature'] = 'Sıcaklık ';
 $this->strings['dew_point'] = ', mevcut dew-point ';
- $this->strings['altimeter'] = 'Atmosferýk basýnç ';
+ $this->strings['altimeter'] = 'Atmosferık basınç ';
 $this->strings['hPa'] = ' hPa';
 $this->strings['inHg'] = ' inHg';
 $this->strings['rel_humidity'] = 'Relativ humidity ';
- $this->strings['feelslike'] = 'Hissedilen sýcaklýk ';
+ $this->strings['feelslike'] = 'Hissedilen sıcaklık ';
 $this->strings['cloud_group_beg'] = 'Bulunan ';
 $this->strings['cloud_group_end'] = '.';
 $this->strings['cloud_clear'] = 'Gökyüzü %sclear%s.';
- $this->strings['cloud_height'] = ' bulutlarýn yüksekliði ';
- $this->strings['cloud_overcast'] = 'Gökyüzü %sovercast% olduðu yükselik ';
- $this->strings['cloud_vertical_visibility'] = 'görüþ mesafesi %svertical visibility% ';
+ $this->strings['cloud_height'] = ' bulutların yüksekliği ';
+ $this->strings['cloud_overcast'] = 'Gökyüzü %sovercast% olduğu yükselik ';
+ $this->strings['cloud_vertical_visibility'] = 'görüş mesafesi %svertical visibility% ';
 $this->strings['cloud_condition'] =
 array(
-	 'SKC' => 'açýk',
-	 'CLR' => 'açýk',
+	 'SKC' => 'açık',
+	 'CLR' => 'açık',
 	 'FEW' => 'az',
 	 'SCT' => 'scattered',
 	 'BKN' => 'yer yer bulutlu',
 	 'OVC' => 'overcast');
 $this->strings['cumulonimbus'] = ' kumulonimbus';
 $this->strings['towering_cumulus'] = ' towering kumulus';
- $this->strings['cavok'] = ' %s altýnda bulut bulunmuyor ve kumulonimbus bulutlarý yok';
- $this->strings['currently'] = 'Þu anda ';
+ $this->strings['cavok'] = ' %s altında bulut bulunmuyor ve kumulonimbus bulutları yok';
+ $this->strings['currently'] = 'Şu anda ';
 $this->strings['weather'] =
 array(
 	 '-' => ' light',
 	 ' ' => ' moderate ',
 	 '+' => ' heavy ',
 	 'VC' => ' bölgede',
-	 'PR' => ' kýsmi',
+	 'PR' => ' kısmi',
 	 'BC' => ' patches of',
-	 'MI' => ' sýð',
-	 'DR' => ' düþük yoðunlukta',
+	 'MI' => ' sığ',
+	 'DR' => ' düşük yoğunlukta',
 	 'BL' => ' esen',
-	 'SH' => ' saðnak',
-	 'TS' => ' fýrtýna',
+	 'SH' => ' sağnak',
+	 'TS' => ' fırtına',
 	 'FZ' => ' dondurucu',
 	 'DZ' => ' çiseleyen',
-	 'RA' => ' yaðmur',
+	 'RA' => ' yağmur',
 	 'SN' => ' kar',
-	 'SG' => ' parça karlý',
+	 'SG' => ' parça karlı',
 	 'IC' => ' buz kristalleri',
-	 'PL' => ' buz parçalý',
+	 'PL' => ' buz parçalı',
 	 'GR' => ' dolu',
 	 'GS' => ' az dolulu',
 	 'UP' => ' bilinmeyen',
 	 'BR' => ' sis',
 	 'FG' => ' sisli',
-	 'FU' => ' parçalý sisli',
-	 'VA' => ' volkanik dumanlý',
+	 'FU' => ' parçalı sisli',
+	 'VA' => ' volkanik dumanlı',
 	 'DU' => ' widespread dust',
 	 'SA' => ' kum',
 	 'HZ' => ' puslu',
@@ -150,19 +150,19 @@
 	 'PO' => ' well-developed dust/sand whirls',
 	 'SQ' => ' bora',
 	 'FC' => ' (funnel cloud tornado waterspout)',
-	 'SS' => ' kur/kil fýrtýnasý');
- $this->strings['visibility'] = 'Görüþ mesafesi ';
- $this->strings['visibility_greater_than'] = 'deðerinden büyük ';
- $this->strings['visibility_less_than'] = 'deðerinden düþük ';
+	 'SS' => ' kur/kil fırtınası');
+ $this->strings['visibility'] = 'Görüş mesafesi ';
+ $this->strings['visibility_greater_than'] = 'değerinden büyük ';
+ $this->strings['visibility_less_than'] = 'değerinden düşük ';
 $this->strings['visibility_to'] = ' ';
 $this->strings['runway_upward_tendency'] = ' with an %supward%s tendency';
 $this->strings['runway_downward_tendency'] = ' with a %sdownward%s tendency';
 $this->strings['runway_no_tendency'] = ' with %sno distinct%s tendency';
- $this->strings['runway_between'] = 'arasýnda ';
+ $this->strings['runway_between'] = 'arasında ';
 $this->strings['runway_left'] = ' sol';
 $this->strings['runway_central'] = ' merkez';
- $this->strings['runway_right'] = ' sað';
- $this->strings['runway_visibility'] = 'Görüþ ';
+ $this->strings['runway_right'] = ' sağ';
+ $this->strings['runway_visibility'] = 'Görüş ';
 $this->strings['runway_for_runway'] = ' uçak pisti için ';
 
 /* We run the parent constructor */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9795
 http://sourceforge.net/p/phpwiki/code/9795
Author: vargenau
Date: 2016年02月11日 09:26:31 +0000 (2016年2月11日)
Log Message:
-----------
Remove space at end of line
Modified Paths:
--------------
 trunk/lib/phpweather-2.2.2/output/pw_text_hu.php
 trunk/lib/phpweather-2.2.2/output/pw_text_pl.php
 trunk/lib/phpweather-2.2.2/output/pw_text_sk.php
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_hu.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_hu.php	2016年02月11日 09:25:10 UTC (rev 9794)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_hu.php	2016年02月11日 09:26:31 UTC (rev 9795)
@@ -3,12 +3,12 @@
 require_once(PHPWEATHER_BASE_DIR . '/output/pw_text.php');
 
 /**
- * Provides all the strings needed by pw_text to produce 
+ * Provides all the strings needed by pw_text to produce
 * Hungarian output.
 * A magyar szövegű időjárásjelentéshez a pw_text innen
 * veszi a sztringeket.
 *
- * @author Mihály Gyulai 
+ * @author Mihály Gyulai
 * @link http://gyulai.freeyellow.com/ The homepage of the author.
 * @version pw_text_hu.php,v 1.14 2003年09月16日 22:57:11 gimpster Exp
 */
@@ -113,7 +113,7 @@
 $this->strings['cloud_height'] = 'felhő ';
 $this->strings['cloud_overcast'] = 'az égbolt %sborult%s ';
 $this->strings['cloud_vertical_visibility'] = 'a %sfüggőleges láthatóság%s ';
- 
+
 $this->strings['cloud_condition'] = array(
 	 'SKC' => ' derült',
 	 'CLR' => ' tiszta',
@@ -121,12 +121,12 @@
 	 'SCT' => ' szórványos ',
 	 'BKN' => ' szakadozott ',
 	 'OVC' => ' borult');
- 
+
 $this->strings['cumulonimbus'] = ' gomoly';
 $this->strings['towering_cumulus'] = ' vihar';
 $this->strings['cavok'] = ' nincsenek felhők %s magasságban, és nincs gomolyfelhő';
 $this->strings['currently'] = 'Jellemző: ';
- 
+
 $this->strings['weather'] = array(
 '-' => ' könnyű ',
 ' ' => ' enyhe ',
@@ -177,9 +177,9 @@
 $this->strings['runway_for_runway'] = ' a kifutópályán ';
 
 /* We run the parent constructor */
- 
+
 $this->pw_text($weather, $input);
- 
+
 }
 }
 
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_pl.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_pl.php	2016年02月11日 09:25:10 UTC (rev 9794)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_pl.php	2016年02月11日 09:26:31 UTC (rev 9795)
@@ -117,7 +117,7 @@
 $this->strings['towering_cumulus'] = ' cumulus wypiętrzony';
 $this->strings['cavok'] = ' brak chmur poniżej %s, brak cumulonimbusów oraz brak zjawisk atmosferycznych';
 $this->strings['currently'] = 'Aktualnie ';
- $this->strings['weather'] = 
+ $this->strings['weather'] =
 array(
 	 '-' => ' lekkie',
 	 ' ' => ' średnie ',
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_sk.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_sk.php	2016年02月11日 09:25:10 UTC (rev 9794)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_sk.php	2016年02月11日 09:26:31 UTC (rev 9795)
@@ -121,7 +121,7 @@
 $this->strings['towering_cumulus'] = ' týčiace sa nahromadené';
 $this->strings['cavok'] = ' žiadne oblaky pod %s a ani žiadne iné nahromadené oblaky';
 $this->strings['currently'] = 'Aktuálnym počasím bolo ';
- $this->strings['weather'] = 
+ $this->strings['weather'] =
 array(/* Intensity */
 '-' => ' riedky ',
 ' ' => ' stredný ',
@@ -184,7 +184,7 @@
 function print_pretty_wind($wind)
 {
 extract($wind);
- 
+
 if (! empty($meters_per_second)) {
 switch ($meters_per_second) {
 case 1:
@@ -213,7 +213,7 @@
 break;
 }
 }
- 
+
 /*
 * Z/ZO grammar handling
 * zo severu, z juhu, zo zapadu, z vychodu
@@ -228,7 +228,7 @@
 }
 }
 }
- 
+
 if (isset($var_beg)) {
 $idx = intval(round($var_beg / 22.5));
 if ($idx <= 2 || $idx >= 11) {
@@ -236,7 +236,7 @@
 str_replace(' z ', ' zo ', $this->strings['wind_varying']);
 }
 }
- 
+
 return parent::print_pretty_wind($wind);
 }
 
@@ -261,17 +261,17 @@
 function parse_cloud_group($cloud_group)
 {
 extract($cloud_group);
- 
+
 if (isset($condition)) {
 		 if ($condition == 'CAVOK') {
 			 $this->strings['cloud_group_beg'] =
 				 str_replace(' boli ', ' neboli ', $this->strings['cloud_group_beg']);
 		 }
 }
- 
+
 return parent::parse_cloud_group($cloud_group);
 }
- 
+
 function parse_runway_group($runway_group)
 {
 if (empty($runway_group) || !is_array($runway_group)) {
@@ -285,7 +285,7 @@
 $this->strings['meters'] = $old_meters;
 return $ret;
 }
- 
+
 function print_pretty_time($time)
 {
 $minutes_old = round((time() - $time)/60);
@@ -302,10 +302,10 @@
 str_replace(' pred ', ' ', $this->strings['time_format']);
 }
 }
- 
+
 return parent::print_pretty_time($time);
 }
- 
+
 function print_pretty_weather($weather)
 {
 	 $ret_str = '';
@@ -336,7 +336,7 @@
 		 } elseif ($weather[$k]['precipitation'] == 'RA' // dážď
 				 || $weather[$k]['obscuration'] == 'HZ'
 				 || $weather[$k]['obscuration'] == 'BR' // hmlový opar
-				 ) { 
+				 ) {
 			 $k == 0 && $this->strings['currently'] =
 				 str_replace(' bolo ', ' bol ', $this->strings['currently']);
 		 } elseif ($weather[$k]['obscuration'] == 'FG') { // ... hmlisto
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9794
 http://sourceforge.net/p/phpwiki/code/9794
Author: vargenau
Date: 2016年02月11日 09:25:10 +0000 (2016年2月11日)
Log Message:
-----------
Convert from ISO-8859-2 to UTF-8
Modified Paths:
--------------
 trunk/lib/phpweather-2.2.2/output/pw_text_cs.php
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_cs.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_cs.php	2016年02月11日 09:22:49 UTC (rev 9793)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_cs.php	2016年02月11日 09:25:10 UTC (rev 9794)
@@ -6,7 +6,7 @@
 * Provides all the strings needed by pw_text to produce Czech
 * output.
 *
- * @author Václav Øíkal <va...@ph...>
+ * @author Václav Říkal <va...@ph...>
 * @author Ondrej Jombík <ne...@pl...>
 * @author Radoslava Fedáková <mor...@po...>
 * @link http://vac.ath.cx/
@@ -28,33 +28,33 @@
 function pw_text_cs($weather, $input = array())
 {
 $this->strings['charset'] = 'ISO-8859-2';
- $this->strings['no_data'] = 'Lituji, nejsou dostupné 3⁄4ádné informace pro %s%s%s.';
+ $this->strings['no_data'] = 'Lituji, nejsou dostupné žádné informace pro %s%s%s.';
 $this->strings['list_sentences_and'] = ' a ';
 $this->strings['list_sentences_comma'] = ', ';
 $this->strings['list_sentences_final_and'] = ' a ';
- $this->strings['location'] = 'Toto je meterologická zpráva leti1tì %s%s%s.';
+ $this->strings['location'] = 'Toto je meterologická zpráva letiště %s%s%s.';
 $this->strings['minutes'] = ' minutami';
- $this->strings['time_format'] = 'Zpráva byla sestavena pøed %s, v %s%s%s UTC.';
+ $this->strings['time_format'] = 'Zpráva byla sestavena před %s, v %s%s%s UTC.';
 $this->strings['time_minutes'] = 'a %s%s%s minutami';
 $this->strings['time_one_hour'] = '%sjednou%s hodinou %s';
 $this->strings['time_several_hours'] = '%s%s%s hodinami %s';
- $this->strings['time_a_moment'] = 'právì teï';
- $this->strings['meters_per_second'] = ' metrù za sekundu';
+ $this->strings['time_a_moment'] = 'právě teď';
+ $this->strings['meters_per_second'] = ' metrů za sekundu';
 $this->strings['miles_per_hour'] = ' mil za hodinu';
- $this->strings['meter'] = ' metrù';
+ $this->strings['meter'] = ' metrů';
 $this->strings['meters'] = ' metry';
 $this->strings['feet'] = ' stop';
- $this->strings['kilometers'] = ' kilometrù';
+ $this->strings['kilometers'] = ' kilometrů';
 $this->strings['miles'] = ' mil';
 $this->strings['and'] = ' a ';
 $this->strings['plus'] = ' plus ';
 $this->strings['with'] = ' s ';
- $this->strings['wind_blowing'] = 'Rychlost vìtru byla ';
+ $this->strings['wind_blowing'] = 'Rychlost větru byla ';
 $this->strings['wind_with_gusts'] = ' se silnými nárazy od ';
 $this->strings['wind_from'] = ' z ';
- $this->strings['wind_variable'] = ' z %srùzných%s smìrù';
- $this->strings['wind_varying'] = ', promìnlivý vítr od %s%s%s (%s%s&deg;%s) a %s%s%s (%s%s&deg;%s)';
- $this->strings['wind_calm'] = 'Bylo %sbezvìtøí%s';
+ $this->strings['wind_variable'] = ' z %srůzných%s směrů';
+ $this->strings['wind_varying'] = ', proměnlivý vítr od %s%s%s (%s%s&deg;%s) a %s%s%s (%s%s&deg;%s)';
+ $this->strings['wind_calm'] = 'Bylo %sbezvětří%s';
 $this->strings['wind_dir'] =
 array('severu',
 'severu/severovýchodu',
@@ -110,63 +110,63 @@
 $this->strings['cloud_group_beg'] = 'Bylo ';
 $this->strings['cloud_group_end'] = '.';
 $this->strings['cloud_clear'] = 'Obloha byla %sjasná%s.';
- $this->strings['cloud_height'] = ' se základnou mrakù ve vý1ce ';
- $this->strings['cloud_overcast'] = ' obloha byla %szata3⁄4ená%s od vý1ky ';
+ $this->strings['cloud_height'] = ' se základnou mraků ve výšce ';
+ $this->strings['cloud_overcast'] = ' obloha byla %szatažená%s od výšky ';
 $this->strings['cloud_vertical_visibility'] = '%svertikální viditelnost%s byla ';
 $this->strings['cloud_condition'] =
 array('SKC' => 'jasno',
 'CLR' => 'jasno',
- 'FEW' => 'skorojasno', /*'niekoμko',*/
+ 'FEW' => 'skorojasno', /*'niekoľko',*/
 'SCT' => 'polojasno',
- 'BKN' => 'oblaèno',
- 'OVC' => 'zata3⁄4eno');
+ 'BKN' => 'oblačno',
+ 'OVC' => 'zataženo');
 $this->strings['cumulonimbus'] = ' cumulonimbus';
- $this->strings['towering_cumulus'] = ' kupovitá oblaènost'; /*tyèíci se nahromadìné - to je pøece blbost*/
- $this->strings['cavok'] = ' 3⁄4ádná oblaènost pod %s ani 3⁄4ádná kupovitá oblaènost';
- $this->strings['currently'] = 'Aktuální poèasí: ';
+ $this->strings['towering_cumulus'] = ' kupovitá oblačnost'; /*tyčíci se nahromaděné - to je přece blbost*/
+ $this->strings['cavok'] = ' žádná oblačnost pod %s ani žádná kupovitá oblačnost';
+ $this->strings['currently'] = 'Aktuální počasí: ';
 $this->strings['weather'] =
 array(/* Intensity */
 '-' => ' slabý ',
- ' ' => ' støední ',
+ ' ' => ' střední ',
 '+' => ' silný ',
 /* Proximity */
 'VC' => ' v blízkosti',
 /* Descriptor */
- 'PR' => ' pøevá3⁄4nì pokrývající leti1tì',
+ 'PR' => ' převážně pokrývající letiště',
 'BC' => ' pásy',
- 'MI' => ' pøízemní',
- 'DR' => ' nízko zvíøený',
- 'BL' => ' zvíøený',
- 'SH' => ' pøehánky',
- 'TS' => ' bouøka',
+ 'MI' => ' přízemní',
+ 'DR' => ' nízko zvířený',
+ 'BL' => ' zvířený',
+ 'SH' => ' přehánky',
+ 'TS' => ' bouřka',
 'FZ' => ' námrzající',
 /* Precipitation */
 'DZ' => ' mrholení',
- 'RA' => ' dé1»', /* ' da3⁄4divo', */
+ 'RA' => ' déšť', /* ' daždivo', */
 'SN' => ' sníh',
 'SG' => ' zrnitý sníh',
 'IC' => ' ledové krystalky',
- 'PL' => ' zmrzlý dé1»',
+ 'PL' => ' zmrzlý déšť',
 'GR' => ' kroupy',
 'GS' => ' slabé krupobití',
 'UP' => ' neznámé',
 /* Obscuration */
- 'BR' => ' kouømo',
+ 'BR' => ' kouřmo',
 'FG' => ' mlha',
- 'FU' => ' kouø',
+ 'FU' => ' kouř',
 'VA' => ' vulkanický popel',
- 'DU' => ' pra1no',
- 'SA' => ' písek', /* píseèné */
+ 'DU' => ' prašno',
+ 'SA' => ' písek', /* písečné */
 'HZ' => ' zákal',
 'PY' => ' mrholení s malými kapkami',
 /* Other */
- 'PO' => ' píseèné víry',
+ 'PO' => ' písečné víry',
 'SQ' => ' húlava',
- 'FC' => ' prùtr3⁄4 mraèen',
- 'SS' => ' pra1ná/píseèná bouøe');
+ 'FC' => ' průtrž mračen',
+ 'SS' => ' prašná/písečná bouře');
 $this->strings['visibility'] = 'Celková viditenost byla ';
- $this->strings['visibility_greater_than'] = 'vìt1í ne3⁄4 ';
- $this->strings['visibility_less_than'] = 'men1í ne3⁄4 ';
+ $this->strings['visibility_greater_than'] = 'větší než ';
+ $this->strings['visibility_less_than'] = 'menší než ';
 $this->strings['visibility_to'] = ' do ';
 /* this is left untranslated, because I have no metar, that use
 * this text -- Nepto [14/07/2002] */
@@ -177,7 +177,7 @@
 $this->strings['runway_left'] = ' left';
 $this->strings['runway_central'] = ' central';
 $this->strings['runway_right'] = ' right';
- $this->strings['runway_visibility'] = 'Viditeμnos» bola ';
+ $this->strings['runway_visibility'] = 'Viditeľnosť bola ';
 $this->strings['runway_for_runway'] = ' for runway ';
 
 /* We run the parent constructor */
@@ -196,7 +196,7 @@
 case 2:
 case 3:
 case 4:
- $this->strings['meters_per_second'] = ' metrù za sekundu';
+ $this->strings['meters_per_second'] = ' metrů za sekundu';
 break;
 default:
 if ($meters_per_second - floor($meters_per_second) > 0)
@@ -265,10 +265,10 @@
 }
 } else {
 if ($minutes_old < 5) {
- /* we must remove word 'pøed', because we wanted string:
+ /* we must remove word 'před', because we wanted string:
 * 'Report bol zostavený prave teraz, ...' */
 $this->strings['time_format'] =
- str_replace(' pøed ', ' ', $this->strings['time_format']);
+ str_replace(' před ', ' ', $this->strings['time_format']);
 }
 }
 
@@ -282,9 +282,9 @@
 $this->strings['currently']);
 if ($weather[0]['precipitation'] == 'RA') {
 $this->strings['weather']['-'] = ' slabého ';
- $this->strings['weather'][' '] = ' støedního ';
+ $this->strings['weather'][' '] = ' středního ';
 $this->strings['weather']['+'] = ' hustého ';
- $this->strings['weather']['RA'] = ' de1tì';
+ $this->strings['weather']['RA'] = ' deště';
 }
 } elseif ($weather[0]['precipitation'] == 'RA'
 || $weather[0]['obscuration'] == 'HZ') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9793
 http://sourceforge.net/p/phpwiki/code/9793
Author: vargenau
Date: 2016年02月11日 09:22:49 +0000 (2016年2月11日)
Log Message:
-----------
Convert from ISO-8859-2 to UTF-8
Modified Paths:
--------------
 trunk/lib/phpweather-2.2.2/output/pw_text_hu.php
 trunk/lib/phpweather-2.2.2/output/pw_text_pl.php
 trunk/lib/phpweather-2.2.2/output/pw_text_sk.php
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_hu.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_hu.php	2016年02月11日 09:14:13 UTC (rev 9792)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_hu.php	2016年02月11日 09:22:49 UTC (rev 9793)
@@ -3,12 +3,12 @@
 require_once(PHPWEATHER_BASE_DIR . '/output/pw_text.php');
 
 /**
- * Provides all the strings needed by pw_text to produce
+ * Provides all the strings needed by pw_text to produce 
 * Hungarian output.
- * A magyar szövegû idõjárásjelentéshez a pw_text innen
+ * A magyar szövegű időjárásjelentéshez a pw_text innen
 * veszi a sztringeket.
 *
- * @author Mihály Gyulai
+ * @author Mihály Gyulai 
 * @link http://gyulai.freeyellow.com/ The homepage of the author.
 * @version pw_text_hu.php,v 1.14 2003年09月16日 22:57:11 gimpster Exp
 */
@@ -26,9 +26,9 @@
 $this->strings['list_sentences_and'] = ' és ';
 $this->strings['list_sentences_comma'] = ', ';
 $this->strings['list_sentences_final_and'] = ', és ';
- $this->strings['location'] = 'Idõjárásjelentés %s%s%s számára.';
+ $this->strings['location'] = 'Időjárásjelentés %s%s%s számára.';
 $this->strings['minutes'] = ' ';
- $this->strings['time_format'] = 'A jelentés %s perccel ezelõtt készült, %s%s%s UTC-kor.';
+ $this->strings['time_format'] = 'A jelentés %s perccel ezelőtt készült, %s%s%s UTC-kor.';
 $this->strings['time_minutes'] = 'és %s%s%s ';
 $this->strings['time_one_hour'] = '%segy%s órával %s';
 $this->strings['time_several_hours'] = '%s%s%s órával %s';
@@ -46,7 +46,7 @@
 $this->strings['wind_blowing'] = 'Szélsebesség: ';
 $this->strings['wind_with_gusts'] = ' széllökések: ';
 $this->strings['wind_from'] = ' iránya: ';
- $this->strings['wind_variable'] = ' %skülönbözõ%s irányokból.';
+ $this->strings['wind_variable'] = ' %skülönböző%s irányokból.';
 $this->strings['wind_varying'] = ', változik %s%s%s (%s%s°%s) és %s%s%s (%s%s°%s) között';
 $this->strings['wind_calm'] = 'Szél %snem fújt%s';
 
@@ -100,20 +100,20 @@
 'ÉNY' => 'északnyugati'
 );
 
- $this->strings['temperature'] = 'A hõmérséklet ';
+ $this->strings['temperature'] = 'A hőmérséklet ';
 $this->strings['dew_point'] = ', a harmatpont ';
 $this->strings['altimeter'] = 'A légköri nyomás ';
 $this->strings['hPa'] = ' hPa';
 $this->strings['inHg'] = ' inHg';
 $this->strings['rel_humidity'] = 'A relatív páratartalom ';
- $this->strings['feelslike'] = 'A hõérzet ';
+ $this->strings['feelslike'] = 'A hőérzet ';
 $this->strings['cloud_group_beg'] = 'Az égbolton';
 $this->strings['cloud_group_end'] = ' magasságban.';
- $this->strings['cloud_clear'] = 'Az égbolt %sfelhõtlen%s volt.';
- $this->strings['cloud_height'] = 'felhõ ';
+ $this->strings['cloud_clear'] = 'Az égbolt %sfelhőtlen%s volt.';
+ $this->strings['cloud_height'] = 'felhő ';
 $this->strings['cloud_overcast'] = 'az égbolt %sborult%s ';
- $this->strings['cloud_vertical_visibility'] = 'a %sfüggõleges láthatóság%s ';
-
+ $this->strings['cloud_vertical_visibility'] = 'a %sfüggőleges láthatóság%s ';
+ 
 $this->strings['cloud_condition'] = array(
 	 'SKC' => ' derült',
 	 'CLR' => ' tiszta',
@@ -121,16 +121,16 @@
 	 'SCT' => ' szórványos ',
 	 'BKN' => ' szakadozott ',
 	 'OVC' => ' borult');
-
+ 
 $this->strings['cumulonimbus'] = ' gomoly';
 $this->strings['towering_cumulus'] = ' vihar';
- $this->strings['cavok'] = ' nincsenek felhõk %s magasságban, és nincs gomolyfelhõ';
- $this->strings['currently'] = 'Jellemzõ: ';
-
+ $this->strings['cavok'] = ' nincsenek felhők %s magasságban, és nincs gomolyfelhő';
+ $this->strings['currently'] = 'Jellemző: ';
+ 
 $this->strings['weather'] = array(
- '-' => ' könnyû ',
+ '-' => ' könnyű ',
 ' ' => ' enyhe ',
- '+' => ' erõs ',
+ '+' => ' erős ',
 'VC' => ' a közelben',
 'PR' => ' részleges',
 'BC' => ' szakadozott',
@@ -140,17 +140,17 @@
 'SH' => 'zápor',
 'TS' => 'zivatar',
 'FZ' => 'fagy',
- 'DZ' => 'szitáló esõ',
- 'RA' => 'esõ',
+ 'DZ' => 'szitáló eső',
+ 'RA' => 'eső',
 'SN' => 'hó',
 'SG' => 'szemcsés hó',
 'IC' => 'jégkristály',
 'PE' => 'jégdara',
- 'GR' => 'jégesõ',
- 'GS' => 'apró jégesõ és/vagy hódara',
+ 'GR' => 'jégeső',
+ 'GS' => 'apró jégeső és/vagy hódara',
 'UP' => 'ismeretlen',
 'BR' => 'köd',
- 'FG' => 'sûrû köd',
+ 'FG' => 'sűrű köd',
 'FU' => 'füst',
 'VA' => 'vulkáni hamu',
 'DU' => 'kiterjedt por',
@@ -159,27 +159,27 @@
 'PY' => 'permet',
 'PO' => 'por/homok örvény',
 'SQ' => 'szélroham',
- 'FC' => 'felhõtölcsér/tornádó/vízoszlop',
+ 'FC' => 'felhőtölcsér/tornádó/vízoszlop',
 'SS' => 'homokvihar/porvihar'
 );
 
 $this->strings['visibility'] = 'A láthatóság általában ';
 $this->strings['visibility_greater_than'] = 'nagyobb, mint ';
 $this->strings['visibility_less_than'] = 'kisebb, mint ';
- $this->strings['runway_upward_tendency'] = ' %snövekvõ%s tendenciával';
- $this->strings['runway_downward_tendency'] = ' %scsökkenõ%s tendenciával';
+ $this->strings['runway_upward_tendency'] = ' %snövekvő%s tendenciával';
+ $this->strings['runway_downward_tendency'] = ' %scsökkenő%s tendenciával';
 $this->strings['runway_no_tendency'] = ' határozott %stendencia nélkül%s';
 $this->strings['runway_between'] = 'közötti? ';
 $this->strings['runway_left'] = ' bal';
- $this->strings['runway_central'] = ' középsõ';
+ $this->strings['runway_central'] = ' középső';
 $this->strings['runway_right'] = ' jobb';
 $this->strings['runway_visibility'] = 'A láthatóság ';
 $this->strings['runway_for_runway'] = ' a kifutópályán ';
 
 /* We run the parent constructor */
-
+ 
 $this->pw_text($weather, $input);
-
+ 
 }
 }
 
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_pl.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_pl.php	2016年02月11日 09:14:13 UTC (rev 9792)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_pl.php	2016年02月11日 09:22:49 UTC (rev 9793)
@@ -19,19 +19,19 @@
 */
 function pw_text_pl($weather, $input = array()) {
 $this->strings['charset'] = 'ISO-8859-2';
- $this->strings['no_data'] = 'Przepraszamy! Nie ma danych dostêpnych dla %s%s%s.';
+ $this->strings['no_data'] = 'Przepraszamy! Nie ma danych dostępnych dla %s%s%s.';
 $this->strings['list_sentences_and'] = ' i ';
 $this->strings['list_sentences_comma'] = ', ';
 $this->strings['list_sentences_final_and'] = ', i ';
 $this->strings['location'] = 'To jest raport dla %s%s%s.';
 $this->strings['minutes'] = ' minut';
- $this->strings['time_format'] = 'Raport zosta3 utworzony %s temu, o godzinie %s%s%s UTC.';
+ $this->strings['time_format'] = 'Raport został utworzony %s temu, o godzinie %s%s%s UTC.';
 $this->strings['time_minutes'] = 'i %s%s%s minut';
- $this->strings['time_one_hour'] = '%sjedn±%s godzinê %s';
+ $this->strings['time_one_hour'] = '%sjedną%s godzinę %s';
 $this->strings['time_several_hours'] = '%s%s%s godzin %s';
- $this->strings['time_a_moment'] = 'chwilê';
- $this->strings['meters_per_second'] = ' metrów na sekundê';
- $this->strings['miles_per_hour'] = ' mil na godzinê';
+ $this->strings['time_a_moment'] = 'chwilę';
+ $this->strings['meters_per_second'] = ' metrów na sekundę';
+ $this->strings['miles_per_hour'] = ' mil na godzinę';
 $this->strings['meter'] = ' metrów';
 $this->strings['meters'] = ' metrów';
 $this->strings['feet'] = ' stóp';
@@ -40,30 +40,30 @@
 $this->strings['and'] = ' i ';
 $this->strings['plus'] = ' plus ';
 $this->strings['with'] = ' z ';
- $this->strings['wind_blowing'] = 'Wiatr wia3 z prêdko¶ci± ';
+ $this->strings['wind_blowing'] = 'Wiatr wiał z prędkością ';
 $this->strings['wind_with_gusts'] = ' w porywach do ';
 $this->strings['wind_from'] = ' z kierunku ';
 $this->strings['wind_variable'] = ' ze %szmiennego%s kierunku';
- $this->strings['wind_varying'] = ', wahaj±ce siê pomiêdzy %s%s%s (%s%s°%s) a %s%s%s (%s%s°%s)';
- $this->strings['wind_calm'] = 'Wiatr by3 %sspokojny%s';
+ $this->strings['wind_varying'] = ', wahające się pomiędzy %s%s%s (%s%s°%s) a %s%s%s (%s%s°%s)';
+ $this->strings['wind_calm'] = 'Wiatr był %sspokojny%s';
 $this->strings['wind_dir'] = array(
- 'pó3nocnego',
- 'pó3nocnego/pó3nocno-wschodniego',
- 'pó3nocno-wschodniego',
- 'wschodniego/po3nocno-wschodniego',
+ 'północnego',
+ 'północnego/północno-wschodniego',
+ 'północno-wschodniego',
+ 'wschodniego/połnocno-wschodniego',
 'wschodniego',
- 'wschodniego/po3udniowo-wschodniego',
- 'po3udnioweo-wschodniego',
- 'po3udniowego/po3udniowo-wschodniego',
- 'po3udniowego',
- 'po3udniowego/po3udniowo-zachodniego',
- 'po3udniowo-zachodniego',
- 'zachodniego/po3udniowo-zachodniego',
+ 'wschodniego/południowo-wschodniego',
+ 'południoweo-wschodniego',
+ 'południowego/południowo-wschodniego',
+ 'południowego',
+ 'południowego/południowo-zachodniego',
+ 'południowo-zachodniego',
+ 'zachodniego/południowo-zachodniego',
 'zachodniego',
- 'zachodniego/pó3nocno-zachodniego',
- 'pó3nocno-zachodniego',
- 'pó3nocnego/pó3nocno-zachodniego',
- 'pó3nocnego');
+ 'zachodniego/północno-zachodniego',
+ 'północno-zachodniego',
+ 'północnego/północno-zachodniego',
+ 'północnego');
 $this->strings['wind_dir_short'] = array(
 'N',
 'NNE',
@@ -92,19 +92,19 @@
 'W' => 'west',
 'NW' => 'northwest'
 );
- $this->strings['temperature'] = 'Temperatura wynosi3a ';
+ $this->strings['temperature'] = 'Temperatura wynosiła ';
 $this->strings['dew_point'] = ', punkt rosy ';
- $this->strings['altimeter'] = 'Ci¶nienie QHN wynosi3o ';
+ $this->strings['altimeter'] = 'Ciśnienie QHN wynosiło ';
 $this->strings['hPa'] = ' hPa';
 $this->strings['inHg'] = ' inHg';
- $this->strings['rel_humidity'] = 'Wilgotno¶æ wzglêdna wynosi3a ';
- $this->strings['feelslike'] = 'Temperatura by3a odczuwalna jako ';
- $this->strings['cloud_group_beg'] = 'By3o ';
+ $this->strings['rel_humidity'] = 'Wilgotność względna wynosiła ';
+ $this->strings['feelslike'] = 'Temperatura była odczuwalna jako ';
+ $this->strings['cloud_group_beg'] = 'Było ';
 $this->strings['cloud_group_end'] = '.';
- $this->strings['cloud_clear'] = 'Niebo by3o %sczyste%s.';
- $this->strings['cloud_height'] = ' na wysoko¶ci ';
- $this->strings['cloud_overcast'] = 'Ca3kowite %szachmurzenie%s o podstawie ';
- $this->strings['cloud_vertical_visibility'] = '%spionowa widzialno¶æ%s ';
+ $this->strings['cloud_clear'] = 'Niebo było %sczyste%s.';
+ $this->strings['cloud_height'] = ' na wysokości ';
+ $this->strings['cloud_overcast'] = 'Całkowite %szachmurzenie%s o podstawie ';
+ $this->strings['cloud_vertical_visibility'] = '%spionowa widzialność%s ';
 $this->strings['cloud_condition'] =
 array(
 	 'SKC' => 'niebo bezchmurne',
@@ -112,58 +112,58 @@
 	 'FEW' => 'zachmurzenie niewielkie (1/8 - 2/8)',
 	 'SCT' => 'zachmurzenie rozrzucone (3/8 - 4/8)',
 	 'BKN' => 'zachmurzenie poprzerywane (5/8 - 7/8) ',
-	 'OVC' => 'zachmurzenie ca3kowite (8/8)');
+	 'OVC' => 'zachmurzenie całkowite (8/8)');
 $this->strings['cumulonimbus'] = ' cumulonimbus';
- $this->strings['towering_cumulus'] = ' cumulus wypiêtrzony';
- $this->strings['cavok'] = ' brak chmur poni¿ej %s, brak cumulonimbusów oraz brak zjawisk atmosferycznych';
+ $this->strings['towering_cumulus'] = ' cumulus wypiętrzony';
+ $this->strings['cavok'] = ' brak chmur poniżej %s, brak cumulonimbusów oraz brak zjawisk atmosferycznych';
 $this->strings['currently'] = 'Aktualnie ';
- $this->strings['weather'] =
+ $this->strings['weather'] = 
 array(
 	 '-' => ' lekkie',
-	 ' ' => ' ¶rednie ',
+	 ' ' => ' średnie ',
 	 '+' => ' mocne ',
-	 'VC' => ' w pobli¿u',
-	 'PR' => ' czê¶ciowe',
-	 'BC' => ' p3aty',
-	 'MI' => ' p3ytkie',
-	 'DR' => ' nisko unosz±ce',
+	 'VC' => ' w pobliżu',
+	 'PR' => ' częściowe',
+	 'BC' => ' płaty',
+	 'MI' => ' płytkie',
+	 'DR' => ' nisko unoszące',
 	 'BL' => ' podmuchy',
 	 'SH' => ' przelotne opady',
 	 'TS' => ' burza z piorunami',
 	 'FZ' => ' przymrozek',
-	 'DZ' => ' m¿awka',
+	 'DZ' => ' mżawka',
 	 'RA' => ' deszcz',
-	 'SN' => ' ¶nieg',
-	 'SG' => ' gruby ¶nieg',
-	 'IC' => ' kryszta3ki lodu',
+	 'SN' => ' śnieg',
+	 'SG' => ' gruby śnieg',
+	 'IC' => ' kryształki lodu',
 	 'PL' => ' ice pellets',
 	 'GR' => ' grad',
-	 'GS' => ' ma3y grad',
+	 'GS' => ' mały grad',
 	 'UP' => ' nieznany',
 	 'BR' => ' zamglenie',
-	 'FG' => ' mg3y',
+	 'FG' => ' mgły',
 	 'FU' => ' dym',
-	 'VA' => ' popió3 wulkaniczny',
+	 'VA' => ' popiół wulkaniczny',
 	 'DU' => ' widespread dust',
 	 'SA' => ' piasek',
-	 'HZ' => ' zmêtnienie',
-	 'PY' => ' py3 wodny',
-	 'PO' => ' mocno rozwijaj±ce siê wiry piaskowe/py3owe',
-	 'SQ' => ' nawa3nica',
-	 'FC' => ' tr±ba powietrzna, wodna, tornado',
-	 'SS' => ' burza piaskowa/py3owa');
- $this->strings['visibility'] = 'Widzialno¶æ pozioma wynosi3a ';
- $this->strings['visibility_greater_than'] = 'wiêcej ni¿ ';
- $this->strings['visibility_less_than'] = 'mniej ni¿ ';
+	 'HZ' => ' zmętnienie',
+	 'PY' => ' pył wodny',
+	 'PO' => ' mocno rozwijające się wiry piaskowe/pyłowe',
+	 'SQ' => ' nawałnica',
+	 'FC' => ' trąba powietrzna, wodna, tornado',
+	 'SS' => ' burza piaskowa/pyłowa');
+ $this->strings['visibility'] = 'Widzialność pozioma wynosiła ';
+ $this->strings['visibility_greater_than'] = 'więcej niż ';
+ $this->strings['visibility_less_than'] = 'mniej niż ';
 $this->strings['visibility_to'] = ' do ';
- $this->strings['runway_upward_tendency'] = ' z tendencj± %wzrostow±%s';
- $this->strings['runway_downward_tendency'] = ' z tendencj± %smalej±c±%s';
- $this->strings['runway_no_tendency'] = ' bez %srozró¿nialnej%s tendencji';
- $this->strings['runway_between'] = 'pomiêdzy ';
+ $this->strings['runway_upward_tendency'] = ' z tendencją %wzrostową%s';
+ $this->strings['runway_downward_tendency'] = ' z tendencją %smalejącą%s';
+ $this->strings['runway_no_tendency'] = ' bez %srozróżnialnej%s tendencji';
+ $this->strings['runway_between'] = 'pomiędzy ';
 $this->strings['runway_left'] = ' lewego';
- $this->strings['runway_central'] = ' ¶rodkowego';
+ $this->strings['runway_central'] = ' środkowego';
 $this->strings['runway_right'] = ' prawego';
- $this->strings['runway_visibility'] = 'Widoczno¶æ by3a ';
+ $this->strings['runway_visibility'] = 'Widoczność była ';
 $this->strings['runway_for_runway'] = ' dla pasa ';
 
 /* We run the parent constructor */
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_sk.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_sk.php	2016年02月11日 09:14:13 UTC (rev 9792)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_sk.php	2016年02月11日 09:22:49 UTC (rev 9793)
@@ -25,7 +25,7 @@
 function pw_text_sk($weather, $input = array())
 {
 $this->strings['charset'] = 'ISO-8859-2';
- $this->strings['no_data'] = '\utujem, momentálne nie sú dostupné 3⁄4iadne informácie pre %s%s%s.';
+ $this->strings['no_data'] = 'Ľutujem, momentálne nie sú dostupné žiadne informácie pre %s%s%s.';
 $this->strings['list_sentences_and'] = ' a ';
 $this->strings['list_sentences_comma'] = ', ';
 $this->strings['list_sentences_final_and'] = ' a ';
@@ -37,7 +37,7 @@
 $this->strings['time_several_hours'] = '%s%s%s hodinami %s';
 $this->strings['time_a_moment'] = 'práve teraz';
 $this->strings['meters_per_second'] = ' metrov za sekundu';
- $this->strings['miles_per_hour'] = ' míμ za hodinu';
+ $this->strings['miles_per_hour'] = ' míľ za hodinu';
 $this->strings['meter'] = ' metrov';
 $this->strings['meters'] = ' metre';
 $this->strings['feet'] = ' stôp';
@@ -46,7 +46,7 @@
 $this->strings['and'] = ' a ';
 $this->strings['plus'] = ' plus ';
 $this->strings['with'] = ' s ';
- $this->strings['wind_blowing'] = 'Rýchlos» vetra bola ';
+ $this->strings['wind_blowing'] = 'Rýchlosť vetra bola ';
 $this->strings['wind_with_gusts'] = ' so silným závanom od ';
 $this->strings['wind_from'] = ' z ';
 $this->strings['wind_variable'] = ' z %srôznych%s smerov';
@@ -102,34 +102,34 @@
 $this->strings['altimeter'] = 'Atmosférický tlak bol ';
 $this->strings['hPa'] = ' hPa';
 $this->strings['inHg'] = ' inHg';
- $this->strings['rel_humidity'] = 'Relatívna vlhkos» vzduchu bola ';
- $this->strings['feelslike'] = 'Teplota sa zdala by» ';
+ $this->strings['rel_humidity'] = 'Relatívna vlhkosť vzduchu bola ';
+ $this->strings['feelslike'] = 'Teplota sa zdala byť ';
 $this->strings['cloud_group_beg'] = 'Na oblohe boli ';
 $this->strings['cloud_group_end'] = '.';
 $this->strings['cloud_clear'] = 'Obloha bola %sjasná%s.';
- $this->strings['cloud_height'] = ' oblaky vo vý1ke ';
- $this->strings['cloud_overcast'] = ' obloha bola %szamraèená%s od vý1ky ';
- $this->strings['cloud_vertical_visibility'] = '%svertikálna viditeμnos»%s bola ';
+ $this->strings['cloud_height'] = ' oblaky vo výške ';
+ $this->strings['cloud_overcast'] = ' obloha bola %szamračená%s od výšky ';
+ $this->strings['cloud_vertical_visibility'] = '%svertikálna viditeľnosť%s bola ';
 $this->strings['cloud_condition'] =
- array('SKC' => 'priehμadné',
+ array('SKC' => 'priehľadné',
 'CLR' => 'jasné',
- 'FEW' => 'niektoré', /*'niekoμko',*/
+ 'FEW' => 'niektoré', /*'niekoľko',*/
 'SCT' => 'rozptýlené',
 'BKN' => 'zatiahnuté',
- 'OVC' => 'zamraèené');
+ 'OVC' => 'zamračené');
 $this->strings['cumulonimbus'] = ' nahromadené búrkové';
- $this->strings['towering_cumulus'] = ' týèiace sa nahromadené';
- $this->strings['cavok'] = ' 3⁄4iadne oblaky pod %s a ani 3⁄4iadne iné nahromadené oblaky';
- $this->strings['currently'] = 'Aktuálnym poèasím bolo ';
- $this->strings['weather'] =
+ $this->strings['towering_cumulus'] = ' týčiace sa nahromadené';
+ $this->strings['cavok'] = ' žiadne oblaky pod %s a ani žiadne iné nahromadené oblaky';
+ $this->strings['currently'] = 'Aktuálnym počasím bolo ';
+ $this->strings['weather'] = 
 array(/* Intensity */
 '-' => ' riedky ',
 ' ' => ' stredný ',
 '+' => ' hustý ',
 /* Proximity */
- 'VC' => ' v priμahlých oblastiach',
+ 'VC' => ' v priľahlých oblastiach',
 /* Descriptor */
- 'PR' => ' èiastoèný',
+ 'PR' => ' čiastočný',
 'BC' => ' areály',
 'MI' => ' plytký',
 'DR' => ' slabé prúdenie vzduchu',
@@ -138,12 +138,12 @@
 'TS' => ' búrka s bleskami',
 'FZ' => ' mrznutie',
 /* Precipitation */
- 'DZ' => ' mrholenie s veμkými kvapkami',
- 'RA' => ' dá3⁄4ï', /* ' da3⁄4divo', */
- 'SN' => ' sne3⁄4enie',
- 'SG' => ' zrnité sne3⁄4enie',
- 'IC' => ' μadové kry1táliky',
- 'PL' => ' μadovec',
+ 'DZ' => ' mrholenie s veľkými kvapkami',
+ 'RA' => ' dážď', /* ' daždivo', */
+ 'SN' => ' sneženie',
+ 'SG' => ' zrnité sneženie',
+ 'IC' => ' ľadové kryštáliky',
+ 'PL' => ' ľadovec',
 'GR' => ' krupobytie',
 'GS' => ' slabé krupobytie',
 'UP' => ' neznáme',
@@ -151,31 +151,31 @@
 'BR' => ' hmlový opar nad vodami',
 'FG' => ' hmlisto',
 'FU' => ' dymno',
- 'VA' => ' sopeèný popol',
- 'DU' => ' popra1ok',
- 'SA' => ' piesoèno', /* piesoèné */
+ 'VA' => ' sopečný popol',
+ 'DU' => ' poprašok',
+ 'SA' => ' piesočno', /* piesočné */
 'HZ' => ' opar nad pohorím',
- 'PY' => ' mrholenie s malými kvapôèkami',
+ 'PY' => ' mrholenie s malými kvapôčkami',
 /* Other */
- 'PO' => ' piesoèné výry',
+ 'PO' => ' piesočné výry',
 'SQ' => ' prudký závan vetra',
- 'FC' => ' prietr3⁄4 mraèien',
- 'SS' => ' pra1ná priesoèná búrka');
- $this->strings['visibility'] = 'Celková viditeμnos» bola ';
- $this->strings['visibility_greater_than'] = 'väè1ia ako ';
- $this->strings['visibility_less_than'] = 'men1ia ako ';
+ 'FC' => ' prietrž mračien',
+ 'SS' => ' prašná priesočná búrka');
+ $this->strings['visibility'] = 'Celková viditeľnosť bola ';
+ $this->strings['visibility_greater_than'] = 'väčšia ako ';
+ $this->strings['visibility_less_than'] = 'menšia ako ';
 $this->strings['visibility_to'] = ' do ';
 /* this is left untranslated, because I have no metar, that use
 * this text -- Nepto [14/07/2002] */
 $this->strings['runway_upward_tendency'] = ' so %sstúpajúcou%s tendenciou';
 $this->strings['runway_downward_tendency'] = ' s %sklesajúcou%s tendenciou';
- $this->strings['runway_no_tendency'] = ' s %snejednoznaènou%s tendenciou';
+ $this->strings['runway_no_tendency'] = ' s %snejednoznačnou%s tendenciou';
 $this->strings['runway_between'] = 'medzi ';
 $this->strings['runway_left'] = ' left';
 $this->strings['runway_central'] = ' central';
 $this->strings['runway_right'] = ' right';
- $this->strings['runway_visibility'] = 'Viditeμnos» bola ';
- $this->strings['runway_for_runway'] = ' pre pristávaciu dráhu èíslo ';
+ $this->strings['runway_visibility'] = 'Viditeľnosť bola ';
+ $this->strings['runway_for_runway'] = ' pre pristávaciu dráhu číslo ';
 
 /* We run the parent constructor */
 $this->pw_text($weather, $input);
@@ -184,7 +184,7 @@
 function print_pretty_wind($wind)
 {
 extract($wind);
-
+ 
 if (! empty($meters_per_second)) {
 switch ($meters_per_second) {
 case 1:
@@ -204,7 +204,7 @@
 if (! empty($miles_per_hour)) {
 switch ($miles_per_hour) {
 case 1:
- $this->strings['miles_per_hour'] = ' míμa za hodinu';
+ $this->strings['miles_per_hour'] = ' míľa za hodinu';
 break;
 case 2:
 case 3:
@@ -213,7 +213,7 @@
 break;
 }
 }
-
+ 
 /*
 * Z/ZO grammar handling
 * zo severu, z juhu, zo zapadu, z vychodu
@@ -228,7 +228,7 @@
 }
 }
 }
-
+ 
 if (isset($var_beg)) {
 $idx = intval(round($var_beg / 22.5));
 if ($idx <= 2 || $idx >= 11) {
@@ -236,7 +236,7 @@
 str_replace(' z ', ' zo ', $this->strings['wind_varying']);
 }
 }
-
+ 
 return parent::print_pretty_wind($wind);
 }
 
@@ -261,17 +261,17 @@
 function parse_cloud_group($cloud_group)
 {
 extract($cloud_group);
-
+ 
 if (isset($condition)) {
 		 if ($condition == 'CAVOK') {
 			 $this->strings['cloud_group_beg'] =
 				 str_replace(' boli ', ' neboli ', $this->strings['cloud_group_beg']);
 		 }
 }
-
+ 
 return parent::parse_cloud_group($cloud_group);
 }
-
+ 
 function parse_runway_group($runway_group)
 {
 if (empty($runway_group) || !is_array($runway_group)) {
@@ -285,7 +285,7 @@
 $this->strings['meters'] = $old_meters;
 return $ret;
 }
-
+ 
 function print_pretty_time($time)
 {
 $minutes_old = round((time() - $time)/60);
@@ -302,23 +302,23 @@
 str_replace(' pred ', ' ', $this->strings['time_format']);
 }
 }
-
+ 
 return parent::print_pretty_time($time);
 }
-
+ 
 function print_pretty_weather($weather)
 {
 	 $ret_str = '';
 	 for ($k = 0; $k < count($weather); $k++) {
 
-		 if ($weather[$k]['descriptor'] == 'SH') { // prehánky ... da3⁄4ïa
+		 if ($weather[$k]['descriptor'] == 'SH') { // prehánky ... dažďa
 			 $k == 0 && $this->strings['currently'] =
 				 str_replace(' bolo ', ' boli ', $this->strings['currently']);
 			 if ($weather[$k]['precipitation'] == 'RA') {
 				 $this->strings['weather']['-'] = ' riedkeho ';
 				 $this->strings['weather'][' '] = ' stredného ';
 				 $this->strings['weather']['+'] = ' hustého ';
-				 $this->strings['weather']['RA'] = ' da3⁄4ïa';
+				 $this->strings['weather']['RA'] = ' dažďa';
 			 }
 		 } elseif ($weather[$k]['descriptor'] == 'TS') { // búrka
 			 $k == 0 && $this->strings['currently'] =
@@ -326,21 +326,21 @@
 			 $this->strings['weather']['-'] = ' riedkym ';
 			 $this->strings['weather'][' '] = ' stredným ';
 			 $this->strings['weather']['+'] = ' hustým ';
-			 $this->strings['weather']['RA'] = ' da3⁄4ïom';
+			 $this->strings['weather']['RA'] = ' dažďom';
 			 $this->strings['with'] = ' a ';
 		 } elseif ($weather[$k]['precipitation'] == 'DZ' // mrholenie
-				 || $weather[$k]['precipitation'] == 'SN') { // sne®enie
+				 || $weather[$k]['precipitation'] == 'SN') { // sneŽenie
 			 $this->strings['weather']['-'] = ' riedke ';
 			 $this->strings['weather'][' '] = ' stredné ';
 			 $this->strings['weather']['+'] = ' husté ';
-		 } elseif ($weather[$k]['precipitation'] == 'RA' // dá3⁄4ï
+		 } elseif ($weather[$k]['precipitation'] == 'RA' // dážď
 				 || $weather[$k]['obscuration'] == 'HZ'
 				 || $weather[$k]['obscuration'] == 'BR' // hmlový opar
-				 ) {
+				 ) { 
 			 $k == 0 && $this->strings['currently'] =
 				 str_replace(' bolo ', ' bol ', $this->strings['currently']);
 		 } elseif ($weather[$k]['obscuration'] == 'FG') { // ... hmlisto
-			 $this->strings['weather']['PR'] = ' èiastoèné';
+			 $this->strings['weather']['PR'] = ' čiastočné';
 			 $this->strings['weather']['MI'] = ' plytké';
 		 }
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9792
 http://sourceforge.net/p/phpwiki/code/9792
Author: vargenau
Date: 2016年02月11日 09:14:13 +0000 (2016年2月11日)
Log Message:
-----------
Convert from ISO-8859 to UTF-8
Modified Paths:
--------------
 trunk/lib/phpweather-2.2.2/AUTHORS
 trunk/lib/phpweather-2.2.2/ChangeLog
 trunk/lib/phpweather-2.2.2/stations.csv
Modified: trunk/lib/phpweather-2.2.2/AUTHORS
===================================================================
--- trunk/lib/phpweather-2.2.2/AUTHORS	2016年02月10日 17:54:35 UTC (rev 9791)
+++ trunk/lib/phpweather-2.2.2/AUTHORS	2016年02月11日 09:14:13 UTC (rev 9792)
@@ -59,9 +59,9 @@
 
 Ing. Vladimir Kotala
 Suggested that I changed the long text `... degrees Celsius' into
- the more compact `... \xB0C', which is much better.
+ the more compact `... °C', which is much better.
 
-Gyulai Mih\xE1ly (misibacsi) `http://gyulai.freeyellow.com/'
+Gyulai Mihály (misibacsi) `http://gyulai.freeyellow.com/'
 Made the Hungarian translation for PHP Weather. He has also
 corrected tons of spelling errors.
 
@@ -80,7 +80,7 @@
 Lots of different things: bugfixes, clever suggestions, and general
 maintenance.
 
-Jes\xFAs Pe\xF1as
+Jesús Peñas
 Made the Spanish translation.
 
 Ondrej Jombik (nepto)
@@ -101,10 +101,10 @@
 Bas Elshof
 Translated PHP Weather into Dutch.
 
-V\xE1clav R\xEDkal
+Václav Ríkal
 Made a Czech translation.
 
-Radoslava Fed\xE1kov\xE1
+Radoslava Fedáková
 Czech translation.
 
 Guillaume Petit
@@ -148,10 +148,10 @@
 Nick Crossland (ncrossland)
 Made a British English translation.
 
-Jos\xE9 de \xC1vila Junior
+José de Ávila Junior
 Updated the Brazillian stations in the `stations.csv' file.
 
-Cl\xE1udio Gamboa
+Cláudio Gamboa
 Contributed a Portugues translation.
 
 
Modified: trunk/lib/phpweather-2.2.2/ChangeLog
===================================================================
--- trunk/lib/phpweather-2.2.2/ChangeLog	2016年02月10日 17:54:35 UTC (rev 9791)
+++ trunk/lib/phpweather-2.2.2/ChangeLog	2016年02月11日 09:14:13 UTC (rev 9792)
@@ -14,7 +14,7 @@
 
 	* doc/src/contributors-body.texi, output/pw_text_pt.php:
 
-	Added a Portuguese translation made by Cl\xE1udio Gamboa.
+	Added a Portuguese translation made by Cláudio Gamboa.
 
 2004年06月01日 20:30 Martin Geisler <gim...@gi...>
 
@@ -821,8 +821,8 @@
 	* AUTHORS, output/pw_text_cs.php, output/pw_text_nl.php:
 
 	Added Dutch and Czech translations and updated the AUTHORS file
-	with Bas Elshof <ba...@el...>, V\xE1clav R\xEDkal
-	<va...@ph...> and Radoslava Fed\xE1kov\xE1
+	with Bas Elshof <ba...@el...>, Václav Ríkal
+	<va...@ph...> and Radoslava Fedáková
 	<mor...@po...>.
 
 2002年09月25日 18:31 Martin Geisler <gim...@gi...>
@@ -1210,7 +1210,7 @@
 
 	* output/pw_text_es.php:
 
-	Added Spanish translation, thanks to Jes\xFAs Pe\xF1as
+	Added Spanish translation, thanks to Jesús Peñas
 	<jp...@ed...>
 
 2002年05月28日 13:40 Martin Geisler <gim...@gi...>
@@ -2048,7 +2048,7 @@
 
 	* AUTHORS:
 
-	Added Gyulai Mih\xE1ly to the list of authors - about time some would
+	Added Gyulai Mihály to the list of authors - about time some would
 	say :-)
 
 2002年03月17日 14:52 Max Hammond <ma...@fl...>
Modified: trunk/lib/phpweather-2.2.2/stations.csv
===================================================================
--- trunk/lib/phpweather-2.2.2/stations.csv	2016年02月10日 17:54:35 UTC (rev 9791)
+++ trunk/lib/phpweather-2.2.2/stations.csv	2016年02月11日 09:14:13 UTC (rev 9792)
@@ -372,7 +372,7 @@
 FBTS;Tsabong
 FBTE;Tshane
 
-# Updated list made by Jos\xE9 \xC1vila <du...@ig...>
+# Updated list made by José Ávila <du...@ig...>
 #
 # Source: Brazilian Rotaer
 # Date: 20/May/2004
@@ -383,149 +383,149 @@
 
 
 ## BR;Brasil ##
-SBAA;Aeroporto Concei\xE7\xE3o do Araguaia (Concei\xE7\xE3o do Araguaia/PA)
-SBAF;Campo D\xE9lio Jardim de Mattos (Rio de Janeiro/RJ)
-SBAM;Aeroporto Amap\xE1 (Amap\xE1/AP)
-SBAN;Base A\xE9rea de An\xE1polis (An\xE1polis/GO)
+SBAA;Aeroporto Conceição do Araguaia (Conceição do Araguaia/PA)
+SBAF;Campo Délio Jardim de Mattos (Rio de Janeiro/RJ)
+SBAM;Aeroporto Amapá (Amapá/AP)
+SBAN;Base Aérea de Anápolis (Anápolis/GO)
 SBAQ;Aeroporto Araraquara (Araraquara/SP)
 SBAR;Aeroporto Santa Maria (Aracaju/SE)
 SBAS;Aeroporto Assis (Assis/SP)
 SBAT;Aeroporto Alta Floresta (Alta Floresta/MT)
-SBAU;Aeroporto Ara\xE7atuba (Ara\xE7atuba/SP)
+SBAU;Aeroporto Araçatuba (Araçatuba/SP)
 SBAV;Aeroporto Usina Porto Primavera (Rosana/SP)
-SBAX;Aeroporto Arax\xE1 (Arax\xE1/MG)
-SBBE;Aeroporto Internacional Val de C\xE3es (Bel\xE9m/PA)
-SBBG;Aeroporto Internacional Comandante Gustavo Kraemer (Bag\xE9/RS)
+SBAX;Aeroporto Araxá (Araxá/MG)
+SBBE;Aeroporto Internacional Val de Cães (Belém/PA)
+SBBG;Aeroporto Internacional Comandante Gustavo Kraemer (Bagé/RS)
 SBBH;Aeroporto Pampulha (Belo Horizonte/MG)
 SBBI;Aeroporto Bacacheri (Curitiba/PR)
 SBBQ;Aeroporto Major Brigadeiro Doorgal Borges (Barbacena/MG)
-SBBR;Aeroporto Internacional Pres. Juscelino Kubitschek (Bras\xEDlia/DF)
+SBBR;Aeroporto Internacional Pres. Juscelino Kubitschek (Brasília/DF)
 SBBT;Aeroporto Chafei Amsei (Barretos/SP)
 SBBU;Aeroporto Bauru (Bauru/SP)
 SBBV;Aeroporto Internacional Boa Vista (Boa Vista/RR)
-SBBW;Aeroporto Barra do Gar\xE7as (Barra do Gar\xE7as/MT)
-SBBZ;Aeroporto Umberto Modiano (Arma\xE7\xE3o de B\xFAzios/RJ)
+SBBW;Aeroporto Barra do Garças (Barra do Garças/MT)
+SBBZ;Aeroporto Umberto Modiano (Armação de Búzios/RJ)
 SBCA;Aeroporto Cascavel (Cascavel/PR)
 SBCB;Aeroporto Cabo Frio (Cabo Frio/RJ)
 SBCC;Aeroporto Cachimbo (Novo Progresso/PA)
 SBCF;Aeroporto Internacional Tancredo Neves (Confins - Belo Horizonte/MG)
 SBCG;Aeroporto Internacional Campo Grande (Campo Grande/MS)
-SBCH;Aeroporto Chapec\xF3 (Chapec\xF3/SC)
+SBCH;Aeroporto Chapecó (Chapecó/SC)
 SBCI;Aeroporto Carolina (Carolina/MA)
-SBCJ;Aeroporto Caraj\xE1s (Parauapebas/PA)
-SBCM;Aeroporto Forquilhinha (Crici\xFAma/SC)
+SBCJ;Aeroporto Carajás (Parauapebas/PA)
+SBCM;Aeroporto Forquilhinha (Criciúma/SC)
 SBCO;Aeroporto Canoas (Porto Alegre/RS)
 SBCP;Aeroporto Bartolomeu Lisandro (Campos dos Goytacazes/RJ)
-SBCR;Aeroporto Internacional Corumb\xE1 (Corumb\xE1/MS)
+SBCR;Aeroporto Internacional Corumbá (Corumbá/MS)
 SBCT;Aeroporto Internacional Afonso Pena (Curitiba/PR)
 SBCV;Aeroporto Caravelas (Caravelas/BA)
 SBCX;Campo dos Bugres (Caxias do Sul/RS)
-SBCY;Aeroporto Internacional Marechal Rondon (Cuiab\xE1/MT)
+SBCY;Aeroporto Internacional Marechal Rondon (Cuiabá/MT)
 SBCZ;Aeroporto Internacional Cruzeiro do Sul (Cruzeiro do Sul/AC)
 SBDN;Aeroporto Presidente Prudente (Presidente Prudente/SP)
 SBEG;Aeroporto Internacional Eduardo Gomes (Manaus/AM)
 SBEK;Aeroporto Jacareacanga (Jacareacanga/PA)
-SBES;Aeroporto S\xE3o Pedro da Aldeia (S\xE3o Pedro da Aldeia/RJ)
-SBFI;Aeroporto Internacional Cataratas (Foz do Igua\xE7u/PR)
-SBFL;Aeroporto Internacional Herc\xEDlio Luz (Florian\xF3polis/SC)
+SBES;Aeroporto São Pedro da Aldeia (São Pedro da Aldeia/RJ)
+SBFI;Aeroporto Internacional Cataratas (Foz do Iguaçu/PR)
+SBFL;Aeroporto Internacional Hercílio Luz (Florianópolis/SC)
 SBFN;Aeroporto Fernando de Noronha (Fernando de Noronha/PE)
-SBFS;Aeroporto HELPN S\xE3o Tom\xE9 (Campos dos Goytacazes/RJ)
+SBFS;Aeroporto HELPN São Tomé (Campos dos Goytacazes/RJ)
 SBFT;Aeroporto Fronteira (Fronteira/MG)
-SBFU;Aeroporto Furnas (S\xE3o Jos\xE9 da Barra/MG)
+SBFU;Aeroporto Furnas (São José da Barra/MG)
 SBFZ;Aeroporto Internacional Pinto Martins (Fortaleza/CE)
-SBGL;Aeroporto Internacional Gale\xE3o - Ant\xF4nio Carlos Jobim (Rio de Janeiro/RJ)
-SBGM;Aeroporto Guajar\xE1-mirim (Guajar\xE1-mirim/RO)
-SBGO;Aeroporto Santa Genoveva (Goi\xE2nia/GO)
-SBGR;Aeroporto Internacional Guarulhos (S\xE3o Paulo/SP)
-SBGU;Aeroporto Tancredo Thom\xE1s de Faria (Guarapuava/PR)
+SBGL;Aeroporto Internacional Galeão - Antônio Carlos Jobim (Rio de Janeiro/RJ)
+SBGM;Aeroporto Guajará-mirim (Guajará-mirim/RO)
+SBGO;Aeroporto Santa Genoveva (Goiânia/GO)
+SBGR;Aeroporto Internacional Guarulhos (São Paulo/SP)
+SBGU;Aeroporto Tancredo Thomás de Faria (Guarapuava/PR)
 SBGV;Aeroporto Governador Valadares (Governador Valadares/MG)
-SBGW;Aeroporto Guaratinguet\xE1 (Guaratinguet\xE1/SP)
+SBGW;Aeroporto Guaratinguetá (Guaratinguetá/SP)
 SBHT;Aeroporto Altamira (Altamira/PA)
 SBIC;Aeroporto Itacoatiara (Itacoatiara/AM)
 SBIH;Aeroporto Itaituba (Itaituba/PA)
-SBIL;Aeroporto Ilh\xE9us (Ilh\xE9us/BA)
-SBIP;Aeroporto Usiminas (Santana do Para\xEDso/MG)
-SBIT;Aeroporto Hidroel\xE9trica (Itumbiara/GO)
+SBIL;Aeroporto Ilhéus (Ilhéus/BA)
+SBIP;Aeroporto Usiminas (Santana do Paraíso/MG)
+SBIT;Aeroporto Hidroelétrica (Itumbiara/GO)
 SBIZ;Aeroporto Imperatriz (Imperatriz/MA)
-SBJC;Aeroporto J\xFAlio Cesar (Bel\xE9m/PA)
+SBJC;Aeroporto Júlio Cesar (Belém/PA)
 SBJF;Aeroporto Francisco de Assis (Juiz de Fora/MG)
-SBJP;Aeroporto Internacional Pres. Castro Pinto (Jo\xE3o Pessoa/PB)
-SBJR;Aeroporto Jacarepagu\xE1 (Rio de Janeiro/RJ)
+SBJP;Aeroporto Internacional Pres. Castro Pinto (João Pessoa/PB)
+SBJR;Aeroporto Jacarepaguá (Rio de Janeiro/RJ)
 SBJU;Aeroporto Cariri (Juazeiro do Norte/CE)
 SBJV;Aeroporto Joinville (Joinville/SC)
-SBKG;Aeroporto Jo\xE3o Suassuna (Campina Grande/PB)
+SBKG;Aeroporto João Suassuna (Campina Grande/PB)
 SBKP;Aeroporto Internacional Viracopos (Campinas/SP)
 SBLJ;Aeroporto Lages (Lages/SC)
 SBLN;Aeroporto Lins (Lins/SP)
 SBLO;Aeroporto Londrina (Londrina/PR)
 SBLP;Aeroporto Bom Jesus da Lapa (Bom Jesus da Lapa/BA)
 SBLS;Aeroporto Lagoa Santa (Lagoa Santa/MG)
-SBMA;Aeroporto Marab\xE1 (Marab\xE1/PA)
-SBMC;Aeroporto Mina\xE7u (Mina\xE7u/GO)
+SBMA;Aeroporto Marabá (Marabá/PA)
+SBMC;Aeroporto Minaçu (Minaçu/GO)
 SBMD;Aeroporto Monte dourado (Almeirim/PA)
-SBME;Aeroporto Maca\xE9 (Maca\xE9/RJ)
-SBMG;Aeroporto Regional de Maring\xE1 (Maring\xE1/PR)
+SBME;Aeroporto Macaé (Macaé/RJ)
+SBMG;Aeroporto Regional de Maringá (Maringá/PR)
 SBMK;Aeroporto Montes Claros (Montes Claros/MG)
-SBML;Aeroporto Mar\xEDlia (Mar\xEDlia/SP)
-SBMM;Aeroporto Plataforma P-20 (Maca\xE9/RJ)
+SBML;Aeroporto Marília (Marília/SP)
+SBMM;Aeroporto Plataforma P-20 (Macaé/RJ)
 SBMN;Aeroporto Ponta Pelada (Manaus/AM)
-SBMO;Aeroporto Internacional Zumbi dos Palmares (Macei\xF3/AL)
-SBMQ;Aeroporto Internacional Macap\xE1 (Macap\xE1/AP)
-SBMS;Aeroporto Dix-sept Rosado (Mossor\xF3/RN)
-SBMT;Campo de Marte (S\xE3o Paulo/SP)
-SBMY;Aeroporto Manicor\xE9 (Manicor\xE9/AM)
-SBNF;Aeroporto Navegantes - Itaja\xED (Navegantes/SC)
-SBNM;Aeroporto Santo \xC2ngelo (Santo \xC2ngelo/RS)
+SBMO;Aeroporto Internacional Zumbi dos Palmares (Maceió/AL)
+SBMQ;Aeroporto Internacional Macapá (Macapá/AP)
+SBMS;Aeroporto Dix-sept Rosado (Mossoró/RN)
+SBMT;Campo de Marte (São Paulo/SP)
+SBMY;Aeroporto Manicoré (Manicoré/AM)
+SBNF;Aeroporto Navegantes - Itajaí (Navegantes/SC)
+SBNM;Aeroporto Santo Ângelo (Santo Ângelo/RS)
 SBNT;Aeroporto Augusto Severo (Natal/RN)
 SBOI;Aeroporto Oiapoque (Oiapoque/AP)
 SBPA;Aeroporto Internacional Salgado Filho (Porto Alegre/RS)
-SBPB;Aeroporto Parna\xEDba (Parna\xEDba/PI)
-SBPC;Aeroporto Po\xE7os de Caldas (Po\xE7os de Caldas/MG)
+SBPB;Aeroporto Parnaíba (Parnaíba/PI)
+SBPC;Aeroporto Poços de Caldas (Poços de Caldas/MG)
 SBPF;Aeroporto Lauro Kurtz (Passo Fundo/RS)
 SBPK;Aeroporto Internacional Pelotas (Pelotas/RS)
 SBPL;Aeroporto Petrolina (Petrolina/PE)
 SBPM;Aeroporto Tocantins (Palmas/TO)
 SBPN;Aeroporto Porto Nacional (Porto Nacional/TO)
-SBPP;Aeroporto Internacional Ponta Por\xE3 (Ponta Por\xE3/MS)
+SBPP;Aeroporto Internacional Ponta Porã (Ponta Porã/MS)
 SBPR;Aeroporto Carlos Prates (Belo Horizonte/MG)
 SBPS;Aeroporto Porto Seguro (Porto Seguro/BA)
 SBPV;Aeroporto Internacional Governador Jorge Teixeira de Oliveira (Porto Velho/RO)
-SBQV;Aeroporto Vit\xF3ria da Conquista (Vit\xF3ria da Conquista/BA)
-SBRB;Aeroporto Internacional Presidente M\xE9dici (Rio Branco/AC)
+SBQV;Aeroporto Vitória da Conquista (Vitória da Conquista/BA)
+SBRB;Aeroporto Internacional Presidente Médici (Rio Branco/AC)
 SBRF;Aeroporto Internacional Guararapes (Recife/PE)
 SBRG;Aeroporto Rio Grande (Rio Grande/RS)
 SBRJ;Aeroporto Santos Dumont (Rio de Janeiro/RJ)
-SBRP;Aeroporto Leite Lopes (Ribeir\xE3o Preto/SP)
+SBRP;Aeroporto Leite Lopes (Ribeirão Preto/SP)
 SBSC;Aeroporto Santa Cruz (Rio de Janeiro/RJ)
-SBSJ;Aeroporto S\xE3o Jos\xE9 dos Campos (S\xE3o Jos\xE9 dos Campos/SP)
-SBSL;Aeroporto Marechal Cunha Machado (S\xE3o Lu\xEDs/MA)
+SBSJ;Aeroporto São José dos Campos (São José dos Campos/SP)
+SBSL;Aeroporto Marechal Cunha Machado (São Luís/MA)
 SBSM;Aeroporto Santa Maria (Santa Maria/RS)
-SBSN;Aeroporto Santar\xE9m (Santar\xE9m/PA)
-SBSP;Aeroporto Internacional Congonhas (S\xE3o Paulo/SP)
-SBSR;Aeroporto S\xE3o Jos\xE9 do Rio Preto (S\xE3o Jos\xE9 do Rio Preto/SP)
-SBST;Base A\xE9rea de Guaruj\xE1 (Guaruj\xE1/SP)
-SBSV;Aeroporto Internacional deputado Lu\xEDs Eduardo Magalh\xE3es (Salvador/BA)
-SBTA;Base de Avia\xE7\xE3o de Taubat\xE9 (Taubat\xE9/SP)
-SBTB;Aeroporto Trombetas (Oriximin\xE1/PA)
-SBTC;Aeroporto Hotel Transam\xE9rica (Una/BA)
+SBSN;Aeroporto Santarém (Santarém/PA)
+SBSP;Aeroporto Internacional Congonhas (São Paulo/SP)
+SBSR;Aeroporto São José do Rio Preto (São José do Rio Preto/SP)
+SBST;Base Aérea de Guarujá (Guarujá/SP)
+SBSV;Aeroporto Internacional deputado Luís Eduardo Magalhães (Salvador/BA)
+SBTA;Base de Aviação de Taubaté (Taubaté/SP)
+SBTB;Aeroporto Trombetas (Oriximiná/PA)
+SBTC;Aeroporto Hotel Transamérica (Una/BA)
 SBTD;Aeroporto Toledo (Toledo/PR)
-SBTE;Aeroporto Senador Petr\xF4nio Portella (Teresina/PI)
-SBTF;Aeroporto Tef\xE9 (Tef\xE9/AM)
-SBTK;Aeroporto Tarauac\xE1 (Tarauac\xE1/AC)
-SBTL;Aeroporto Tel\xEAmaco Borba (Tel\xEAmaco Borba/PR)
-SBTS;Aeroporto Tiri\xF3s (\xD3bidos/PA)
+SBTE;Aeroporto Senador Petrônio Portella (Teresina/PI)
+SBTF;Aeroporto Tefé (Tefé/AM)
+SBTK;Aeroporto Tarauacá (Tarauacá/AC)
+SBTL;Aeroporto Telêmaco Borba (Telêmaco Borba/PR)
+SBTS;Aeroporto Tiriós (Óbidos/PA)
 SBTT;Aeroporto Internacional Tabatinga (Tabatinga/AM)
-SBTU;Aeroporto Tucuru\xED (Tucuru\xED/PA)
-SBUA;Aeroporto S\xE3o Gabriel da Cachoeira (S\xE3o Gabriel da Cachoeira/AM)
+SBTU;Aeroporto Tucuruí (Tucuruí/PA)
+SBUA;Aeroporto São Gabriel da Cachoeira (São Gabriel da Cachoeira/AM)
 SBUF;Aeroporto Paulo Afonso (Paulo Afonso/BA)
 SBUG;Aeroporto Internacional Rubem Berta (Uruguaiana/RS)
-SBUL;Aeroporto Uberl\xE2ndia (Uberl\xE2ndia/MG)
-SBUP;Aeroporto Urubupung\xE1 (Castilho/SP)
+SBUL;Aeroporto Uberlândia (Uberlândia/MG)
+SBUP;Aeroporto Urubupungá (Castilho/SP)
 SBUR;Aeroporto Uberaba (Uberaba/MG)
 SBVG;Aeroporto Major Brigadeiro Trompowsky (Varginha/MG)
 SBVH;Aeroporto Vilhena (Vilhena/RO)
-SBVT;Aeroporto Goiabeiras (Vit\xF3ria/ES)
-SBYA;Aeroporto Iauaret\xEA (S\xE3o Gabriel da Cachoeira/AM)
+SBVT;Aeroporto Goiabeiras (Vitória/ES)
+SBYA;Aeroporto Iauaretê (São Gabriel da Cachoeira/AM)
 SBYS;Campo Fontenelle (Pirassununga/SP)
 
 ## IO;British Indian Ocean Territory ##
@@ -1968,18 +1968,18 @@
 VHHH;Hong Kong Inter-National Airport
 
 ## HU;Hungary ##
-LHBC;B\xE9k\xE9scsaba
-LHBS;Buda\xF6rs
+LHBC;Békéscsaba
+LHBS;Budaörs
 LHBP;Budapest / Ferihegy
 LHBM;Budapest Met Center
 LHDC;Debrecen
-LHKV;Kaposv\xE1r
-LHKE;Kecskem\xE9t
+LHKV;Kaposvár
+LHKE;Kecskemét
 LHMC;Miskolc
-LHNY;Nyiregyh\xE1za / Napkor
-LHPA;P\xE1pa
-LHPP;P\xE9cs / Pog\xE1ny
-LHSK;Si\xF3fok
+LHNY;Nyiregyháza / Napkor
+LHPA;Pápa
+LHPP;Pécs / Pogány
+LHSK;Siófok
 LHUD;Szeged
 LHSN;Szolnok
 LHSY;Szombathely
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9791
 http://sourceforge.net/p/phpwiki/code/9791
Author: vargenau
Date: 2016年02月10日 17:54:35 +0000 (2016年2月10日)
Log Message:
-----------
Update ReleaseNotes
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016年02月10日 17:47:41 UTC (rev 9790)
+++ trunk/pgsrc/ReleaseNotes	2016年02月10日 17:54:35 UTC (rev 9791)
@@ -1,4 +1,4 @@
-Date: Mon, 8 Feb 2016 10:43:43 +0000
+Date: 2016年2月10日 18:52:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -11,8 +11,11 @@
 == 1.5.6 2016-XX-XX Marc-Etienne Vargenau ==
 
 * Pear: use ##mysqli## instead of ##mysql##
-* Upload plugin: put date and author in history
+* Replace ##ereg## functions
+* ~UpLoad plugin: put date and author in history
+* ~UpLoad plugin: don't inline images
 * phpweather-2.2.2 included in PhpWiki; ~PhpWeather plugin allowed in Fusionforge
+* HtmlConverter plugin: check file is encoded in UTF-8
 
 == 1.5.5 2015年12月11日 Marc-Etienne Vargenau ==
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9790
 http://sourceforge.net/p/phpwiki/code/9790
Author: vargenau
Date: 2016年02月10日 17:47:41 +0000 (2016年2月10日)
Log Message:
-----------
ereg --> preg_match
Modified Paths:
--------------
 trunk/lib/IniConfig.php
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2016年02月10日 17:34:26 UTC (rev 9789)
+++ trunk/lib/IniConfig.php	2016年02月10日 17:47:41 UTC (rev 9790)
@@ -962,7 +962,7 @@
 define('USE_PATH_INFO', false);
 break;
 default:
- define('USE_PATH_INFO', ereg('\.(php3?|cgi)$', SCRIPT_NAME));
+ define('USE_PATH_INFO', preg_match('/\.(php3?|cgi)$/', SCRIPT_NAME));
 break;
 }
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9789
 http://sourceforge.net/p/phpwiki/code/9789
Author: vargenau
Date: 2016年02月10日 17:34:26 +0000 (2016年2月10日)
Log Message:
-----------
eregi_replace --> preg_replace; ereg --> preg_match
Modified Paths:
--------------
 trunk/lib/Request.php
 trunk/lib/WikiUser.php
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2016年02月10日 17:21:47 UTC (rev 9788)
+++ trunk/lib/Request.php	2016年02月10日 17:34:26 UTC (rev 9789)
@@ -754,7 +754,7 @@
 }
 $tmp_file .= '/' . basename($fileinfo['tmp_name']);
 /* ending slash in php.ini upload_tmp_dir is required. */
- if (realpath(ereg_replace('/+', '/', $tmp_file)) != realpath($fileinfo['tmp_name'])) {
+ if (realpath(preg_replace('#/+#', '/', $tmp_file)) != realpath($fileinfo['tmp_name'])) {
 trigger_error(sprintf("Uploaded tmpfile illegal: %s != %s.", $tmp_file, $fileinfo['tmp_name']) .
 "\n" .
 "Probably illegal TEMP environment or upload_tmp_dir setting. " .
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016年02月10日 17:21:47 UTC (rev 9788)
+++ trunk/lib/WikiUser.php	2016年02月10日 17:34:26 UTC (rev 9789)
@@ -1896,7 +1896,7 @@
 }
 $Connect = @fsockopen($ConnectAddress, 25);
 if ($Connect) {
- if (ereg("^220", $Out = fgets($Connect, 1024))) {
+ if (preg_match("/^220/", $Out = fgets($Connect, 1024))) {
 fputs($Connect, "HELO $HTTP_HOST\r\n");
 $Out = fgets($Connect, 1024);
 fputs($Connect, "MAIL FROM: <" . $email . ">\r\n");
@@ -1905,12 +1905,12 @@
 $To = fgets($Connect, 1024);
 fputs($Connect, "QUIT\r\n");
 fclose($Connect);
- if (!ereg("^250", $From)) {
+ if (!preg_match("/^250/", $From)) {
 $result[0] = false;
 $result[1] = "Server rejected address: " . $From;
 return $result;
 }
- if (!ereg("^250", $To)) {
+ if (!preg_match("/^250/", $To)) {
 $result[0] = false;
 $result[1] = "Server rejected address: " . $To;
 return $result;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9788
 http://sourceforge.net/p/phpwiki/code/9788
Author: vargenau
Date: 2016年02月10日 17:21:47 +0000 (2016年2月10日)
Log Message:
-----------
eregi_replace --> preg_replace
Modified Paths:
--------------
 trunk/lib/plugin/HtmlConverter.php
Modified: trunk/lib/plugin/HtmlConverter.php
===================================================================
--- trunk/lib/plugin/HtmlConverter.php	2016年02月10日 17:06:01 UTC (rev 9787)
+++ trunk/lib/plugin/HtmlConverter.php	2016年02月10日 17:21:47 UTC (rev 9788)
@@ -92,10 +92,10 @@
 private function processA(&$file)
 {
 
- $file = eregi_replace(
- "<a([[:space:]]+)href([[:space:]]*)=([[:space:]]*)\"([-/.a-zA-Z0-9_~#@%$?&=:200円-377円\(\)[:space:]]+)\"([^>]*)>", "{{\4円}}", $file);
+ $file = preg_replace(
+ "#<a([[:space:]]+)href([[:space:]]*)=([[:space:]]*)\"([-/.a-zA-Z0-9_~\#@%$?&=:200円-377円\(\)[:space:]]+)\"([^>]*)>#i", "{{\4円}}", $file);
 
- $file = eregi_replace("{{([-/a-zA-Z0-9._~#@%$?&=:200円-377円\(\)[:space:]]+)}}([^<]+)</a>", "[ \2円 | \1円 ]", $file);
+ $file = preg_replace("#{{([-/a-zA-Z0-9._~\#@%$?&=:200円-377円\(\)[:space:]]+)}}([^<]+)</a>#i", "[ \2円 | \1円 ]", $file);
 }
 
 private function processIMG(&$file)
@@ -143,29 +143,29 @@
 
 $file = str_replace("\r\n", "\n", $file);
 
- $file = eregi_replace("<h1[[:space:]]?[^>]*>", "\n\n!!!!", $file);
+ $file = preg_replace("#<h1[[:space:]]?[^>]*>#i", "\n\n!!!!", $file);
 
- $file = eregi_replace("<h2[[:space:]]?[^>]*>", "\n\n!!!", $file);
+ $file = preg_replace("#<h2[[:space:]]?[^>]*>#i", "\n\n!!!", $file);
 
- $file = eregi_replace("<h3[[:space:]]?[^>]*>", "\n\n!!", $file);
+ $file = preg_replace("#<h3[[:space:]]?[^>]*>#i", "\n\n!!", $file);
 
- $file = eregi_replace("<h4[[:space:]]?[^>]*>", "\n\n!", $file);
+ $file = preg_replace("#<h4[[:space:]]?[^>]*>#i", "\n\n!", $file);
 
- $file = eregi_replace("<h5[[:space:]]?[^>]*>", "\n\n__", $file);
+ $file = preg_replace("#<h5[[:space:]]?[^>]*>#i", "\n\n__", $file);
 
- $file = eregi_replace("</h1>", "\n\n", $file);
+ $file = preg_replace("#</h1>#i", "\n\n", $file);
 
- $file = eregi_replace("</h2>", "\n\n", $file);
+ $file = preg_replace("#</h2>#i", "\n\n", $file);
 
- $file = eregi_replace("</h3>", "\n\n", $file);
+ $file = preg_replace("#</h3>#i", "\n\n", $file);
 
- $file = eregi_replace("</h4>", "\n\n", $file);
+ $file = preg_replace("#</h4>#i", "\n\n", $file);
 
- $file = eregi_replace("</h5>", "__\n\n", $file);
+ $file = preg_replace("#</h5>#i", "__\n\n", $file);
 
- $file = eregi_replace("<hr[[:space:]]?[^>]*>", "\n----\n", $file);
+ $file = preg_replace("#<hr[[:space:]]?[^>]*>#i", "\n----\n", $file);
 
- $file = eregi_replace("<li[[:space:]]?[^>]*>", "* ", $file);
+ $file = preg_replace("#<li[[:space:]]?[^>]*>#i", "* ", $file);
 
 // strip all tags, except for <pre>, which is supported by wiki
 // and <p>'s which will be converted after compression.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9787
 http://sourceforge.net/p/phpwiki/code/9787
Author: vargenau
Date: 2016年02月10日 17:06:01 +0000 (2016年2月10日)
Log Message:
-----------
HtmlConverter plugin: check file is encoded in UTF-8
Modified Paths:
--------------
 trunk/lib/plugin/HtmlConverter.php
 trunk/lib/stdlib.php
Modified: trunk/lib/plugin/HtmlConverter.php
===================================================================
--- trunk/lib/plugin/HtmlConverter.php	2016年02月10日 14:57:07 UTC (rev 9786)
+++ trunk/lib/plugin/HtmlConverter.php	2016年02月10日 17:06:01 UTC (rev 9787)
@@ -59,7 +59,7 @@
 'name' => 'MAX_FILE_SIZE',
 'value' => MAX_UPLOAD_SIZE)));
 $contents->pushContent(HTML::input(array('name' => 'userfile',
- 'type' => 'file')));
+ 'type' => 'file', 'required' => 'required')));
 $contents->pushContent(HTML::raw(" "));
 $contents->pushContent(HTML::input(array('value' => _("Convert"),
 'type' => 'submit')));
@@ -73,10 +73,10 @@
 $userfile_tmpname = $userfile->getTmpName();
 
 if (!preg_match("/(\.html|\.htm)$/i", $userfile_name)) {
- $message->pushContent(_("Only files with extension HTML are allowed"), HTML::br(), HTML::br());
+ $message->pushContent(HTML::p(array('class' => 'error'),
+ _("Only files with extension HTML are allowed")));
 } else {
- $message->pushContent(_("Processed $userfile_name"), HTML::br(), HTML::br());
- $message->pushContent(_("Copy the output below and paste it into your Wiki page."), HTML::br());
+ $message->pushContent(HTML::p(_("Processed $userfile_name")));
 $message->pushContent($this->process($userfile_tmpname));
 }
 } else {
@@ -130,6 +130,11 @@
 {
 $result = HTML();
 $file = file_get_contents($file_name);
+ if (!is_utf8($file)) {
+ $result->pushContent(HTML::p(array('class' => 'error'),
+ _("Error: file must be encoded in UTF-8")));
+ return $result;
+ }
 $file = html_entity_decode($file);
 
 $this->processA($file);
@@ -180,6 +185,8 @@
 // strip attributes from <pre>-Tags and add a new-line before
 $file = preg_replace("_<pre(\s[^>]*|)>_iU", "\n<pre>", $file);
 
+ $result->pushContent(HTML::p(_("Copy the output below and paste it into your Wiki page.")));
+
 $outputArea = HTML::textarea(array('rows' => '30', 'cols' => '80'));
 
 $outputArea->pushContent(_($file));
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2016年02月10日 14:57:07 UTC (rev 9786)
+++ trunk/lib/stdlib.php	2016年02月10日 17:06:01 UTC (rev 9787)
@@ -2162,3 +2162,37 @@
 }
 echo "</body></html>\n";
 }
+
+/**
+ * is_utf8 - utf-8 detection
+ *
+ * @param string $str the string to analyze
+ * @return bool
+ *
+ * From http://www.php.net/manual/en/function.mb-detect-encoding.php#85294
+ */
+function is_utf8($str) {
+ $c=0; $b=0;
+ $bits=0;
+ $len=strlen($str);
+ for($i=0; $i<$len; $i++){
+ $c=ord($str[$i]);
+ if($c > 128){
+ if(($c >= 254)) return false;
+ elseif($c >= 252) $bits=6;
+ elseif($c >= 248) $bits=5;
+ elseif($c >= 240) $bits=4;
+ elseif($c >= 224) $bits=3;
+ elseif($c >= 192) $bits=2;
+ else return false;
+ if(($i+$bits) > $len) return false;
+ while($bits > 1){
+ $i++;
+ $b=ord($str[$i]);
+ if($b < 128 || $b > 191) return false;
+ $bits--;
+ }
+ }
+ }
+ return true;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9786
 http://sourceforge.net/p/phpwiki/code/9786
Author: vargenau
Date: 2016年02月10日 14:57:07 +0000 (2016年2月10日)
Log Message:
-----------
UpLoad plugin: don't inline images
Modified Paths:
--------------
 trunk/lib/plugin/UpLoad.php
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2016年02月08日 19:32:53 UTC (rev 9785)
+++ trunk/lib/plugin/UpLoad.php	2016年02月10日 14:57:07 UTC (rev 9786)
@@ -215,12 +215,16 @@
 $current = $pagehandle->getCurrentRevision();
 $version = $current->getVersion();
 $text = $current->getPackedContent();
- // don't inline images
 if (UPLOAD_USERDIR) {
- $newtext = $text . "\n* [[Upload:$username/$sanified_userfile_name]]";
+ $image_link = "Upload:$username/$sanified_userfile_name";
 } else {
- $newtext = $text . "\n* [[Upload:$sanified_userfile_name]]";
+ $image_link = "Upload:$sanified_userfile_name";
 }
+ if (!is_image($sanified_userfile_name)) {
+ // Don't inline images
+ $image_link = "[[" . $image_link . "]]";
+ }
+ $newtext = $text . "\n* " . $image_link;
 $meta = $current->_data;
 if (UPLOAD_USERDIR) {
 $meta['summary'] = sprintf(_("uploaded %s"), $username.'/'.$sanified_userfile_name);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9785
 http://sourceforge.net/p/phpwiki/code/9785
Author: vargenau
Date: 2016年02月08日 19:32:53 +0000 (2016年2月08日)
Log Message:
-----------
PhpWeather: fix table, remove links
Modified Paths:
--------------
 trunk/pgsrc/Help%2FPhpWeatherPlugin
Modified: trunk/pgsrc/Help%2FPhpWeatherPlugin
===================================================================
--- trunk/pgsrc/Help%2FPhpWeatherPlugin	2016年02月08日 15:16:52 UTC (rev 9784)
+++ trunk/pgsrc/Help%2FPhpWeatherPlugin	2016年02月08日 19:32:53 UTC (rev 9785)
@@ -1,4 +1,4 @@
-Date: Mon, 8 Feb 2016 10:24:27 +0000
+Date: Mon, 8 Feb 2016 20:29:27 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FPhpWeatherPlugin;
@@ -34,10 +34,10 @@
 
 If you want the user to be able
 to change the station using the menu, then you have to use this
-as ##<~<PhpWeather menu=true icao|~|~=EKYT>>##
+as ##<~<~PhpWeather menu=true icao|~|~=EKYT>>##
 so that the value can be overwritten when the user submits the form.
 
-If you just use ##<~<PhpWeather menu=true icao=EKYT>>##
+If you just use ##<~<~PhpWeather menu=true icao=EKYT>>##
 then nothing will happen when the user selects another station from
 the list.
 |
@@ -47,13 +47,14 @@
 Specify the country code. You can use this if you want pre-select a
 different country than the one specified in the ICAO.
 
-So using ##<~<PhpWeather menu=true cc|~|~=GB icao|~|~=KTTS>>##
+So using ##<~<~PhpWeather menu=true cc|~|~=GB icao|~|~=KTTS>>##
 will show the current weather at the NASA Shuttle Facility, United
 States (##KTTS##) and at the same time give the user a list of
 stations in the United Kingdom.
 
 As the example shows, then you
 should use ##cc|~|~=XX## when combining it with **menu** set to ##true##.
+|
 |-
 | **language**
 |
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9784
 http://sourceforge.net/p/phpwiki/code/9784
Author: vargenau
Date: 2016年02月08日 15:16:52 +0000 (2016年2月08日)
Log Message:
-----------
No space at end of line
Modified Paths:
--------------
 trunk/lib/phpweather-2.2.2/base_object.php
 trunk/lib/phpweather-2.2.2/config/connectivity_test.php
 trunk/lib/phpweather-2.2.2/config/index.php
 trunk/lib/phpweather-2.2.2/config/make_config.php
 trunk/lib/phpweather-2.2.2/config/make_db.php
 trunk/lib/phpweather-2.2.2/config/make_stations.php
 trunk/lib/phpweather-2.2.2/config/pw_dependency.php
 trunk/lib/phpweather-2.2.2/config/pw_dependency_not.php
 trunk/lib/phpweather-2.2.2/config/pw_option.php
 trunk/lib/phpweather-2.2.2/config/pw_option_select.php
 trunk/lib/phpweather-2.2.2/config/pw_option_text.php
 trunk/lib/phpweather-2.2.2/config/pw_optiongroup.php
 trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php
 trunk/lib/phpweather-2.2.2/config/pw_validator_range.php
 trunk/lib/phpweather-2.2.2/config/speed_test.php
 trunk/lib/phpweather-2.2.2/currentimage.php
 trunk/lib/phpweather-2.2.2/data_retrieval.php
 trunk/lib/phpweather-2.2.2/db/pw_db_adodb.php
 trunk/lib/phpweather-2.2.2/db/pw_db_common.php
 trunk/lib/phpweather-2.2.2/db/pw_db_dba.php
 trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php
 trunk/lib/phpweather-2.2.2/db/pw_db_null.php
 trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php
 trunk/lib/phpweather-2.2.2/db_layer.php
 trunk/lib/phpweather-2.2.2/images-test.php
 trunk/lib/phpweather-2.2.2/index.php
 trunk/lib/phpweather-2.2.2/output/pw_images.php
 trunk/lib/phpweather-2.2.2/output/pw_output.php
 trunk/lib/phpweather-2.2.2/output/pw_text.php
 trunk/lib/phpweather-2.2.2/output/pw_text_cs.php
 trunk/lib/phpweather-2.2.2/output/pw_text_da.php
 trunk/lib/phpweather-2.2.2/output/pw_text_de.php
 trunk/lib/phpweather-2.2.2/output/pw_text_en_GB.php
 trunk/lib/phpweather-2.2.2/output/pw_text_en_US.php
 trunk/lib/phpweather-2.2.2/output/pw_text_fi.php
 trunk/lib/phpweather-2.2.2/output/pw_text_hu.php
 trunk/lib/phpweather-2.2.2/output/pw_text_it.php
 trunk/lib/phpweather-2.2.2/output/pw_text_nl.php
 trunk/lib/phpweather-2.2.2/output/pw_text_no.php
 trunk/lib/phpweather-2.2.2/output/pw_text_pl.php
 trunk/lib/phpweather-2.2.2/output/pw_text_sk.php
 trunk/lib/phpweather-2.2.2/output/pw_text_sv.php
 trunk/lib/phpweather-2.2.2/output/pw_text_tr.php
 trunk/lib/phpweather-2.2.2/phpweather.php
 trunk/lib/phpweather-2.2.2/pw_utilities.php
Modified: trunk/lib/phpweather-2.2.2/base_object.php
===================================================================
--- trunk/lib/phpweather-2.2.2/base_object.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/base_object.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -4,8 +4,8 @@
 * Provides some basic capabilities like error-handling and handling
 * of defaults.
 *
- * This class handles various messages. By using this class, you'll 
- * get a set of standard methods to generate messages. You can make 
+ * This class handles various messages. By using this class, you'll
+ * get a set of standard methods to generate messages. You can make
 * error-messages, notices and print debug-information.
 *
 * @author Martin Geisler <gim...@gi...>
@@ -13,7 +13,7 @@
 * @package PHP Weather
 */
 class base_object {
- 
+
 /**
 * All the objects properties are stored in this array.
 *
@@ -33,10 +33,10 @@
 * Sets up the properties by overriding the defaults with the actual input.
 *
 * First it includes the file 'defaults-dist.php'. Next it includes
- * 'defaults.php'. You should place your local customizations in 
- * 'defaults.php' file, since it will never be overridden. 
+ * 'defaults.php'. You should place your local customizations in
+ * 'defaults.php' file, since it will never be overridden.
 * Finally it runs through $input and overrides the properties defined there.
- * 
+ *
 * @param $input array The initial properties of the object
 * @see $properties
 */
@@ -47,13 +47,13 @@
 if(file_exists(PHPWEATHER_BASE_DIR . '/defaults.php')) {
 include(PHPWEATHER_BASE_DIR . '/defaults.php');
 }
- 
+
 /* Then we override the defaults with the actual properties */
 while (list($key, $value) = each($input)) {
 $this->properties[$key] = $value;
 }
 }
- 
+
 /**
 * Changed the verbosity level.
 *
@@ -74,7 +74,7 @@
 function get_verbosity() {
 return $this->verbosity;
 }
- 
+
 /**
 * Prints an error-message and halts execution.
 *
@@ -97,7 +97,7 @@
 echo "<p><b>Fatal error:</b> $msg.</p>\n";
 }
 exit;
- } 
+ }
 }
 
 
@@ -122,17 +122,17 @@
 } else {
 die("<p><b>Warning:</b> $msg.</p>\n");
 }
- } 
+ }
 }
 
- 
+
 /**
 * Prints a message for debugging.
 *
 * The message is only printed if the third bit is set in
 * $this->properties['verbosity']. The word 'Debug:' in bold will be
 * prefixed the message.
- * 
+ *
 * @param string The debug-message.
 * @param string The name of the file where the message comes from.
 * @param string The line where the message comes from.
@@ -144,13 +144,13 @@
 } else {
 echo "<p><b>Debug:</b> $msg.</p>\n";
 }
- } 
+ }
 }
 
 /**
 * Prints properties.
 *
- * This method prints all the properties, of this object. It is only 
+ * This method prints all the properties, of this object. It is only
 * used as a tool for debugging.
 */
 function print_properties() {
@@ -158,7 +158,7 @@
 print_r($this->properties);
 echo "</pre>\n";
 }
- 
+
 }
 
 ?>
Modified: trunk/lib/phpweather-2.2.2/config/connectivity_test.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/connectivity_test.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/connectivity_test.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -1,4 +1,4 @@
-<!DOCTYPE html 
+<!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "DTD/xhtml1-transitional.dtd">
 <html>
@@ -9,7 +9,7 @@
 <body>
 
 <?php
- 
+
 function success($msg) {
 echo "<p><b><span style=\"color: green\">Success</span>:</b> $msg</p>\n";
 }
Modified: trunk/lib/phpweather-2.2.2/config/index.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/index.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/index.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -1,4 +1,4 @@
-<!DOCTYPE html 
+<!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "DTD/xhtml1-transitional.dtd">
 <html>
@@ -28,20 +28,20 @@
 
 <dl>
 <dt><a href="make_config.php">Configuration Builder</a></dt>
- 
+
 <dd>
 <p>Use this page to build a custom configuration-file for PHP
 Weather.</p>
 </dd>
- 
+
 <dt><a href="make_db.php">Database Builder</a></dt>
- 
+
 <dd>
 <p>After you've made a custom configuration using the link
 above, you'll need to use this page to create the database and fill
 it with data.</p>
 </dd>
- 
+
 <dt><a href="make_stations.php">Regenerate Stations Database</a></dt>
 
 <dd>
@@ -51,7 +51,7 @@
 href="make_db.php">Database Builder</a> to populate the database
 with data.</p>
 </dd>
- 
+
 <dt><a href="speed_test.php">Speed Test</a></dt>
 
 <dd><p>If you've configured PHP Weather to use a database, then you
@@ -59,7 +59,7 @@
 data in the database. This is what this page is for, it will
 meassure the time it takes for PHP Weather to retrieve and
 display a large number of METARs.</p>
- 
+
 <p>If you have several different databases available to you, then
 you can compare them using this page.</p>
 </dd>
Modified: trunk/lib/phpweather-2.2.2/config/make_config.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/make_config.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/make_config.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -4,7 +4,7 @@
 /* Sorry, no configuration builder for you... */
 ?>
 
-<!DOCTYPE html 
+<!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "DTD/xhtml1-transitional.dtd">
 <html>
@@ -62,7 +62,7 @@
 
 /* We have to strip slashes from the GPC variables. */
 if (get_magic_quotes_gpc() == 1) {
- 
+
 function recursive_stripslashes(&$array) {
 $keys = array_keys($array);
 foreach($keys as $key) {
@@ -83,13 +83,13 @@
 /* If $options isn't registered, then we should make the variable and
 * register it: */
 if (empty($HTTP_SESSION_VARS)) {
- 
+
 /* Common dependencies: */
 $sql_dep = new pw_dependency_or(new pw_dependency_equal('db_type', 'mysql'),
 new pw_dependency_equal('db_type', 'pgsql'));
 $dba_dep = new pw_dependency_equal('db_type', 'dba');
 $db_dep = new pw_dependency_or($sql_dep, $dba_dep);
- 
+
 $fsockopen_dep = new pw_dependency_equal('fetch_method', 'fsockopen');
 $proxy_dep = new pw_dependency_equal('use_proxy', 'true');
 
@@ -109,7 +109,7 @@
 /* This just catches the most obvious errors. */
 $table_validator = new pw_validator_ereg("Sorry, '%s' is not a valid name.",
 '^[^./]+$');
- $icao_validator = new pw_validator_ereg("Sorry, '%s' is not a valid ICAO.", 
+ $icao_validator = new pw_validator_ereg("Sorry, '%s' is not a valid ICAO.",
 '^[a-zA-Z0-9]{4}$');
 
 /* This just catches the most obvious errors. */
@@ -117,7 +117,7 @@
 '^[^/#?~]+$');
 
 /* Next comes all the options: */
- 
+
 $HTTP_SESSION_VARS['verbosity'] =
 new pw_option_select('verbosity',
 "The setting of this variable controls the amount of " .
@@ -132,13 +132,13 @@
 '5' => 'Errors + debug information',
 '6' => 'Warnings + debug information',
 '7' => 'Everything'));
- 
+
 $HTTP_SESSION_VARS['icao'] =
 new pw_option_text('icao',
 'This will be the default station used by PHP Weather. ' .
 'You should enter a valid four-letter ICAO.',
 false, $icao_validator, 'EKYT');
- 
+
 $HTTP_SESSION_VARS['pref_units'] =
 new pw_option_select('pref_units',
 'You may choose to display the data in several ' .
@@ -148,7 +148,7 @@
 'both_imperial' => 'Imperial first, then metric',
 'only_metric' => 'Only metric',
 'only_imperial' => 'Only imperial'));
- 
+
 $HTTP_SESSION_VARS['language'] =
 new pw_option_select('language',
 'PHP Weather can produce textual output using ' .
@@ -157,7 +157,7 @@
 false,
 get_languages('text'),
 'en');
- 
+
 $HTTP_SESSION_VARS['offset'] =
 new pw_option_integer('offset',
 "Due to a bug in PHP, on some systems the time reported may " .
@@ -177,7 +177,7 @@
 false,
 array('file' => 'Use the file() function',
 'fsockopen' => 'Use the fsockopen() function'));
- 
+
 $HTTP_SESSION_VARS['use_proxy'] =
 new pw_option_boolean('use_proxy',
 "Set this option to 'Yes' to enable support for a " .
@@ -185,19 +185,19 @@
 $fsockopen_dep,
 array('false' => 'No',
 'true' => 'Yes'));
- 
+
 $HTTP_SESSION_VARS['proxy_host'] =
 new pw_option_text('proxy_host',
 "This is the hostname of the proxy server.",
 $proxy_dep, $host_validator);
- 
+
 $HTTP_SESSION_VARS['proxy_port'] =
 new pw_option_integer('proxy_port',
 "This is the port number of the proxy server. The " .
 "default is what is used by the Squid proxy server. " .
 "Another common port number is '8080'",
 $proxy_dep, $port_validator, 3128);
- 
+
 $HTTP_SESSION_VARS['db_type'] =
 new pw_option_select('db_type',
 'PHP Weather can use several kinds of databases.',
@@ -216,7 +216,7 @@
 $adodb_dep,
 false, // we could try to validate the path...
 '/usr/share/adodb');
- 
+
 $HTTP_SESSION_VARS['db_adodb_driver'] =
 new pw_option_text('db_adodb_driver',
 "Please select a driver to use with the ADOdb " .
@@ -267,7 +267,7 @@
 'gdbm' => 'gdbm - The GNU database manager',
 'db2' => 'db2 - Sleepycat Softwares DB2',
 'db3' => 'db3 - Sleepycat Softwares DB3'));
- 
+
 $HTTP_SESSION_VARS['always_use_db'] =
 new pw_option_boolean('always_use_db',
 "If you set this option to 'Yes', then PHP Weather " .
@@ -276,7 +276,7 @@
 "it will still fetch new data from the Internet.",
 $db_dep,
 array('false' => 'No', 'true' => 'Yes'));
- 
+
 $HTTP_SESSION_VARS['cache_timeout'] =
 new pw_option_integer('cache_timeout',
 "This specifies when a METAR in the cache is " .
@@ -289,40 +289,40 @@
 new pw_dependency_and(new pw_dependency_equal('always_use_db', 'false'),
 $db_dep),
 false, '3600');
- 
+
 $HTTP_SESSION_VARS['db_pconnect'] =
 new pw_option_boolean('db_pconnect',
 "If you want to make a persistent connection to the " .
 "database, then set this option to 'Yes'.",
 $sql_dep,
 array('false' => 'No', 'true' => 'Yes'));
- 
+
 $HTTP_SESSION_VARS['db_port'] =
 new pw_option_integer('db_port',
 'If you have to use a non-standard port when ' .
 'connecting to the database, then please specify it ' .
 'here. If not, then just leave this field blank.',
 $sql_dep, $port_validator_empty);
- 
+
 $HTTP_SESSION_VARS['db_hostname'] =
 new pw_option_text('db_hostname',
 'This is the hostname that PHP Weather will use, ' .
 'if you choose to use a database-backend, that ' .
 'supports network connections.',
 $sql_dep, $host_validator);
- 
+
 $HTTP_SESSION_VARS['db_database'] =
 new pw_option_text('db_database',
 'This is the name of the database that PHP Weather ' .
 'should use.',
 $sql_dep, $table_validator);
- 
+
 $HTTP_SESSION_VARS['db_username'] =
 new pw_option_text('db_username',
 'This is the username that PHP Weather will use ' .
 'for accessing the database.',
 $sql_dep);
- 
+
 $HTTP_SESSION_VARS['db_password'] =
 new pw_option_text('db_password',
 'This is the password that PHP Weather will use when ' .
@@ -330,7 +330,7 @@
 "remember to protect the file after you've stored the " .
 "password in it.",
 $sql_dep);
- 
+
 $HTTP_SESSION_VARS['db_metars'] =
 new pw_option_text('db_metars',
 'This is the name of the table that is used ' .
@@ -348,15 +348,15 @@
 'This is the name of the database/table that is used ' .
 'to store the names of the stations.',
 $db_dep, $table_validator, 'pw_stations');
- 
+
 $HTTP_SESSION_VARS['db_countries'] =
 new pw_option_text('db_countries',
 'This is the name of the database that is used to ' .
 'store the names of the countries together with ' .
 'country-codes.',
 $dba_dep, $table_validator, 'pw_countries');
- 
- 
+
+
 $HTTP_SESSION_VARS['mark_begin'] =
 new pw_option_text('mark_begin',
 'This string will be placed in front of all the ' .
@@ -365,14 +365,14 @@
 "Other good choices include <code>&lt;i&gt;</code>, <code>&lt;font " .
 'color="red"&gt;</code>, etc.',
 false, false, '<b>');
- 
+
 $HTTP_SESSION_VARS['mark_end'] =
 new pw_option_text('mark_end',
 'This string is placed after all the changable parts. ' .
 'You should make sure that it closes any tags ' .
 "you've opened in <code>mark_begin</code>.",
 false, false, '</b>');
- 
+
 $HTTP_SESSION_VARS['icons_path'] =
 new pw_option_text('icons_path',
 'The path to the directory that stores the icons used in the ' .
@@ -414,8 +414,8 @@
 $HTTP_SESSION_VARS[$option]->update_value($HTTP_POST_VARS);
 }
 
-/* Grouping */ 
-$general_group = 
+/* Grouping */
+$general_group =
 new pw_optiongroup('general_group', 'General Options',
 'This is some general options for PHP Weather.',
 array('verbosity', 'icao', 'pref_units', 'language', 'offset',
@@ -444,7 +444,7 @@
 array('mark_begin', 'mark_end', 'icons_path', 'reverse_dir', 'exclude'),
 !empty($HTTP_POST_VARS['rendering_group_visible']));
 
-/* We can now generate a configuration file with the options selected so far: */ 
+/* We can now generate a configuration file with the options selected so far: */
 
 $timestamp = date ('dS of F, Y H:i:s');
 $config = "<?php
@@ -464,7 +464,7 @@
 
 ?>
 
-<!DOCTYPE html 
+<!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "DTD/xhtml1-transitional.dtd">
 <html>
Modified: trunk/lib/phpweather-2.2.2/config/make_db.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/make_db.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/make_db.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -1,4 +1,4 @@
-<!DOCTYPE html 
+<!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "DTD/xhtml1-transitional.dtd">
 <html>
@@ -47,7 +47,7 @@
 echo "<blockquote>\n";
 define('PHPWEATHER_BASE_DIR', realpath(dirname(__FILE__) . '/..'));
 require_once(PHPWEATHER_BASE_DIR . '/db_layer.php');
- 
+
 $db = new db_layer();
 if ($db->db->create_tables()) {
 $num_rows = 0;
@@ -72,11 +72,11 @@
 }
 }
 $db->db->insert_stations($data, $countries);
- 
+
 echo "<p>Data about <b>$num_rows</b> stations from " .
 "<b>$num_countries</b> countries were inserted.</p>\n";
 } else {
- echo "<p>There was a problem with the creation of the tables!</p>\n"; 
+ echo "<p>There was a problem with the creation of the tables!</p>\n";
 }
 echo "</blockquote>\n";
 }
Modified: trunk/lib/phpweather-2.2.2/config/make_stations.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/make_stations.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/make_stations.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -7,7 +7,7 @@
 
 define('PHPWEATHER_BASE_DIR', dirname(__FILE__) . '/..');
 require_once(PHPWEATHER_BASE_DIR . '/db_layer.php');
- 
+
 $db = new db_layer();
 
 $countries = $db->db->get_countries();
@@ -29,14 +29,14 @@
 foreach ($icaos as $icao => $name) {
 echo "$icao;$name\n";
 }
- 
+
 }
- 
+
 exit();
 
 }
 ?>
-<!DOCTYPE html 
+<!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "DTD/xhtml1-transitional.dtd">
 <html>
Modified: trunk/lib/phpweather-2.2.2/config/pw_dependency.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_dependency.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/pw_dependency.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -17,7 +17,7 @@
 * other dependencies, a string to match or something else.
 */
 var $dep;
- 
+
 /**
 * Constructs a new dependency.
 *
@@ -37,4 +37,4 @@
 trigger_error('Abstract method', E_USER_ERROR);
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_dependency_not.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_dependency_not.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/pw_dependency_not.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -33,4 +33,4 @@
 return !$this->dep->check();
 }
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_option.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/pw_option.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -23,7 +23,7 @@
 
 /**
 * A description of the option.
- * 
+ *
 * This should be a note that explains what this option does.
 *
 * @var string
@@ -188,4 +188,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_option_select.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option_select.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/pw_option_select.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -21,9 +21,9 @@
 function show() {
 
 if ($this->is_ready()) {
- echo "<dt>Option <code>$this->name</code>: "; 
+ echo "<dt>Option <code>$this->name</code>: ";
 echo '<select name="' . $this->name . '_value">';
- 
+
 foreach ($this->choices as $choice => $label) {
 if ($choice == $this->value) {
 echo '<option selected="selected" value="' .
@@ -43,7 +43,7 @@
 echo "\n</dd>\n";
 }
 }
- 
+
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_option_text.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option_text.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/pw_option_text.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -14,7 +14,7 @@
 '_value" value="' . htmlentities($this->value) .
 '" onkeyup="' . $this->validator->get_javascript($this->name) .
 "\" /></dt>\n";
- 
+
 echo '<dd><p>' . $this->description . "</p>\n";
 if ($this->is_valid()) {
 echo '<p id="' . $this->name . '"><font color="green">Input accepted.</font></p>';
@@ -27,4 +27,4 @@
 }
 
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_optiongroup.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_optiongroup.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/pw_optiongroup.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -21,7 +21,7 @@
 
 /**
 * Is this group visible?
- * 
+ *
 * @var boolean true if the group is visible, false otherwise.
 */
 var $visible;
@@ -93,11 +93,11 @@
 echo "<p><a href=\"javascript:toggle_group('$this->id')\" id=\"" .
 $this->id . "_text\">$text</a></p>\n";
 echo "<dl id=\"$this->id\" style=\"display: $style\">\n";
- 
+
 foreach($this->options as $option) {
 $HTTP_SESSION_VARS[$option]->show();
 }
- 
+
 echo "</dl>\n";
 echo "</dd>\n";
 
@@ -133,4 +133,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -26,7 +26,7 @@
 $this->pw_validator($error);
 $this->regex = $regex;
 }
- 
+
 /**
 * Validates input agains a regular expression.
 *
@@ -60,4 +60,4 @@
 
 
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_validator_range.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_validator_range.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/pw_validator_range.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -31,7 +31,7 @@
 * @access private
 */
 var $empty_ok;
- 
+
 /**
 * Constructs a new validator.
 *
@@ -59,7 +59,7 @@
 */
 function validate($value) {
 $this->value = $value;
- 
+
 if ($this->empty_ok && empty($value)) return true;
 
 return (ereg('^[-+]?[0-9]+$', $value) && $this->low <= $value && $value <= $this->high);
@@ -81,4 +81,4 @@
 }
 
 }
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/phpweather-2.2.2/config/speed_test.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/speed_test.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/config/speed_test.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -1,4 +1,4 @@
-<!DOCTYPE html 
+<!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "DTD/xhtml1-transitional.dtd">
 <html>
@@ -115,7 +115,7 @@
 number_format($diff * 1000, 0) . " ms</b>.</p>\n";
 
 echo '<p>Time used per METAR: <b>' .
- number_format($diff * 1000 / ($batches*32), 1) . " ms</b>.</p>\n"; 
+ number_format($diff * 1000 / ($batches*32), 1) . " ms</b>.</p>\n";
 
 ?>
 
Modified: trunk/lib/phpweather-2.2.2/currentimage.php
===================================================================
--- trunk/lib/phpweather-2.2.2/currentimage.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/currentimage.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -1,8 +1,8 @@
 <?php
 /*
 * currentimage.php
- * Return the current weather icon directly. - Can be used from 
- * HTML rather than PHP files. 
+ * Return the current weather icon directly. - Can be used from
+ * HTML rather than PHP files.
 *
 * Use: <img src="currentimage.php?icao=abcd" /> in your html
 *
@@ -22,5 +22,5 @@
 header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); // always modified
 header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
 header("Pragma: no-cache"); // HTTP/1.0
-readfile($icons->get_sky_image()); 
-?>
\ No newline at end of file
+readfile($icons->get_sky_image());
+?>
Modified: trunk/lib/phpweather-2.2.2/data_retrieval.php
===================================================================
--- trunk/lib/phpweather-2.2.2/data_retrieval.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/data_retrieval.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -62,7 +62,7 @@
 function data_retrieval($input = array()) {
 /* We start by calling the parent constructor. */
 $this->db_layer($input);
- 
+
 /* Then we set the station. */
 $this->set_icao($this->properties['icao']);
 
@@ -83,7 +83,7 @@
 function get_icao() {
 return $this->properties['icao'];
 }
- 
+
 /**
 * Sets the station or rather the ICAO.
 *
@@ -95,7 +95,7 @@
 * @param	string The ICAO of the new station.
 */
 function set_icao($new_icao) {
- 
+
 /* We start by adding slashes, since $new_icao might come directly
 * from the user.
 */
@@ -179,7 +179,7 @@
 "Pragma: no-cache\r\n".
 "Cache-Control: no-cache\r\n";
 
- if ($this->properties['use_proxy']) { 
+ if ($this->properties['use_proxy']) {
 /* We use a proxy */
 $fp = @fsockopen($this->properties['proxy_host'],
 $this->properties['proxy_port']);
@@ -279,7 +279,7 @@
 }
 
 $tmp_metar = false;
- 
+
 if ($data = $this->db->get_metar($this->get_icao())) { /* found station */
 $this->debug('get_metar_from_db(): Found the METAR in the database');
 list($metar, $timestamp, $time) = end($data);
@@ -292,7 +292,7 @@
 $tmp_metar = $metar;
 $this->metar = $metar;
 $this->metar_time = $time;
- 
+
 if ($this->properties['always_use_db'] ||
 $timestamp > time() - $this->properties['cache_timeout']) {
 	/* We have asked explicit for a cached METAR, or the METAR is
@@ -307,12 +307,12 @@
 } else {
 	/* The METAR is too old, so we fetch new */
 	$this->debug('get_metar_from_db(): The METAR for <code>' .
-		 $this->get_location() . '</code> was ' . 
+		 $this->get_location() . '</code> was ' .
 		 (time() - $this->properties['cache_timeout'] - $timestamp) .
 		 ' seconds too old.');
 	$tmp_metar = $this->get_metar_from_web(false);
 }
- 
+
 } else {
 /* We need to get a new METAR from the web. */
 $this->debug('get_metar_from_db(): New station <code>' .
@@ -325,9 +325,9 @@
 if ($this->time_from !== false) {
 if ($data = $this->db->get_metar($this->get_icao(),
 $this->time_from,
- $this->time_to)) { 
+ $this->time_to)) {
 	for($i = 0; $i < count($data); $i++) {
-	 $this->metar_arch[$i] = array('metar' => $data[$i][0], 
+	 $this->metar_arch[$i] = array('metar' => $data[$i][0],
 					'time' => $data[$i][2]);
 	}
 }
@@ -335,8 +335,8 @@
 
 return $tmp_metar;
 }
- 
 
+
 /**
 * Fetches a METAR from the Internet.
 *
@@ -353,7 +353,7 @@
 function get_metar_from_web($new_station) {
 $metar = '';
 $icao = $this->get_icao();
- 
+
 switch ($this->properties['fetch_method']) {
 case 'file':
 $metar_data = $this->get_metar_file($icao);
@@ -373,7 +373,7 @@
 * remaining lines into one line by removing new-lines:
 */
 $metar = ereg_replace("[\n\r ]+", ' ', trim(implode(' ', $metar_data)));
- 
+
 $date = explode(':', strtr($date, '/ ', '::'));
 if ($date[2] > gmdate('j')) {
 /* The day is greater that the current day of month. This
@@ -387,7 +387,7 @@
 $timestamp = gmmktime($date[3], $date[4], 0,
 $date[1], $date[2], $date[0]);
 $metar_time = $timestamp;
- 
+
 if (!ereg('[0-9]{6}Z', $metar)) {
 /* Some reports don't even have a time-part, so we insert the
 * current time. This might not be the time of the report, but
@@ -539,7 +539,7 @@
 if (!$this->db->connect()) {
 return false;
 }
- 
+
 if ($data = $this->db->get_taf($this->get_icao())) { /* found station */
 $this->debug('get_taf_from_db(): Found the TAF in the database');
 list($taf, $timestamp) = $data;
@@ -551,7 +551,7 @@
 $this->taf = $taf;
 if ($this->properties['always_use_db'] ||
 $timestamp > time() - $this->properties['cache_timeout']) {
- 
+
 /* We have asked explicit for a cached TAF, or the TAF is
 * still fresh. Either way - we return the TAF we found in
 * the database.
@@ -564,7 +564,7 @@
 } else {
 /* The TAF is too old, so we fetch new */
 	$this->debug('get_taf_from_db(): The TAF for <code>' .
- $this->get_location() . '</code> was ' . 
+ $this->get_location() . '</code> was ' .
 (time() - $this->properties['cache_timeout'] - $timestamp) .
 ' seconds too old.');
 	return $this->get_taf_from_web(false);
@@ -592,10 +592,10 @@
 * @return	string The raw TAF.
 */
 function get_taf_from_web($new_station) {
- 
+
 $taf = '';
 $icao = $this->get_icao();
- 
+
 switch ($this->properties['fetch_method']) {
 case 'file':
 $taf_data = $this->get_taf_file($icao);
@@ -605,7 +605,7 @@
 $taf_data = $this->get_taf_socket($icao);
 break;
 }
- 
+
 /* Here we test to see if we actually got a TAF. */
 if (!empty($taf_data) && count($taf_data)>0) {
 /* The first line in the file is the date */
@@ -624,7 +624,7 @@
 }
 $timestamp = gmmktime($date[3], $date[4], 0,
 $date[1], $date[2], $date[0]);
- 
+
 if (!ereg('[0-9]{6}Z', $taf)) {
 /* Some reports don't even have a time-part, so we insert the
 * current time. This might not be the time of the report, but
@@ -653,7 +653,7 @@
 }
 $timestamp = time() - $this->properties['cache_timeout'] + 600;
 }
- 
+
 $taf_time = $date[0].$date[1].$date[2].$date[3].$date[4]."00";
 
 /* We then cache the TAF in our database */
@@ -779,7 +779,7 @@
 }
 
 
- 
+
 }
 
 ?>
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_adodb.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_adodb.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_adodb.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -17,7 +17,7 @@
 * @version pw_db_adodb.php,v 1.2 2003年10月02日 22:54:46 etienne_t Exp
 */
 class pw_db_adodb extends pw_db_common {
- 
+
 /**
 * This constructor just calls the parent constructor.
 *
@@ -71,7 +71,7 @@
 $this->link_id = &ADONewConnection($this->properties['db_adodb_driver']);
 
 $this->link_id->SetFetchMode(ADODB_FETCH_BOTH);
- 
+
 if ($this->properties['db_pconnect']) {
 $this->link_id->PConnect($this->properties['db_hostname'],
 $this->properties['db_username'],
@@ -91,7 +91,7 @@
 return $this->is_connected;
 }
 
- 
+
 /**
 * Disconnects from the database.
 *
@@ -140,7 +140,7 @@
 $this->error($this->link_id->ErrorMsg());
 return false;
 }
- 
+
 return true;
 }
 
@@ -198,7 +198,7 @@
 function insert_metar($icao, $metar, $timestamp, $time) {
 $this->query(sprintf('INSERT INTO %s SET icao = "%s", time = "%s", ' .
 			 'metar = "%s", timestamp = FROM_UNIXTIME(%d)',
-			 $this->properties['db_metars'], $icao, $time, 
+			 $this->properties['db_metars'], $icao, $time,
 			 addslashes($metar), intval($timestamp)));
 $this->insert_metar_arch($icao, $metar, $time);
 }
@@ -233,14 +233,14 @@
 * @access public
 */
 function insert_metar_arch($icao, $metar, $time) {
- if(isset($this->properties['archive_metars']) && 
+ if(isset($this->properties['archive_metars']) &&
 $this->properties['archive_metars']==true) {
 $this->query(sprintf('SHOW TABLES LIKE "%s"',
 			 $this->properties['db_metars_arch']));
 if ($this->num_rows()==1) {
 	$this->query(sprintf('DELETE FROM %s WHERE icao = "%s" AND ' .
 			 'time = "%s"' ,
-			 $this->properties['db_metars_arch'], 
+			 $this->properties['db_metars_arch'],
 			 $icao,$time));
 	$this->query(sprintf('INSERT IGNORE INTO %s SET icao = "%s", ' .
 			 'time = "%s", ' .
@@ -300,7 +300,7 @@
 
 /* Set old fetch mode */
 $this->link_id->SetFetchMode($tmp_fetch_mode);
- 
+
 return $metar_array;
 }
 
@@ -341,7 +341,7 @@
 intval($timestamp), $icao));
 $this->insert_taf_arch($icao, $taf, $time);
 }
- 
+
 /**
 * Inserts an archive TAF into the database.
 *
@@ -351,14 +351,14 @@
 * @access public
 */
 function insert_taf_arch($icao, $taf, $time) {
- if(isset($this->properties['archive_tafs']) && 
+ if(isset($this->properties['archive_tafs']) &&
 $this->properties['archive_tafs']==true) {
 $this->query(sprintf('SHOW TABLES LIKE "%s"',
 			 $this->properties['db_tafs_arch']));
 if ($this->num_rows()==1) {
 	$this->query(sprintf('DELETE FROM %s WHERE icao = "%s" AND ' .
 			 'time = "%s"' ,
-			 $this->properties['db_tafs_arch'], 
+			 $this->properties['db_tafs_arch'],
 			 $icao,$time));
 	$this->query(sprintf('INSERT IGNORE INTO %s SET icao = "%s", ' .
 			 'time = "%s", ' .
@@ -396,7 +396,7 @@
 if (!$this->connect()) {
 return false; // Failure!
 }
- 
+
 /* First we make a table for the METARs */
 $this->query('DROP TABLE IF EXISTS ' . $this->properties['db_metars']);
 $this->query('CREATE TABLE ' . $this->properties['db_metars'] . '(
@@ -416,7 +416,7 @@
 PRIMARY KEY (icao)');
 
 /* We make the archival databases */
- $this->query('DROP TABLE IF EXISTS ' . $this->properties['db_metars_arch']); 
+ $this->query('DROP TABLE IF EXISTS ' . $this->properties['db_metars_arch']);
 $this->query('CREATE TABLE ' . $this->properties['db_metars_arch'] . '(
 icao char(4) NOT NULL,
 time timestamp(14) NOT NULL,
@@ -439,9 +439,9 @@
 PRIMARY KEY (icao),
 UNIQUE icao (icao),
 KEY cc (cc))');
- 
+
 return true; // Success!
- 
+
 }
 
 /**
@@ -494,7 +494,7 @@
 $country = addslashes($country);
 while(list($icao, $location) = each($data[$cc])) {
 	/* The station name might also be dangerous. */
-	$location = addslashes($location); 
+	$location = addslashes($location);
 	$this->query(sprintf('INSERT INTO %s VALUES ("%s", "%s", "%s", "%s")',
 $this->properties['db_stations'],
 $icao, addslashes($location),
@@ -517,7 +517,7 @@
 if (!$this->connect()) {
 return false;
 }
- 
+
 $this->query('SELECT DISTINCT cc, country FROM ' .
 $this->properties['db_stations'] . ' ORDER BY country');
 while($row = $this->fetch_row()) {
@@ -525,8 +525,8 @@
 }
 return $rows;
 }
- 
 
+
 /**
 * Returns an array of stations.
 *
@@ -544,7 +544,7 @@
 if (!$this->connect()) {
 return false;
 }
- 
+
 $this->query(sprintf('SELECT icao, name, country FROM %s'
 .' WHERE cc = "%s" ORDER BY name',
 $this->properties['db_stations'],
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_common.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_common.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_common.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -54,7 +54,7 @@
 * @access private
 */
 var $link_id;
- 
+
 /**
 * Contains the result ID used when fetching rows from a result-set
 * if the database backend knows about a result ID.
@@ -69,14 +69,14 @@
 *
 * $is_connected, $link_id and $result_id is set to false, to
 * indicate that we're not connected.
- * 
+ *
 * @param array the initial properties of the object
 * @see $is_connected, $link_id, $result_id
 */
 function pw_db_common($input) {
 /* We start by calling the parent constructor. */
 $this->base_object($input);
- 
+
 /* We're not connected at first, so we set these variables to
 indicate that. */
 $this->is_connected = false;
@@ -99,7 +99,7 @@
 * Or would it be better, if it was relative to PHPWEATHER_BASE_DIR?
 *
 * @see insert_metar(), update_metar()
- */ 
+ */
 function update_all_metars($file) {
 
 $fp = fopen($file, 'r');
@@ -109,24 +109,24 @@
 $skipped = 0;
 
 while (!feof($fp)) {
- 
+
 $line = trim(fgets($fp, 256));
 if ($line == '') {
 continue;
 }
- 
+
 /* We have now moved past one or more blank lines, next is the
 * date: */
 $date = explode(':', strtr($line, '/ ', '::'));
 $timestamp = gmmktime($date[3], $date[4], 0,
 $date[1], $date[2], $date[0]);
- 
+
 /* The next lines are the METAR: */
 $metar = trim(fgets($fp, 256));
 while (!feof($fp) && ($line = trim(fgets($fp, 256))) != '') {
 $metar .= ' ' . $line;
 }
- 
+
 /* The ICAO is always the first four characters in the METAR: */
 $icao = substr($metar, 0, 4);
 
@@ -155,7 +155,7 @@
 
 printf("Inserted: %5d, Updated: %5d, Skipped: %5d\n",
 $inserted, $updated, $skipped);
- 
+
 fclose($fp);
 }
 
@@ -213,8 +213,8 @@
 return $data[2];
 }
 }
- 
 
+
 }
 
 ?>
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_dba.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_dba.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_dba.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -31,7 +31,7 @@
 * A link ID to the countries database.
 *
 * We have to maintain a different link ID for each database used.
- * 
+ *
 * @var integer
 * @access private
 */
@@ -95,12 +95,12 @@
 		 $this->properties['db_metars'] . '.dba',
 		 'w',
 		 $this->properties['db_handler']);
- $this->link_stations_id = 
+ $this->link_stations_id =
 	dba_open(PHPWEATHER_BASE_DIR . '/db/files/' .
 		 $this->properties['db_stations'] . '.dba',
 		 'r',
 		 $this->properties['db_handler']);
- $this->link_countries_id = 
+ $this->link_countries_id =
 	dba_open(PHPWEATHER_BASE_DIR . '/db/files/' .
 		 $this->properties['db_countries'] . '.dba',
 		 'r',
@@ -111,12 +111,12 @@
 		 $this->properties['db_metars'] . '.dba',
 		 'w',
 		 $this->properties['db_handler']);
- $this->link_stations_id = 
+ $this->link_stations_id =
 	dba_popen(PHPWEATHER_BASE_DIR . '/db/files/' .
 		 $this->properties['db_stations'] . '.dba',
 		 'r',
 		 $this->properties['db_handler']);
- $this->link_countries_id = 
+ $this->link_countries_id =
 	dba_popen(PHPWEATHER_BASE_DIR . '/db/files/' .
 		 $this->properties['db_countries'] . '.dba',
 		 'r',
@@ -124,7 +124,7 @@
 }
 return $this->is_connected;
 }
- 
+
 /**
 * Disconnects from the database.
 *
@@ -244,12 +244,12 @@
 		 $this->properties['db_metars'] . '.dba',
 		 'n',
 		 $this->properties['db_handler']);
- $this->link_stations_id = 
+ $this->link_stations_id =
 	dba_open(PHPWEATHER_BASE_DIR . '/db/files/' .
 		 $this->properties['db_stations'] . '.dba',
 		 'n',
 		 $this->properties['db_handler']);
- $this->link_countries_id = 
+ $this->link_countries_id =
 	dba_open(PHPWEATHER_BASE_DIR . '/db/files/' .
 		 $this->properties['db_countries'] . '.dba',
 		 'n',
@@ -260,12 +260,12 @@
 		 $this->properties['db_metars'] . '.dba',
 		 'n',
 		 $this->properties['db_handler']);
- $this->link_stations_id = 
+ $this->link_stations_id =
 	dba_popen(PHPWEATHER_BASE_DIR . '/db/files/' .
 		 $this->properties['db_stations'] . '.dba',
 		 'n',
 		 $this->properties['db_handler']);
- $this->link_countries_id = 
+ $this->link_countries_id =
 	dba_popen(PHPWEATHER_BASE_DIR . '/db/files/' .
 		 $this->properties['db_countries'] . '.dba',
 		 'n',
@@ -363,7 +363,7 @@
 if (!$this->connect()) {
 return false;
 }
- 
+
 /* The name of the country is seperated from the list of ICAOs by
 * PW_FIELD_SEPERATOR (:). The name is followed by a list of ICAOs
 * which are also seperated by PW_FIELD_SEPERATOR. */
@@ -380,7 +380,7 @@
 dba_fetch($icao, $this->link_stations_id));
 $locations[$icao] = $name;
 }
- 
+
 asort($locations);
 
 return $locations;
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -13,7 +13,7 @@
 * @version pw_db_mysql.php,v 1.12 2004年01月30日 20:46:36 etienne_t Exp
 */
 class pw_db_mysql extends pw_db_common {
- 
+
 /**
 * This constructor makes sure that the MySQL extension is loaded
 * and then calls the parent constructor.
@@ -62,14 +62,14 @@
 if ($this->is_connected) {
 return true;
 }
- 
+
 if (empty($this->properties['db_port']))
 /* Default MySQL port: */
 $port = 3306;
 else
 $port = $this->properties['db_port'];
- 
 
+
 if (!$this->properties['db_pconnect']) {
 $this->link_id =
 mysql_connect($this->properties['db_hostname'] . ':' . $port,
@@ -90,7 +90,7 @@
 return $this->is_connected;
 }
 
- 
+
 /**
 * Disconnects from the database.
 *
@@ -208,7 +208,7 @@
 tms_unix2date($time), tms_unix2date($timestamp), $icao));
 $this->insert_metar_arch($icao, $metar, $time);
 }
- 
+
 /**
 * Inserts an archive METAR into the database.
 *
@@ -218,14 +218,14 @@
 * @access public
 */
 function insert_metar_arch($icao, $metar, $time) {
- if(isset($this->properties['archive_metars']) && 
+ if(isset($this->properties['archive_metars']) &&
 $this->properties['archive_metars']==true) {
 $this->query(sprintf('SHOW TABLES LIKE "%s"',
 			 $this->properties['db_metars_arch']));
 if ($this->num_rows()==1) {
 	$this->query(sprintf('DELETE FROM %s WHERE icao = "%s" AND ' .
 			 'time = "%s"' ,
-			 $this->properties['db_metars_arch'], 
+			 $this->properties['db_metars_arch'],
 			 $icao, tms_unix2date($time)));
 	$this->query(sprintf('INSERT IGNORE INTO %s SET icao = "%s", ' .
 			 'time = "%s", ' .
@@ -282,7 +282,7 @@
 	$metar_array[] = $row;
 }
 }
- 
+
 return $metar_array;
 }
 
@@ -320,7 +320,7 @@
 intval($timestamp), $icao));
 $this->insert_taf_arch($icao, $taf, $time);
 }
- 
+
 /**
 * Inserts an archive TAF into the database.
 *
@@ -330,14 +330,14 @@
 * @access public
 */
 function insert_taf_arch($icao, $taf, $time) {
- if(isset($this->properties['archive_tafs']) && 
+ if(isset($this->properties['archive_tafs']) &&
 $this->properties['archive_tafs']==true) {
 $this->query(sprintf('SHOW TABLES LIKE "%s"',
 			 $this->properties['db_tafs_arch']));
 if ($this->num_rows()==1) {
 	$this->query(sprintf('DELETE FROM %s WHERE icao = "%s" AND ' .
 			 'time = "%s"' ,
-			 $this->properties['db_tafs_arch'], 
+			 $this->properties['db_tafs_arch'],
 			 $icao,$time));
 	$this->query(sprintf('INSERT IGNORE INTO %s SET icao = "%s", ' .
 			 'time = "%s", ' .
@@ -375,7 +375,7 @@
 if (!$this->connect()) {
 return false; // Failure!
 }
- 
+
 /* First we make a table for the METARs */
 $this->query('DROP TABLE IF EXISTS ' . $this->properties['db_metars']);
 $this->query('CREATE TABLE ' . $this->properties['db_metars'] . '(
@@ -395,7 +395,7 @@
 PRIMARY KEY (icao))');
 
 /* We make the archival databases */
- $this->query('DROP TABLE IF EXISTS ' . $this->properties['db_metars_arch']); 
+ $this->query('DROP TABLE IF EXISTS ' . $this->properties['db_metars_arch']);
 $this->query('CREATE TABLE ' . $this->properties['db_metars_arch'] . '(
 icao char(4) NOT NULL,
 time timestamp(14) NOT NULL,
@@ -417,9 +417,9 @@
 country varchar(128) NOT NULL,
 PRIMARY KEY (icao),
 KEY cc (cc))');
- 
+
 return true; // Success!
- 
+
 }
 
 /**
@@ -470,7 +470,7 @@
 $country = addslashes($country);
 while(list($icao, $location) = each($data[$cc])) {
 	/* The station name might also be dangerous. */
-	$location = addslashes($location); 
+	$location = addslashes($location);
 	$this->query(sprintf('INSERT INTO %s VALUES ("%s", "%s", "%s", "%s")',
 $this->properties['db_stations'],
 $icao, addslashes($location),
@@ -493,7 +493,7 @@
 if (!$this->connect()) {
 return false;
 }
- 
+
 $this->query('SELECT DISTINCT cc, country FROM ' .
 $this->properties['db_stations'] . ' ORDER BY country');
 while($row = $this->fetch_row()) {
@@ -501,8 +501,8 @@
 }
 return $rows;
 }
- 
 
+
 /**
 * Returns an array of stations.
 *
@@ -520,7 +520,7 @@
 if (!$this->connect()) {
 return false;
 }
- 
+
 $this->query(sprintf('SELECT icao, name, country FROM %s'
 .' WHERE cc = "%s" ORDER BY name',
 $this->properties['db_stations'],
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_null.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_null.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_null.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -166,13 +166,13 @@
 $result = false; // Default result.
 $left = 0;
 $right = $size / PW_LINE_LENGTH;
- 
+
 /* We make a binary search for the right ICAO. The search
 * terminates when $right >= $left: */
 while ($left < $right) {
- 
+
 fseek($fp, PW_LINE_LENGTH * round(($left+$right)/2));
- 
+
 /* Each line contains four fields seperated by
 * PW_FIELD_SEPERATOR. The fields are: the ICAO, name of
 * station, name of country, and country code. */
@@ -234,7 +234,7 @@
 list($icao, $location) = each($data[$cc]);
 fputs($fp, " '$icao' => '" . addslashes($location) . "'");
 $stations[$icao] = array($location, $countries[$cc], $cc);
- 
+
 while(list($icao, $location) = each($data[$cc])) {
 	fputs($fp, ",\n '$icao' => '" . addslashes($location) . "'");
 	$stations[$icao] = array($location, $countries[$cc], $cc);
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -101,7 +101,7 @@
 return $this->is_connected;
 }
 
- 
+
 /**
 * Disconnects from the database.
 *
@@ -152,7 +152,7 @@
 pg_errormessage());
 /* The next row is the first row: */
 $this->next_row = 0;
- 
+
 return $this->result_id;
 }
 
@@ -278,7 +278,7 @@
 ' country varchar(128) NOT NULL)');
 $this->query('CREATE INDEX cc_key ON ' .
 $this->properties['db_stations'] . '(cc)');
- 
+
 return true; // Success!
 }
 
@@ -331,9 +331,9 @@
 $country = addslashes($country);
 while(list($icao, $location) = each($data[$cc])) {
 	/* The station name might also be dangerous. */
-	$location = addslashes($location); 
+	$location = addslashes($location);
 	$this->query('INSERT INTO ' . $this->properties['db_stations'] .
- '(icao, name, cc, country) VALUES ' . 
+ '(icao, name, cc, country) VALUES ' .
 "('$icao', '$location', '$cc', '$country')");
 }
 }
@@ -360,8 +360,8 @@
 }
 return $rows;
 }
- 
 
+
 /**
 * Returns an array of stations.
 *
@@ -377,7 +377,7 @@
 if (!$this->connect()) {
 return false;
 }
- 
+
 $this->query('SELECT icao, name, country FROM ' .
 $this->properties['db_stations'] .
 " WHERE cc = '$cc' ORDER BY name");
Modified: trunk/lib/phpweather-2.2.2/db_layer.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db_layer.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/db_layer.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -10,7 +10,7 @@
 */
 class db_layer extends base_object {
 
- /** 
+ /**
 * Variable containing the database-object.
 *
 * The database-object handles all communication with the
@@ -30,7 +30,7 @@
 function db_layer($input = array()) {
 /* We call the parent constructor. */
 $this->base_object($input);
- 
+
 /* We then create our db object */
 $this->set_db_type($this->properties['db_type']);
 }
@@ -86,7 +86,7 @@
 function get_db_type() {
 return $this->properties['db_type'];
 }
- 
+
 }
 
 
Modified: trunk/lib/phpweather-2.2.2/images-test.php
===================================================================
--- trunk/lib/phpweather-2.2.2/images-test.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/images-test.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -161,7 +161,7 @@
 'thickness' of the fog and to blend out sun light. I'm not sure that
 the skycover is being used as an indication of the 'fogginess'.
 Anyone?</li>
-</ul> 
+</ul>
 
 </p>
 <?php $images->set_time('day'); ?>
Modified: trunk/lib/phpweather-2.2.2/index.php
===================================================================
--- trunk/lib/phpweather-2.2.2/index.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/index.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -9,7 +9,7 @@
 
 $weather = new phpweather();
 
-$output = '<!DOCTYPE html 
+$output = '<!DOCTYPE html
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "DTD/xhtml1-transitional.dtd">
 <html>
@@ -95,10 +95,10 @@
 require(PHPWEATHER_BASE_DIR . "/output/pw_text_$language.php");
 $type = 'pw_text_' . $language;
 $text = new $type($weather);
- 
+
 require(PHPWEATHER_BASE_DIR . "/output/pw_images.php");
 $icons = new pw_images($weather);
- 
+
 $output .= '<p>This is the current weather in ' .
 $weather->get_location() . ":</p>\n<blockquote>\n" .
 $text->print_pretty() . "\n</blockquote>\n" .
Modified: trunk/lib/phpweather-2.2.2/output/pw_images.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_images.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/output/pw_images.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -23,10 +23,10 @@
 // =======================================================================
 // This section contains user configurable items: The user can
 // configure the image filenames to be generated by the script.
- 
+
 // An array to convert the weather group codes to an index of the
 // $images and $n_images array.
- 
+
 var $phenomena_array = array ('#' => 'None',
 'TS' => 'Thun',
 'RA' => 'Rain',
@@ -39,10 +39,10 @@
 'IC' => 'Hail',
 'BR' => 'Fog',
 'FG' => 'Fog');
- 
+
 // An array to convert the cloud coverage codes to an index of the
 // $images and $n_images array.
- 
+
 var $coverage = array ('CLR' => '0',
 'SKC' => '0',
 'FEW' => '1',
@@ -50,9 +50,9 @@
 'BKN' => '3',
 'OVC' => '4',
 'VV' => '4');
- 
+
 var $sky_nodata_image = 'sky_nodata.png';
- 
+
 // Define a lot of images for daylight weather-group/cloud
 // condition. It's a 2-dimensional array, indexed by the:
 // - Precipitation (first index)
@@ -168,7 +168,7 @@
 '3' => 'n_3cloud_fog.png',
 '4' => '4cloud_fog.png')
 );
- 
+
 // Define image filenames for:
 // - 16 wind directions,
 // - 'no wind direction data'
@@ -201,7 +201,7 @@
 // - 'no data' condition,
 // - 'temperature zero or below zero degrees Celcius
 // - 'temperature above zero degrees Celcius
- 
+
 var $temp_nodata_image = 'temp_nodata.png';
 var $temp_low_image = 'templow.png';
 var $temp_high_image = 'temphigh.png';
@@ -212,7 +212,7 @@
 // [m/s] to [Bft] (beaufort).
 
 var $wind_speeds = array (
- 'beaufort' => array (0, 1, 2, 3, 4, 5, 
+ 'beaufort' => array (0, 1, 2, 3, 4, 5,
 6, 7, 8, 9, 10, 11, 12),
 'ms' => array (0.3, 1.6, 3.4, 5.5, 8.0, 10.8,
 13.9, 17.2, 20.8, 24.5, 28.5, 32.7, 999));
@@ -250,7 +250,7 @@
 
 for ($i = 0; $i < $num_parts; $i++) {
 $part = $parts[$i];
- 
+
 if (ereg('RMK|TEMPO|BECMG', $part)) {
 /* The rest of the METAR is either a remark or temporary
 information. We skip the rest of the METAR. */
@@ -263,10 +263,10 @@
 elseif (ereg('^(-|\+|VC)?(TS|SH|FZ|BL|DR|MI|BC|PR|RA|DZ|SN|SG|GR|GS|PE|IC|UP|BR|FG|FU|VA|DU|SA|HZ|PY|PO|SQ|FC|SS|DS)+$', $part)) {
 /*
 * Is this the current weather group?
- */ 
+ */
 
 // Get the intensity and get rid of it in the $part string
- $intensity = ''; 
+ $intensity = '';
 if (ereg('^(-|\+|VC)(..)*$',$part)) {
 if ($part[0] == '-') {
 $intensity = '-';
@@ -280,7 +280,7 @@
 }
 }
 
- 
+
 // Now, take only the precipitation types that have images.
 // Ignore the others In case more then one exist, take only the
 // first one (highest predominance).
@@ -305,20 +305,20 @@
 $intensity = '-';
 }
 }
- 
+
 if (ereg('^(Rain|Snow|Hail)$',$this->phenomena_array[$phenomena])) {
 $phenomena_group = $intensity . $this->phenomena_array[$phenomena];
 } else {
 $phenomena_group = $this->phenomena_array[$phenomena];
- }	
+ }
 
- } 
-				
+ }
+
 // Now check the cloud coverage. There could be three cloud
 // layers, so check for all of them. Iconize the most covered
 // clouds, thus find the highest cloudcoverage layer, by
 // maximizing the $maxcoverage param
- 
+
 elseif (ereg('(SKC|CLR)(...)', $part, $regs)) {
 $maxcoverage = max($maxcoverage,$this->coverage[$regs[1]]);
 // if ($maxcoverage < $this->coverage[$regs[1]]) {
@@ -339,7 +339,7 @@
 $phenomena = '#';
 $phenomena_group = $this->phenomena_array[$phenomena];
 }
- 
+
 // At this point, the $phenomena_group variable contains the one
 // index of the $this->images array, while the $maxcoverage
 // variable contains the other index of the $this->images array.
@@ -348,11 +348,11 @@
 if (($night == 1) || ($this->itime == 'nite')) {
 return $this->properties['icons_path'] .
 $this->n_images[$phenomena_group][$maxcoverage];
- } else { 
+ } else {
 return $this->properties['icons_path'] .
 $this->images[$phenomena_group][$maxcoverage];
 }
- 
+
 }
 // ------------------------------------------------------------------------
 
@@ -407,7 +407,7 @@
 
 if (!empty($processed_metar_data['temperature'])) {
 if (!empty($processed_metar_data['windchill'])) {
- return $this->properties['icons_path'] . $this->temp_windchilled_image; 
+ return $this->properties['icons_path'] . $this->temp_windchilled_image;
 } elseif ($processed_metar_data['temperature']['temp_c'] > 0) {
 return $this->properties['icons_path'] . $this->temp_high_image;
 } else {
@@ -448,7 +448,7 @@
 $this->itime = $ntime;
 }
 // ------------------------------------------------------------------------
- 
+
 }
 
 ?>
Modified: trunk/lib/phpweather-2.2.2/output/pw_output.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_output.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/output/pw_output.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -17,7 +17,7 @@
 
 function pw_output($weather, $input = array()) {
 $this->weather = $weather;
- 
+
 $this->properties = $weather->properties;
 
 while (list($key, $value) = each($input)) {
@@ -32,4 +32,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/phpweather-2.2.2/output/pw_text.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text.php	2016年02月08日 12:48:14 UTC (rev 9783)
+++ trunk/lib/phpweather-2.2.2/output/pw_text.php	2016年02月08日 15:16:52 UTC (rev 9784)
@@ -60,7 +60,7 @@
 function get_charset() {
 ...
 
[truncated message content]

Revision: 9783
 http://sourceforge.net/p/phpwiki/code/9783
Author: vargenau
Date: 2016年02月08日 12:48:14 +0000 (2016年2月08日)
Log Message:
-----------
Convert files to UTF-8
Modified Paths:
--------------
 trunk/lib/phpweather-2.2.2/db/files/HU.php
 trunk/lib/phpweather-2.2.2/output/pw_text_cs.php
 trunk/lib/phpweather-2.2.2/output/pw_text_da.php
 trunk/lib/phpweather-2.2.2/output/pw_text_de.php
 trunk/lib/phpweather-2.2.2/output/pw_text_es.php
 trunk/lib/phpweather-2.2.2/output/pw_text_fi.php
 trunk/lib/phpweather-2.2.2/output/pw_text_fr.php
 trunk/lib/phpweather-2.2.2/output/pw_text_hu.php
 trunk/lib/phpweather-2.2.2/output/pw_text_pl.php
 trunk/lib/phpweather-2.2.2/output/pw_text_pt.php
 trunk/lib/phpweather-2.2.2/output/pw_text_sk.php
 trunk/lib/phpweather-2.2.2/output/pw_text_sv.php
 trunk/lib/phpweather-2.2.2/output/pw_text_tr.php
 trunk/lib/phpweather-2.2.2/phpweather.php
Modified: trunk/lib/phpweather-2.2.2/db/files/HU.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/files/HU.php	2016年02月08日 09:55:20 UTC (rev 9782)
+++ trunk/lib/phpweather-2.2.2/db/files/HU.php	2016年02月08日 12:48:14 UTC (rev 9783)
@@ -4,18 +4,18 @@
 $country = 'Hungary';
 
 $icaos = array(
- 'LHBC' => 'B\xE9k\xE9scsaba',
- 'LHBS' => 'Buda\xF6rs',
+ 'LHBC' => 'Békéscsaba',
+ 'LHBS' => 'Budaörs',
 'LHBP' => 'Budapest / Ferihegy',
 'LHBM' => 'Budapest Met Center',
 'LHDC' => 'Debrecen',
- 'LHKV' => 'Kaposv\xE1r',
- 'LHKE' => 'Kecskem\xE9t',
+ 'LHKV' => 'Kaposvár',
+ 'LHKE' => 'Kecskemét',
 'LHMC' => 'Miskolc',
- 'LHNY' => 'Nyiregyh\xE1za / Napkor',
- 'LHPA' => 'P\xE1pa',
- 'LHPP' => 'P\xE9cs / Pog\xE1ny',
- 'LHSK' => 'Si\xF3fok',
+ 'LHNY' => 'Nyiregyháza / Napkor',
+ 'LHPA' => 'Pápa',
+ 'LHPP' => 'Pécs / Pogány',
+ 'LHSK' => 'Siófok',
 'LHUD' => 'Szeged',
 'LHSN' => 'Szolnok',
 'LHSY' => 'Szombathely'
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_cs.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_cs.php	2016年02月08日 09:55:20 UTC (rev 9782)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_cs.php	2016年02月08日 12:48:14 UTC (rev 9783)
@@ -6,9 +6,9 @@
 * Provides all the strings needed by pw_text to produce Czech
 * output.
 *
- * @author V\xE1clav \xD8\xEDkal <va...@ph...>
- * @author Ondrej Jomb\xEDk <ne...@pl...>
- * @author Radoslava Fed\xE1kov\xE1 <mor...@po...>
+ * @author Václav Øíkal <va...@ph...>
+ * @author Ondrej Jombík <ne...@pl...>
+ * @author Radoslava Fedáková <mor...@po...>
 * @link http://vac.ath.cx/
 * @link http://nepto.sk/	Ondrej's personal homepage
 * @link http://platon.sk/	Platon Software Development Group
@@ -28,50 +28,50 @@
 function pw_text_cs($weather, $input = array())
 {
 $this->strings['charset'] = 'ISO-8859-2';
- $this->strings['no_data'] = 'Lituji, nejsou dostupn\xE9 \xBE\xE1dn\xE9 informace pro %s%s%s.';
+ $this->strings['no_data'] = 'Lituji, nejsou dostupné 3⁄4ádné informace pro %s%s%s.';
 $this->strings['list_sentences_and'] = ' a ';
 $this->strings['list_sentences_comma'] = ', ';
 $this->strings['list_sentences_final_and'] = ' a ';
- $this->strings['location'] = 'Toto je meterologick\xE1 zpr\xE1va leti\xB9t\xEC %s%s%s.';
+ $this->strings['location'] = 'Toto je meterologická zpráva leti1tì %s%s%s.';
 $this->strings['minutes'] = ' minutami';
- $this->strings['time_format'] = 'Zpr\xE1va byla sestavena p\xF8ed %s, v %s%s%s UTC.';
+ $this->strings['time_format'] = 'Zpráva byla sestavena pøed %s, v %s%s%s UTC.';
 $this->strings['time_minutes'] = 'a %s%s%s minutami';
 $this->strings['time_one_hour'] = '%sjednou%s hodinou %s';
 $this->strings['time_several_hours'] = '%s%s%s hodinami %s';
- $this->strings['time_a_moment'] = 'pr\xE1v\xEC te\xEF';
- $this->strings['meters_per_second'] = ' metr\xF9 za sekundu';
+ $this->strings['time_a_moment'] = 'právì teï';
+ $this->strings['meters_per_second'] = ' metrù za sekundu';
 $this->strings['miles_per_hour'] = ' mil za hodinu';
- $this->strings['meter'] = ' metr\xF9';
+ $this->strings['meter'] = ' metrù';
 $this->strings['meters'] = ' metry';
 $this->strings['feet'] = ' stop';
- $this->strings['kilometers'] = ' kilometr\xF9';
+ $this->strings['kilometers'] = ' kilometrù';
 $this->strings['miles'] = ' mil';
 $this->strings['and'] = ' a ';
 $this->strings['plus'] = ' plus ';
 $this->strings['with'] = ' s ';
- $this->strings['wind_blowing'] = 'Rychlost v\xECtru byla ';
- $this->strings['wind_with_gusts'] = ' se siln\xFDmi n\xE1razy od ';
+ $this->strings['wind_blowing'] = 'Rychlost vìtru byla ';
+ $this->strings['wind_with_gusts'] = ' se silnými nárazy od ';
 $this->strings['wind_from'] = ' z ';
- $this->strings['wind_variable'] = ' z %sr\xF9zn\xFDch%s sm\xECr\xF9';
- $this->strings['wind_varying'] = ', prom\xECnliv\xFD v\xEDtr od %s%s%s (%s%s&deg;%s) a %s%s%s (%s%s&deg;%s)';
- $this->strings['wind_calm'] = 'Bylo %sbezv\xECt\xF8\xED%s';
+ $this->strings['wind_variable'] = ' z %srùzných%s smìrù';
+ $this->strings['wind_varying'] = ', promìnlivý vítr od %s%s%s (%s%s&deg;%s) a %s%s%s (%s%s&deg;%s)';
+ $this->strings['wind_calm'] = 'Bylo %sbezvìtøí%s';
 $this->strings['wind_dir'] =
 array('severu',
- 'severu/severov\xFDchodu',
- 'severov\xFDchodu',
- 'v\xFDchodu/severov\xFDchodu',
- 'v\xFDchodu',
- 'v\xFDchodu/jihov\xFDchodu',
- 'jihov\xFDchodu',
- 'jihu/jihov\xFDchodu',
+ 'severu/severovýchodu',
+ 'severovýchodu',
+ 'východu/severovýchodu',
+ 'východu',
+ 'východu/jihovýchodu',
+ 'jihovýchodu',
+ 'jihu/jihovýchodu',
 'jihu',
- 'jihu/jihoz\xE1padu',
- 'jihoz\xE1padu',
- 'z\xE1padu/jihoz\xE1padu',
- 'z\xE1padu',
- 'z\xE1padu/severoz\xE1padu',
- 'severoz\xE1padu',
- 'severu/severoz\xE1padu',
+ 'jihu/jihozápadu',
+ 'jihozápadu',
+ 'západu/jihozápadu',
+ 'západu',
+ 'západu/severozápadu',
+ 'severozápadu',
+ 'severu/severozápadu',
 'severu');
 $this->strings['wind_dir_short'] =
 array('S',
@@ -93,80 +93,80 @@
 'S');
 $this->strings['wind_dir_short_long'] =
 array('S' => 'sever',
- 'SV' => 'severov\xFDchod',
- 'V' => 'v\xFDchod',
- 'JV' => 'jihov\xFDchod',
+ 'SV' => 'severovýchod',
+ 'V' => 'východ',
+ 'JV' => 'jihovýchod',
 'J' => 'jih',
- 'JZ' => 'jihoz\xE1pad',
- 'Z' => 'z\xE1pad',
- 'SZ' => 'severoz\xE1pad');
+ 'JZ' => 'jihozápad',
+ 'Z' => 'západ',
+ 'SZ' => 'severozápad');
 $this->strings['temperature'] = 'Teplota byla ';
- $this->strings['dew_point'] = ' a rosn\xFD bod byl ';
- $this->strings['altimeter'] = 'Atmosf\xE9rick\xFD tlak byl ';
+ $this->strings['dew_point'] = ' a rosný bod byl ';
+ $this->strings['altimeter'] = 'Atmosférický tlak byl ';
 $this->strings['hPa'] = ' hPa';
 $this->strings['inHg'] = ' inHg';
- $this->strings['rel_humidity'] = 'Relativn\xED vlhkost vzduchu byla ';
- $this->strings['feelslike'] = 'Teplota sa zd\xE1la b\xFDt ';
+ $this->strings['rel_humidity'] = 'Relativní vlhkost vzduchu byla ';
+ $this->strings['feelslike'] = 'Teplota sa zdála být ';
 $this->strings['cloud_group_beg'] = 'Bylo ';
 $this->strings['cloud_group_end'] = '.';
- $this->strings['cloud_clear'] = 'Obloha byla %sjasn\xE1%s.';
- $this->strings['cloud_height'] = ' se z\xE1kladnou mrak\xF9 ve v\xFD\xB9ce ';
- $this->strings['cloud_overcast'] = ' obloha byla %szata\xBEen\xE1%s od v\xFD\xB9ky ';
- $this->strings['cloud_vertical_visibility'] = '%svertik\xE1ln\xED viditelnost%s byla ';
+ $this->strings['cloud_clear'] = 'Obloha byla %sjasná%s.';
+ $this->strings['cloud_height'] = ' se základnou mrakù ve vý1ce ';
+ $this->strings['cloud_overcast'] = ' obloha byla %szata3⁄4ená%s od vý1ky ';
+ $this->strings['cloud_vertical_visibility'] = '%svertikální viditelnost%s byla ';
 $this->strings['cloud_condition'] =
 array('SKC' => 'jasno',
 'CLR' => 'jasno',
- 'FEW' => 'skorojasno', /*'nieko\xB5ko',*/
+ 'FEW' => 'skorojasno', /*'niekoμko',*/
 'SCT' => 'polojasno',
- 'BKN' => 'obla\xE8no',
- 'OVC' => 'zata\xBEeno');
+ 'BKN' => 'oblaèno',
+ 'OVC' => 'zata3⁄4eno');
 $this->strings['cumulonimbus'] = ' cumulonimbus';
- $this->strings['towering_cumulus'] = ' kupovit\xE1 obla\xE8nost'; /*ty\xE8\xEDci se nahromad\xECn\xE9 - to je p\xF8ece blbost*/
- $this->strings['cavok'] = ' \xBE\xE1dn\xE1 obla\xE8nost pod %s ani \xBE\xE1dn\xE1 kupovit\xE1 obla\xE8nost';
- $this->strings['currently'] = 'Aktu\xE1ln\xED po\xE8as\xED: ';
+ $this->strings['towering_cumulus'] = ' kupovitá oblaènost'; /*tyèíci se nahromadìné - to je pøece blbost*/
+ $this->strings['cavok'] = ' 3⁄4ádná oblaènost pod %s ani 3⁄4ádná kupovitá oblaènost';
+ $this->strings['currently'] = 'Aktuální poèasí: ';
 $this->strings['weather'] = 
 array(/* Intensity */
- '-' => ' slab\xFD ',
- ' ' => ' st\xF8edn\xED ',
- '+' => ' siln\xFD ',
+ '-' => ' slabý ',
+ ' ' => ' støední ',
+ '+' => ' silný ',
 /* Proximity */
- 'VC' => ' v bl\xEDzkosti',
+ 'VC' => ' v blízkosti',
 /* Descriptor */
- 'PR' => ' p\xF8ev\xE1\xBEn\xEC pokr\xFDvaj\xEDc\xED leti\xB9t\xEC',
- 'BC' => ' p\xE1sy',
- 'MI' => ' p\xF8\xEDzemn\xED',
- 'DR' => ' n\xEDzko zv\xED\xF8en\xFD',
- 'BL' => ' zv\xED\xF8en\xFD',
- 'SH' => ' p\xF8eh\xE1nky',
- 'TS' => ' bou\xF8ka',
- 'FZ' => ' n\xE1mrzaj\xEDc\xED',
+ 'PR' => ' pøevá3⁄4nì pokrývající leti1tì',
+ 'BC' => ' pásy',
+ 'MI' => ' pøízemní',
+ 'DR' => ' nízko zvíøený',
+ 'BL' => ' zvíøený',
+ 'SH' => ' pøehánky',
+ 'TS' => ' bouøka',
+ 'FZ' => ' námrzající',
 /* Precipitation */
- 'DZ' => ' mrholen\xED',
- 'RA' => ' d鹻', /* ' da\xBEdivo', */
- 'SN' => ' sn\xEDh',
- 'SG' => ' zrnit\xFD sn\xEDh',
- 'IC' => ' ledov\xE9 krystalky',
- 'PL' => ' zmrzl\xFD d鹻',
+ 'DZ' => ' mrholení',
+ 'RA' => ' dé1»', /* ' da3⁄4divo', */
+ 'SN' => ' sníh',
+ 'SG' => ' zrnitý sníh',
+ 'IC' => ' ledové krystalky',
+ 'PL' => ' zmrzlý dé1»',
 'GR' => ' kroupy',
- 'GS' => ' slab\xE9 krupobit\xED',
- 'UP' => ' nezn\xE1m\xE9',
+ 'GS' => ' slabé krupobití',
+ 'UP' => ' neznámé',
 /* Obscuration */
- 'BR' => ' kou\xF8mo',
+ 'BR' => ' kouømo',
 'FG' => ' mlha',
- 'FU' => ' kou\xF8',
- 'VA' => ' vulkanick\xFD popel',
- 'DU' => ' pra\xB9no',
- 'SA' => ' p\xEDsek', /* p\xEDse\xE8n\xE9 */
- 'HZ' => ' z\xE1kal',
- 'PY' => ' mrholen\xED s mal\xFDmi kapkami',
+ 'FU' => ' kouø',
+ 'VA' => ' vulkanický popel',
+ 'DU' => ' pra1no',
+ 'SA' => ' písek', /* píseèné */
+ 'HZ' => ' zákal',
+ 'PY' => ' mrholení s malými kapkami',
 /* Other */
- 'PO' => ' p\xEDse\xE8n\xE9 v\xEDry',
- 'SQ' => ' h\xFAlava',
- 'FC' => ' pr\xF9tr\xBE mra\xE8en',
- 'SS' => ' pra\xB9n\xE1/p\xEDse\xE8n\xE1 bou\xF8e');
- $this->strings['visibility'] = 'Celkov\xE1 viditenost byla ';
- $this->strings['visibility_greater_than'] = 'v\xECt\xB9\xED ne\xBE ';
- $this->strings['visibility_less_than'] = 'men\xB9\xED ne\xBE ';
+ 'PO' => ' píseèné víry',
+ 'SQ' => ' húlava',
+ 'FC' => ' prùtr3⁄4 mraèen',
+ 'SS' => ' pra1ná/píseèná bouøe');
+ $this->strings['visibility'] = 'Celková viditenost byla ';
+ $this->strings['visibility_greater_than'] = 'vìt1í ne3⁄4 ';
+ $this->strings['visibility_less_than'] = 'men1í ne3⁄4 ';
 $this->strings['visibility_to'] = ' do ';
 /* this is left untranslated, because I have no metar, that use
 * this text -- Nepto [14/07/2002] */
@@ -177,7 +177,7 @@
 $this->strings['runway_left'] = ' left';
 $this->strings['runway_central'] = ' central';
 $this->strings['runway_right'] = ' right';
- $this->strings['runway_visibility'] = 'Vidite\xB5nos\xBB bola ';
+ $this->strings['runway_visibility'] = 'Viditeμnos» bola ';
 $this->strings['runway_for_runway'] = ' for runway ';
 
 /* We run the parent constructor */
@@ -196,7 +196,7 @@
 case 2:
 case 3:
 case 4:
- $this->strings['meters_per_second'] = ' metr\xF9 za sekundu';
+ $this->strings['meters_per_second'] = ' metrù za sekundu';
 break;
 default:
 if ($meters_per_second - floor($meters_per_second) > 0)
@@ -207,7 +207,7 @@
 if (! empty($miles_per_hour)) {
 switch ($miles_per_hour) {
 case 1:
- $this->strings['miles_per_hour'] = ' m\xEDle za hodinu';
+ $this->strings['miles_per_hour'] = ' míle za hodinu';
 break;
 case 2:
 case 3:
@@ -219,7 +219,7 @@
 
 /*
 * Z/ZO grammar handling
- * ze severu, z jihu, ze z\xE1padu, z v\xFDchodu
+ * ze severu, z jihu, ze západu, z východu
 */
 if (isset($deg)) {
 if ($deg == 'VRB') {
@@ -265,10 +265,10 @@
 }
 } else {
 if ($minutes_old < 5) {
- /* we must remove word 'p\xF8ed', because we wanted string:
- * 'Report bol zostaven\xFD prave teraz, ...' */
+ /* we must remove word 'pøed', because we wanted string:
+ * 'Report bol zostavený prave teraz, ...' */
 $this->strings['time_format'] =
- str_replace(' p\xF8ed ', ' ', $this->strings['time_format']);
+ str_replace(' pøed ', ' ', $this->strings['time_format']);
 }
 }
 
@@ -281,10 +281,10 @@
 $this->strings['currently'] = str_replace(' bylo ', ' byly ',
 $this->strings['currently']);
 if ($weather[0]['precipitation'] == 'RA') {
- $this->strings['weather']['-'] = ' slab\xE9ho ';
- $this->strings['weather'][' '] = ' st\xF8edn\xEDho ';
- $this->strings['weather']['+'] = ' hust\xE9ho ';
- $this->strings['weather']['RA'] = ' de\xB9t\xEC';
+ $this->strings['weather']['-'] = ' slabého ';
+ $this->strings['weather'][' '] = ' støedního ';
+ $this->strings['weather']['+'] = ' hustého ';
+ $this->strings['weather']['RA'] = ' de1tì';
 }
 } elseif ($weather[0]['precipitation'] == 'RA'
 || $weather[0]['obscuration'] == 'HZ') {
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_da.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_da.php	2016年02月08日 09:55:20 UTC (rev 9782)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_da.php	2016年02月08日 12:48:14 UTC (rev 9783)
@@ -97,13 +97,13 @@
 $this->strings['hPa'] = ' hPa';
 $this->strings['inHg'] = ' inHg';
 $this->strings['rel_humidity'] = 'Den relative luftfugtigheden var ';
- $this->strings['feelslike'] = 'Temperaturen vil f\xF8les som ';
+ $this->strings['feelslike'] = 'Temperaturen vil føles som ';
 $this->strings['cloud_group_beg'] = 'Der var ';
 $this->strings['cloud_group_end'] = '.';
 $this->strings['cloud_clear'] = 'Himlen var %sskyfri%s.';
 $this->strings['cloud_height'] = ' skyer i en h&oslash;jde af ';
 $this->strings['cloud_overcast'] = 'Himlen var %soverskyet%s i en h&oslash;jde af ';
- $this->strings['cloud_vertical_visibility'] = 'en %svertikale sigtbarhed%s p\xE5 ';
+ $this->strings['cloud_vertical_visibility'] = 'en %svertikale sigtbarhed%s på ';
 $this->strings['cloud_condition'] =
 array(
 	 'SKC' => 'skyfri',
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_de.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_de.php	2016年02月08日 09:55:20 UTC (rev 9782)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_de.php	2016年02月08日 12:48:14 UTC (rev 9783)
@@ -20,7 +20,7 @@
 function pw_text_de($weather, $input = array())
 {
 $this->strings['charset'] = 'ISO-8859-1';
- $this->strings['no_data'] = 'F\xFCr %s%s%s stehen keine DATEN zur Verf\xFCgung.';
+ $this->strings['no_data'] = 'Für %s%s%s stehen keine DATEN zur Verfügung.';
 $this->strings['list_sentences_and'] = ' und ';
 $this->strings['list_sentences_comma'] = ', ';
 $this->strings['list_sentences_final_and'] = ', und ';
@@ -35,17 +35,17 @@
 $this->strings['miles_per_hour'] = ' Meilen pro Stunde';
 $this->strings['meter'] = ' m'; // Meter
 $this->strings['meters'] = ' m'; // Meter
- $this->strings['feet'] = ' Fu\xDF';
+ $this->strings['feet'] = ' Fuß';
 $this->strings['kilometers'] = ' km'; // Kilometer
 $this->strings['miles'] = ' Meilen';
 $this->strings['and'] = ' und ';
 $this->strings['plus'] = ' plus ';
 $this->strings['with'] = ' mit ';
 $this->strings['wind_blowing'] = 'Der Wind blies mit ';
- $this->strings['wind_with_gusts'] = ' B\xF6en bis zu ';
+ $this->strings['wind_with_gusts'] = ' Böen bis zu ';
 $this->strings['wind_from'] = ' und er kam aus ';
 $this->strings['wind_variable'] = ' aus %sunterschiedlichen Richtungen%s .';
- $this->strings['wind_varying'] = ', variierte zwischen %s%s%s (%s%s\xBA%s) und %s%s%s (%s%s\xBA%s)';
+ $this->strings['wind_varying'] = ', variierte zwischen %s%s%s (%s%so%s) und %s%s%s (%s%so%s)';
 $this->strings['wind_calm'] = 'Der Wind war %sruhig%s';
 $this->strings['wind_dir'] = array(
 'Nord',
@@ -53,13 +53,13 @@
 'Nordost',
 'Ost/Nordost',
 'Ost',
- 'Ost/S\xFCdost',
- 'S\xFCdost',
- 'S\xFCd/S\xFCdost',
- 'S\xFCd',
- 'S\xFCd/S\xFCdwest',
- 'S\xFCdwest',
- 'West/S\xFCdwest',
+ 'Ost/Südost',
+ 'Südost',
+ 'Süd/Südost',
+ 'Süd',
+ 'Süd/Südwest',
+ 'Südwest',
+ 'West/Südwest',
 'West',
 'West/Nordwest',
 'Nordwest',
@@ -87,32 +87,32 @@
 'N' => 'Nord',
 'NE' => 'Nordost',
 'E' => 'Ost',
- 'SE' => 'S\xFCdost',
- 'S' => 'S\xFCd',
- 'SW' => 'S\xFCdwest',
+ 'SE' => 'Südost',
+ 'S' => 'Süd',
+ 'SW' => 'Südwest',
 'W' => 'West',
 'NW' => 'Nordwest'
 );
 $this->strings['temperature'] = 'Die Temperatur betrugt ';
 $this->strings['dew_point'] = ' bei einem Taupunkt von ';
- $this->strings['altimeter'] = 'Der Luftdruck stand auf '; // Absatz eingef\xFCgt
+ $this->strings['altimeter'] = 'Der Luftdruck stand auf '; // Absatz eingefügt
 $this->strings['hPa'] = ' hPa';
 $this->strings['inHg'] = ' inHg';
 $this->strings['rel_humidity'] = 'Die relative Luftfeuchtigkeit erreichte ';
- $this->strings['feelslike'] = 'Die gef\xFChlte Temperatur lagt bei ';
- $this->strings['cloud_group_beg'] = 'Bew\xF6lkung: ';
+ $this->strings['feelslike'] = 'Die gefühlte Temperatur lagt bei ';
+ $this->strings['cloud_group_beg'] = 'Bewölkung: ';
 $this->strings['cloud_group_end'] = '.';
 $this->strings['cloud_clear'] = 'Der Himmel war %sklar%s. ';
- $this->strings['cloud_height'] = ' in der H\xF6he von ';
- $this->strings['cloud_overcast'] = ' %sbew\xF6lkt%s ';
+ $this->strings['cloud_height'] = ' in der Höhe von ';
+ $this->strings['cloud_overcast'] = ' %sbewölkt%s ';
 $this->strings['cloud_vertical_visibility'] = ' die %svertikale Sichtweite%s ';
 $this->strings['cloud_condition'] =
 array(
 	 'SKC' => 'wolkenlos',
 	 'CLR' => 'heiter ',
-	 'FEW' => 'ein wenig bew\xF6lkt',
-	 'SCT' => 'aufgelockert bew\xF6lkt',
-	 'BKN' => 'durchbrochene Bew\xF6lkung',
+	 'FEW' => 'ein wenig bewölkt',
+	 'SCT' => 'aufgelockert bewölkt',
+	 'BKN' => 'durchbrochene Bewölkung',
 	 'OVC' => 'geschlossene Wolkendecke');
 $this->strings['cumulonimbus'] = ' Gewitterwolken';
 $this->strings['towering_cumulus'] = ' Kumuli';
@@ -148,9 +148,9 @@
 	 'DU' => ' Staub',
 	 'SA' => ' Sand',
 	 'HZ' => ' Dunst',
-	 'PY' => ' Spr\xFChregen',
+	 'PY' => ' Sprühregen',
 	 'PO' => ' Staub/Sandwirbel',
-	 'SQ' => ' B\xF6en',
+	 'SQ' => ' Böen',
 	 'FC' => ' Wolkentrichter einer Wasserhose',
 	 'SS' => ' Sandsturm/Staubsturm');
 $this->strings['visibility'] = 'Die Sichtweite reichte ';
@@ -165,7 +165,7 @@
 $this->strings['runway_central'] = ' mitte';
 $this->strings['runway_right'] = ' rechts';
 $this->strings['runway_visibility'] = 'Die Sichtweite betrug ';
- $this->strings['runway_for_runway'] = ' f\xFCr die Landebahn ';
+ $this->strings['runway_for_runway'] = ' für die Landebahn ';
 
 /* We run the parent constructor */
 $this->pw_text($weather, $input);
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_es.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_es.php	2016年02月08日 09:55:20 UTC (rev 9782)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_es.php	2016年02月08日 12:48:14 UTC (rev 9783)
@@ -144,7 +144,7 @@
 'BR' => ' neblina',
 'FG' => ' niebla',
 'FU' => ' humo',
- 'VA' => ' ceniza volc�ica',
+ 'VA' => ' ceniza volcï¿1⁄2ica',
 'DU' => ' polvareda',
 'SA' => ' arena',
 'HZ' => ' calima',
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_fi.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_fi.php	2016年02月08日 09:55:20 UTC (rev 9782)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_fi.php	2016年02月08日 12:48:14 UTC (rev 9783)
@@ -19,48 +19,48 @@
 */
 function pw_text_fi($weather, $input = array()) {
 $this->strings['charset'] = 'ISO-8859-1';
- $this->strings['no_data'] = 'Valitan! Ei tietoja saatavilla %s%s%s s\xE4\xE4asemalle.';
+ $this->strings['no_data'] = 'Valitan! Ei tietoja saatavilla %s%s%s sääasemalle.';
 $this->strings['list_sentences_and'] = ' ja ';
 $this->strings['list_sentences_comma'] = ', ';
 $this->strings['list_sentences_final_and'] = ', ja ';
- $this->strings['location'] = 'T\xE4m\xE4 on raportti %s%s%s s\xE4\xE4asemalta.';
+ $this->strings['location'] = 'Tämä on raportti %s%s%s sääasemalta.';
 $this->strings['minutes'] = ' minuttteja';
- $this->strings['time_format'] = 'T\xE4m\xE4 raportti tehtiin %s sitten, kello %s%s%s UTC.';
+ $this->strings['time_format'] = 'Tämä raportti tehtiin %s sitten, kello %s%s%s UTC.';
 $this->strings['time_minutes'] = 'ja %s%s%s minuuttia';
 $this->strings['time_one_hour'] = '%s1%s tunti %s';
 $this->strings['time_several_hours'] = '%s%s%s tuntia %s';
 $this->strings['time_a_moment'] = 'hetki';
- $this->strings['meters_per_second'] = ' metri\xE4/sekunnissa';
+ $this->strings['meters_per_second'] = ' metriä/sekunnissa';
 $this->strings['miles_per_hour'] = ' mailia/tunnissa';
- $this->strings['meter'] = ' metri\xE4';
- $this->strings['meters'] = ' metri\xE4';
+ $this->strings['meter'] = ' metriä';
+ $this->strings['meters'] = ' metriä';
 $this->strings['feet'] = ' jalkaa';
- $this->strings['kilometers'] = ' kilometri\xE4';
+ $this->strings['kilometers'] = ' kilometriä';
 $this->strings['miles'] = ' mailia';
 $this->strings['and'] = ' ja ';
- $this->strings['plus'] = ' enemm\xE4n ';
+ $this->strings['plus'] = ' enemmän ';
 $this->strings['with'] = ' with ';
 $this->strings['wind_blowing'] = 'Tuulen voimakkuus ';
 $this->strings['wind_with_gusts'] = ' puskittain aina ';
 $this->strings['wind_from'] = ' alkaen ';
- $this->strings['wind_variable'] = ' muuttuen %ssuuntien%s v\xE4lill\xE4.';
- $this->strings['wind_varying'] = ', vaihdellen %s%s%s (%s%s&deg;%s) ja %s%s%s (%s%s&deg;%s) v\xE4lill\xE4';
+ $this->strings['wind_variable'] = ' muuttuen %ssuuntien%s välillä.';
+ $this->strings['wind_varying'] = ', vaihdellen %s%s%s (%s%s&deg;%s) ja %s%s%s (%s%s&deg;%s) välillä';
 $this->strings['wind_calm'] = 'Tuuli oli %styyni%s';
 $this->strings['wind_dir'] = array(
 'pohjoinen',
 'pohjoinen/koillinen',
 'koillinen',
- 'it\xE4/koillinen',
- 'it\xE4',
- 'it\xE4/kaakko',
+ 'itä/koillinen',
+ 'itä',
+ 'itä/kaakko',
 'kaakko',
- 'etel\xE4/kaakko',
- 'etel\xE4',
- 'etel\xE4/lounas',
+ 'etelä/kaakko',
+ 'etelä',
+ 'etelä/lounas',
 'lounas',
- 'l\xE4nsi/lounas',
- 'l\xE4nsi',
- 'l\xE4nsi/luode',
+ 'länsi/lounas',
+ 'länsi',
+ 'länsi/luode',
 'luode',
 'pohjoinen/luode',
 'pohjoinen');
@@ -85,44 +85,44 @@
 $this->strings['wind_dir_short_long'] = array(
 'N' => 'pohjoinen',
 'NE' => 'koillinen',
- 'E' => 'it\xE4',
+ 'E' => 'itä',
 'SE' => 'kaakko',
- 'S' => 'etel\xE4',
+ 'S' => 'etelä',
 'SW' => 'lounas',
- 'W' => 'l\xE4nsi',
+ 'W' => 'länsi',
 'NW' => 'luode'
 );
- $this->strings['temperature'] = 'L\xE4mp\xF6tila oli ';
+ $this->strings['temperature'] = 'Lämpötila oli ';
 $this->strings['dew_point'] = ', kastepisteen ollessa ';
 $this->strings['altimeter'] = 'Ilmanpaine oli ';
 $this->strings['hPa'] = ' hPa';
 $this->strings['inHg'] = ' inHg';
 $this->strings['rel_humidity'] = 'Suhteellinen kosteus oli ';
- $this->strings['feelslike'] = 'Jolloin l\xE4mp\xF6tila tuntuu kuin ';
- $this->strings['cloud_group_beg'] = 'Havainnointihetkell\xE4 ';
+ $this->strings['feelslike'] = 'Jolloin lämpötila tuntuu kuin ';
+ $this->strings['cloud_group_beg'] = 'Havainnointihetkellä ';
 $this->strings['cloud_group_end'] = '.';
- $this->strings['cloud_clear'] = 'Taivas oli %sselke\xE4%s.';
+ $this->strings['cloud_clear'] = 'Taivas oli %sselkeä%s.';
 $this->strings['cloud_height'] = ' pilvikorkeuden ollessa ';
 $this->strings['cloud_overcast'] = 'Taivas oli pilviverhossa %skokonaan%s alkaen korkeudesta ';
- $this->strings['cloud_vertical_visibility'] = ' %s pystysuuntainen n\xE4kyvyys oli %s ';
+ $this->strings['cloud_vertical_visibility'] = ' %s pystysuuntainen näkyvyys oli %s ';
 $this->strings['cloud_condition'] =
 array(
-	 'SKC' => 'selke\xE4',
-	 'CLR' => 'selke\xE4',
-	 'FEW' => 'muutamia pilvi\xE4, ',
-	 'SCT' => 'hajanaisia pilvi\xE4, ',
+	 'SKC' => 'selkeä',
+	 'CLR' => 'selkeä',
+	 'FEW' => 'muutamia pilviä, ',
+	 'SCT' => 'hajanaisia pilviä, ',
 	 'BKN' => 'rikkonainen pilvikerros, ',
-	 'OVC' => 't\xE4ysin pilvinen, ');
+	 'OVC' => 'täysin pilvinen, ');
 $this->strings['cumulonimbus'] = ' cumulonimbus';
 $this->strings['towering_cumulus'] = ' korkeaksi pullistunut cumulus';
- $this->strings['cavok'] = ' ei ollut pilvi\xE4 alle %s eik\xE4 cumulonimbus pilvi\xE4';
+ $this->strings['cavok'] = ' ei ollut pilviä alle %s eikä cumulonimbus pilviä';
 $this->strings['currently'] = 'Parhaillaan ';
 $this->strings['weather'] = 
 array(
-	 '-' => ' kevytt\xE4',
+	 '-' => ' kevyttä',
 	 ' ' => ' kohtalaista ',
 	 '+' => ' rankkaa ',
-	 'VC' => ' l\xE4heisyydess\xE4',
+	 'VC' => ' läheisyydessä',
 	 'PR' => ' osittain',
 	 'BC' => ' paikoittain',
 	 'MI' => ' matalalla',
@@ -130,41 +130,41 @@
 	 'BL' => ' tuulee',
 	 'SH' => ' kuurottaista',
 	 'TS' => ' ukkosmyrsky',
-	 'FZ' => ' j\xE4\xE4t\xE4v\xE4\xE4',
+	 'FZ' => ' jäätävää',
 	 'DZ' => ' tihkusade',
 	 'RA' => ' sadetta',
 	 'SN' => ' lunta',
 	 'SG' => ' snow grains',
-	 'IC' => ' j\xE4\xE4kiteit\xE4',
-	 'PL' => ' j\xE4\xE4 pellettej\xE4',
-	 'GR' => ' j\xE4\xE4rakeita',
+	 'IC' => ' jääkiteitä',
+	 'PL' => ' jää pellettejä',
+	 'GR' => ' jäärakeita',
 	 'GS' => ' heikkoa raetta',
 	 'UP' => ' tuntematon',
 	 'BR' => ' utua',
 	 'FG' => ' sumua',
 	 'FU' => ' savua',
 	 'VA' => ' vulkaanista tuhkaa',
-	 'DU' => ' runsaasti p\xF6ly\xE4',
+	 'DU' => ' runsaasti pölyä',
 	 'SA' => ' hiekkaa',
 	 'HZ' => ' auerta',
 	 'PY' => ' tihkusade',
-	 'PO' => ' kehittyneit\xE4 p\xF6ly/hiekka py\xF6rteit\xE4',
+	 'PO' => ' kehittyneitä pöly/hiekka pyörteitä',
 	 'SQ' => ' ukkospuuskia',
-	 'FC' => ' trombeja/tornado/vesipy\xF6rre',
-	 'SS' => ' hiekkamyrsky/p\xF6lymyrsky');
- $this->strings['visibility'] = 'N\xE4kyvyys oli ';
+	 'FC' => ' trombeja/tornado/vesipyörre',
+	 'SS' => ' hiekkamyrsky/pölymyrsky');
+ $this->strings['visibility'] = 'Näkyvyys oli ';
 $this->strings['visibility_greater_than'] = 'suurempi kuin ';
- $this->strings['visibility_less_than'] = 'v\xE4hemm\xE4n kuin ';
- $this->strings['visibility_to'] = ' ylt\xE4en ';
- $this->strings['runway_upward_tendency'] = ' jossa %syl\xF6sp\xE4in%s suuntaus';
- $this->strings['runway_downward_tendency'] = ' jossa a %salasp\xE4in%s suuntaus';
- $this->strings['runway_no_tendency'] = ' jossa %sei m\xE4\xE4ritelty\xE4%s suuntausta';
- $this->strings['runway_between'] = 'v\xE4lill\xE4 ';
+ $this->strings['visibility_less_than'] = 'vähemmän kuin ';
+ $this->strings['visibility_to'] = ' yltäen ';
+ $this->strings['runway_upward_tendency'] = ' jossa %sylöspäin%s suuntaus';
+ $this->strings['runway_downward_tendency'] = ' jossa a %salaspäin%s suuntaus';
+ $this->strings['runway_no_tendency'] = ' jossa %sei määriteltyä%s suuntausta';
+ $this->strings['runway_between'] = 'välillä ';
 $this->strings['runway_left'] = ' vasen';
- $this->strings['runway_central'] = ' keskell\xE4';
+ $this->strings['runway_central'] = ' keskellä';
 $this->strings['runway_right'] = ' oikea';
- $this->strings['runway_visibility'] = 'N\xE4kyvyys oli ';
- $this->strings['runway_for_runway'] = ' kiitotiell\xE4 ';
+ $this->strings['runway_visibility'] = 'Näkyvyys oli ';
+ $this->strings['runway_for_runway'] = ' kiitotiellä ';
 
 /* We run the parent constructor */
 $this->pw_text($weather, $input);
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_fr.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_fr.php	2016年02月08日 09:55:20 UTC (rev 9782)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_fr.php	2016年02月08日 12:48:14 UTC (rev 9783)
@@ -5,8 +5,8 @@
 /**
 * Provides all the strings needed by pw_text to produce French
 * output.
- * Contient toutes les chaines n\xE9cessaires \xE0 pw_text
- * pour produire un texte en Fran\xE7ais.
+ * Contient toutes les chaines nécessaires à pw_text
+ * pour produire un texte en Français.
 *
 * @author Guillaume Petit <gp...@fr...>
 * @link http://gpetit.fr.st My homepage.
@@ -21,33 +21,33 @@
 */
 function pw_text_fr($weather, $input = array()) {
 $this->strings['charset'] = 'ISO-8859-1';
- $this->strings['no_data'] = 'D\xE9sol\xE9! Pas d\'infos disponibles pour %s%s%s.';
+ $this->strings['no_data'] = 'Désolé! Pas d\'infos disponibles pour %s%s%s.';
 $this->strings['list_sentences_and'] = ' et ';
 $this->strings['list_sentences_comma'] = ', ';
 $this->strings['list_sentences_final_and'] = ', et ';
 $this->strings['location'] = 'Voici le bulletin pour %s%s%s.';
 $this->strings['minutes'] = ' minutes';
- $this->strings['time_format'] = 'Le bulletin a \xE9t\xE9 fait il y a %s , \xE0 %s%s%s UTC.';
+ $this->strings['time_format'] = 'Le bulletin a été fait il y a %s , à %s%s%s UTC.';
 $this->strings['time_minutes'] = 'et %s%s%s minutes';
 $this->strings['time_one_hour'] = '%sune%s heure %s';
 $this->strings['time_several_hours'] = '%s%s%s heures %s';
 $this->strings['time_a_moment'] = 'un moment';
- $this->strings['meters_per_second'] = ' m\xE8tres par seconde';
+ $this->strings['meters_per_second'] = ' mètres par seconde';
 $this->strings['miles_per_hour'] = ' miles par heure';
- $this->strings['meter'] = ' m\xE8tres';
- $this->strings['meters'] = ' m\xE8tres';
+ $this->strings['meter'] = ' mètres';
+ $this->strings['meters'] = ' mètres';
 $this->strings['feet'] = ' pieds';
- $this->strings['kilometers'] = ' kilom\xE8tres';
+ $this->strings['kilometers'] = ' kilomètres';
 $this->strings['miles'] = ' miles';
 $this->strings['and'] = ' et ';
 $this->strings['plus'] = ' plus ';
 $this->strings['with'] = ' avec ';
- $this->strings['wind_blowing'] = 'Le vent soufflait \xE0 la vitesse de ';
- $this->strings['wind_with_gusts'] = ' avec des rafales jusq\'\xE0 ';
+ $this->strings['wind_blowing'] = 'Le vent soufflait à la vitesse de ';
+ $this->strings['wind_with_gusts'] = ' avec des rafales jusq\'à ';
 $this->strings['wind_from'] = ' de ';
 $this->strings['wind_variable'] = ' de direction %svariable%.';
 $this->strings['wind_varying'] = ', variant entre %s%s%s (%s%s&deg;%s) et %s%s%s (%s%s&deg;%s)';
- $this->strings['wind_calm'] = 'Le vent \xE9tait %scalme%s';
+ $this->strings['wind_calm'] = 'Le vent était %scalme%s';
 $this->strings['wind_dir'] = array(
 	'Nord',
 	'Nord/Nord-est',
@@ -94,78 +94,78 @@
 'O' => 'ouest',
 'NO' => 'nord-ouest'
 );
- $this->strings['temperature'] = 'La temp\xE9rature \xE9tait de ';
- $this->strings['dew_point'] = ', avec un point de ros\xE9e \xE0 ';
- $this->strings['altimeter'] = 'La pression atmosph\xE9rique \xE9tait de ';
+ $this->strings['temperature'] = 'La température était de ';
+ $this->strings['dew_point'] = ', avec un point de rosée à ';
+ $this->strings['altimeter'] = 'La pression atmosphérique était de ';
 $this->strings['hPa'] = ' hPa';
 $this->strings['inHg'] = ' inHg';
- $this->strings['rel_humidity'] = 'L\'humidit\xE9 relative \xE9tait de ';
- $this->strings['feelslike'] = 'La temp\xE9rature ressentie \xE9tait de ';
+ $this->strings['rel_humidity'] = 'L\'humidité relative était de ';
+ $this->strings['feelslike'] = 'La température ressentie était de ';
 $this->strings['cloud_group_beg'] = 'Il y avait ';
 $this->strings['cloud_group_end'] = '.';
- $this->strings['cloud_clear'] = 'Le ciel \xE9tait %sclear%s.';
- $this->strings['cloud_height'] = ' de n\xE9bulosit\xE9 \xE0 une hauteur de ';
- $this->strings['cloud_overcast'] = 'Le ciel \xE9tait %snuageux%s \xE0 partir d\'une hauteur de ';
- $this->strings['cloud_vertical_visibility'] = 'La %svisibilit\xE9 verticale%s \xE9tait de ';
+ $this->strings['cloud_clear'] = 'Le ciel était %sclear%s.';
+ $this->strings['cloud_height'] = ' de nébulosité à une hauteur de ';
+ $this->strings['cloud_overcast'] = 'Le ciel était %snuageux%s à partir d\'une hauteur de ';
+ $this->strings['cloud_vertical_visibility'] = 'La %svisibilité verticale%s était de ';
 $this->strings['cloud_condition'] =
 array(
 	 'SKC' => 'clair',
 	 'CLR' => 'clair',
-	 'FEW' => '1 \xE0 2/8\xE8',
-	 'SCT' => '3 \xE0 4/8\xE8',
-	 'BKN' => '5 \xE0 7/8\xE8',
-	 'OVC' => '8/8\xE8');
+	 'FEW' => '1 à 2/8è',
+	 'SCT' => '3 à 4/8è',
+	 'BKN' => '5 à 7/8è',
+	 'OVC' => '8/8è');
 $this->strings['cumulonimbus'] = ' cumulonimbus';
 $this->strings['towering_cumulus'] = ' cumulus congestus';
 $this->strings['cavok'] = ' pas de nuages en-dessous de %s et pas de cumulonimbus';
 $this->strings['currently'] = 'Actuellement ';
 $this->strings['weather'] =
 array(
-	 '-' => ' l\xE9ger/leg\xE8re',
-	 ' ' => ' moder\xE9(e) ',
+	 '-' => ' léger/legère',
+	 ' ' => ' moderé(e) ',
 	 '+' => ' fort(e) ',
-	 'VC' => ' \xE0 proximit\xE9',
+	 'VC' => ' à proximité',
 	 'PR' => ' partiel(le)',
 	 'BC' => ' bancs',
 	 'MI' => ' peu dense',
-	 'DR' => ' d\xE9rivant',
-	 'BL' => ' se d\xE9veloppant',
+	 'DR' => ' dérivant',
+	 'BL' => ' se développant',
 	 'SH' => ' averses de',
 	 'TS' => ' orage',
 	 'FZ' => ' givrant',
 	 'DZ' => ' bruine',
 	 'RA' => ' pluie',
 	 'SN' => ' neige',
-	 'SG' => ' gr\xE9sil',
+	 'SG' => ' grésil',
 	 'IC' => ' cristaux de glace',
 	 'PL' => ' granules de glace',
-	 'GR' => ' gr\xEAle',
-	 'GS' => ' gr\xEAle fine',
+	 'GR' => ' grêle',
+	 'GS' => ' grêle fine',
 	 'UP' => ' inconnu',
 	 'BR' => ' brume',
 	 'FG' => ' bruillard',
-	 'FU' => ' fum\xE9e',
+	 'FU' => ' fumée',
 	 'VA' => ' cendre volcanique',
-	 'DU' => ' poussi\xE8re r\xE9pandue',
+	 'DU' => ' poussière répandue',
 	 'SA' => ' sable',
 	 'HZ' => ' brume',
 	 'PY' => ' gouttes',
 	 'PO' => ' tourbillons de sable',
 	 'SQ' => ' grains',
 	 'FC' => ' tornade',
-	 'SS' => ' temp\xEAte de sable/poussi\xE8re');
- $this->strings['visibility'] = 'La visibilit\xE9 globale \xE9tait de ';
- $this->strings['visibility_greater_than'] = 'sup\xE9rieure \xE0 ';
- $this->strings['visibility_less_than'] = 'inf\xE9rieure \xE0 ';
- $this->strings['visibility_to'] = ' \xE0 ';
- $this->strings['runway_upward_tendency'] = ' avec tendance \xE0 l\'%am\xE9lioration%s';
- $this->strings['runway_downward_tendency'] = ' avec tendance \xE0 la %sd\xE9terioration%s';
+	 'SS' => ' tempête de sable/poussière');
+ $this->strings['visibility'] = 'La visibilité globale était de ';
+ $this->strings['visibility_greater_than'] = 'supérieure à ';
+ $this->strings['visibility_less_than'] = 'inférieure à ';
+ $this->strings['visibility_to'] = ' à ';
+ $this->strings['runway_upward_tendency'] = ' avec tendance à l\'%amélioration%s';
+ $this->strings['runway_downward_tendency'] = ' avec tendance à la %sdéterioration%s';
 $this->strings['runway_no_tendency'] = ' sans tendance %sdistinctive%s';
 $this->strings['runway_between'] = 'entre ';
 $this->strings['runway_left'] = ' gauche';
 $this->strings['runway_central'] = ' centrale';
 $this->strings['runway_right'] = ' droite';
- $this->strings['runway_visibility'] = 'La visibilit\xE9 \xE9tait de ';
+ $this->strings['runway_visibility'] = 'La visibilité était de ';
 $this->strings['runway_for_runway'] = ' pour la piste ';
 
 /* We run the parent constructor */
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_hu.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_hu.php	2016年02月08日 09:55:20 UTC (rev 9782)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_hu.php	2016年02月08日 12:48:14 UTC (rev 9783)
@@ -5,10 +5,10 @@
 /**
 * Provides all the strings needed by pw_text to produce 
 * Hungarian output.
- * A magyar sz\xF6veg\xFB id\xF5j\xE1r\xE1sjelent\xE9shez a pw_text innen
+ * A magyar szövegû idõjárásjelentéshez a pw_text innen
 * veszi a sztringeket.
 *
- * @author Mih\xE1ly Gyulai 
+ * @author Mihály Gyulai 
 * @link http://gyulai.freeyellow.com/ The homepage of the author.
 * @version pw_text_hu.php,v 1.14 2003年09月16日 22:57:11 gimpster Exp
 */
@@ -18,62 +18,62 @@
 * This constructor provides all the strings used.
 *
 * @param array This is just passed on to pw_text().
- *		 Ezt a param\xE9tert \xE1tadjuk pw_text() -nek.
+ *		 Ezt a paramétert átadjuk pw_text() -nek.
 */
 function pw_text_hu($weather, $input = array()) {
 $this->strings['charset'] = 'ISO-8859-2';
- $this->strings['no_data'] = 'Sajnos nincs adat %s%s%s sz\xE1m\xE1ra.';
- $this->strings['list_sentences_and'] = ' \xE9s ';
+ $this->strings['no_data'] = 'Sajnos nincs adat %s%s%s számára.';
+ $this->strings['list_sentences_and'] = ' és ';
 $this->strings['list_sentences_comma'] = ', ';
- $this->strings['list_sentences_final_and'] = ', \xE9s ';
- $this->strings['location'] = 'Id\xF5j\xE1r\xE1sjelent\xE9s %s%s%s sz\xE1m\xE1ra.';
+ $this->strings['list_sentences_final_and'] = ', és ';
+ $this->strings['location'] = 'Idõjárásjelentés %s%s%s számára.';
 $this->strings['minutes'] = ' ';
- $this->strings['time_format'] = 'A jelent\xE9s %s perccel ezel\xF5tt k\xE9sz\xFClt, %s%s%s UTC-kor.';
- $this->strings['time_minutes'] = '\xE9s %s%s%s ';
- $this->strings['time_one_hour'] = '%segy%s \xF3r\xE1val %s';
- $this->strings['time_several_hours'] = '%s%s%s \xF3r\xE1val %s';
+ $this->strings['time_format'] = 'A jelentés %s perccel ezelõtt készült, %s%s%s UTC-kor.';
+ $this->strings['time_minutes'] = 'és %s%s%s ';
+ $this->strings['time_one_hour'] = '%segy%s órával %s';
+ $this->strings['time_several_hours'] = '%s%s%s órával %s';
 $this->strings['time_a_moment'] = 'jelenleg';
 $this->strings['meters_per_second'] = ' m/s';
- $this->strings['miles_per_hour'] = ' m\xE9rf\xF6ld/h';
+ $this->strings['miles_per_hour'] = ' mérföld/h';
 $this->strings['meter'] = ' m';
 $this->strings['meters'] = ' m';
- $this->strings['feet'] = ' l\xE1b';
+ $this->strings['feet'] = ' láb';
 $this->strings['kilometers'] = ' km';
- $this->strings['miles'] = ' m\xE9rf\xF6ld';
- $this->strings['and'] = ' \xE9s ';
- $this->strings['plus'] = ' \xE9s ';
+ $this->strings['miles'] = ' mérföld';
+ $this->strings['and'] = ' és ';
+ $this->strings['plus'] = ' és ';
 $this->strings['with'] = '';
- $this->strings['wind_blowing'] = 'Sz\xE9lsebess\xE9g: ';
- $this->strings['wind_with_gusts'] = ' sz\xE9ll\xF6k\xE9sek: ';
- $this->strings['wind_from'] = ' ir\xE1nya: ';
- $this->strings['wind_variable'] = ' %sk\xFCl\xF6nb\xF6z\xF5%s ir\xE1nyokb\xF3l.';
- $this->strings['wind_varying'] = ', v\xE1ltozik %s%s%s (%s%s&deg;%s) \xE9s %s%s%s (%s%s&deg;%s) k\xF6z\xF6tt';
- $this->strings['wind_calm'] = 'Sz\xE9l %snem f\xFAjt%s';
+ $this->strings['wind_blowing'] = 'Szélsebesség: ';
+ $this->strings['wind_with_gusts'] = ' széllökések: ';
+ $this->strings['wind_from'] = ' iránya: ';
+ $this->strings['wind_variable'] = ' %skülönbözõ%s irányokból.';
+ $this->strings['wind_varying'] = ', változik %s%s%s (%s%s&deg;%s) és %s%s%s (%s%s&deg;%s) között';
+ $this->strings['wind_calm'] = 'Szél %snem fújt%s';
 
 $this->strings['wind_dir'] = array(
- '\xC9szak',
- '\xC9szak/\xC9szakkelet',
- '\xC9szakkelet',
- 'Kelet/\xC9szakkelet',
+ 'Észak',
+ 'Észak/Északkelet',
+ 'Északkelet',
+ 'Kelet/Északkelet',
 'Kelet',
- 'Kelet/D\xE9lkelet',
- 'D\xE9lkelet',
- 'D\xE9l/D\xE9lkelet',
- 'D\xE9l',
- 'D\xE9l/D\xE9lnyugat',
- 'D\xE9lnyugat',
- 'Nyugat/D\xE9lnyugat',
+ 'Kelet/Délkelet',
+ 'Délkelet',
+ 'Dél/Délkelet',
+ 'Dél',
+ 'Dél/Délnyugat',
+ 'Délnyugat',
+ 'Nyugat/Délnyugat',
 'Nyugat',
- 'Nyugat/\xC9szaknyugat',
- '\xC9szaknyugat',
- '\xC9szak/\xC9szaknyugat',
- '\xC9szak');
+ 'Nyugat/Északnyugat',
+ 'Északnyugat',
+ 'Észak/Északnyugat',
+ 'Észak');
 
 $this->strings['wind_dir_short'] = array(
- '\xC9',
- '\xC9/\xC9K',
- '\xC9K',
- 'K/\xC9K',
+ 'É',
+ 'É/ÉK',
+ 'ÉK',
+ 'K/ÉK',
 'K',
 'K/DK',
 'DK',
@@ -83,98 +83,98 @@
 'DNY',
 'NY/DNY',
 'NY',
- 'NY/\xC9NY',
- '\xC9NY',
- '\xC9/\xC9NY',
- '\xC9'
+ 'NY/ÉNY',
+ 'ÉNY',
+ 'É/ÉNY',
+ 'É'
 );
 
 $this->strings['wind_dir_short_long'] = array(
- '\xC9' => '\xE9szaki',
- '\xC9K' => '\xE9szakkeleti',
+ 'É' => 'északi',
+ 'ÉK' => 'északkeleti',
 'K' => 'keleti',
- 'DK' => 'd\xE9lkeleti',
- 'D' => 'd\xE9li',
- 'DNY' => 'd\xE9lnyugati',
+ 'DK' => 'délkeleti',
+ 'D' => 'déli',
+ 'DNY' => 'délnyugati',
 'NY' => 'nyugati',
- '\xC9NY' => '\xE9szaknyugati'
+ 'ÉNY' => 'északnyugati'
 );
 
- $this->strings['temperature'] = 'A h\xF5m\xE9rs\xE9klet ';
+ $this->strings['temperature'] = 'A hõmérséklet ';
 $this->strings['dew_point'] = ', a harmatpont ';
- $this->strings['altimeter'] = 'A l\xE9gk\xF6ri nyom\xE1s ';
+ $this->strings['altimeter'] = 'A légköri nyomás ';
 $this->strings['hPa'] = ' hPa';
 $this->strings['inHg'] = ' inHg';
- $this->strings['rel_humidity'] = 'A relat\xEDv p\xE1ratartalom ';
- $this->strings['feelslike'] = 'A h\xF5\xE9rzet ';
- $this->strings['cloud_group_beg'] = 'Az \xE9gbolton';
- $this->strings['cloud_group_end'] = ' magass\xE1gban.';
- $this->strings['cloud_clear'] = 'Az \xE9gbolt %sfelh\xF5tlen%s volt.';
- $this->strings['cloud_height'] = 'felh\xF5 ';
- $this->strings['cloud_overcast'] = 'az \xE9gbolt %sborult%s ';
- $this->strings['cloud_vertical_visibility'] = 'a %sf\xFCgg\xF5leges l\xE1that\xF3s\xE1g%s ';
+ $this->strings['rel_humidity'] = 'A relatív páratartalom ';
+ $this->strings['feelslike'] = 'A hõérzet ';
+ $this->strings['cloud_group_beg'] = 'Az égbolton';
+ $this->strings['cloud_group_end'] = ' magasságban.';
+ $this->strings['cloud_clear'] = 'Az égbolt %sfelhõtlen%s volt.';
+ $this->strings['cloud_height'] = 'felhõ ';
+ $this->strings['cloud_overcast'] = 'az égbolt %sborult%s ';
+ $this->strings['cloud_vertical_visibility'] = 'a %sfüggõleges láthatóság%s ';
 
 $this->strings['cloud_condition'] = array(
-	 'SKC' => ' der\xFClt',
+	 'SKC' => ' derült',
 	 'CLR' => ' tiszta',
-	 'FEW' => ' n\xE9h\xE1ny ',
-	 'SCT' => ' sz\xF3rv\xE1nyos ',
+	 'FEW' => ' néhány ',
+	 'SCT' => ' szórványos ',
 	 'BKN' => ' szakadozott ',
 	 'OVC' => ' borult');
 
 $this->strings['cumulonimbus'] = ' gomoly';
 $this->strings['towering_cumulus'] = ' vihar';
- $this->strings['cavok'] = ' nincsenek felh\xF5k %s magass\xE1gban, \xE9s nincs gomolyfelh\xF5';
- $this->strings['currently'] = 'Jellemz\xF5: ';
+ $this->strings['cavok'] = ' nincsenek felhõk %s magasságban, és nincs gomolyfelhõ';
+ $this->strings['currently'] = 'Jellemzõ: ';
 
 $this->strings['weather'] = array(
- '-' => ' k\xF6nny\xFB ',
+ '-' => ' könnyû ',
 ' ' => ' enyhe ',
- '+' => ' er\xF5s ',
- 'VC' => ' a k\xF6zelben',
- 'PR' => ' r\xE9szleges',
+ '+' => ' erõs ',
+ 'VC' => ' a közelben',
+ 'PR' => ' részleges',
 'BC' => ' szakadozott',
- 'MI' => ' felsz\xEDnes',
- 'DR' => 'enyhe l\xE9gmozg\xE1s',
- 'BL' => 'sz\xE9ll\xF6k\xE9s',
- 'SH' => 'z\xE1por',
+ 'MI' => ' felszínes',
+ 'DR' => 'enyhe légmozgás',
+ 'BL' => 'széllökés',
+ 'SH' => 'zápor',
 'TS' => 'zivatar',
 'FZ' => 'fagy',
- 'DZ' => 'szit\xE1l\xF3 es\xF5',
- 'RA' => 'es\xF5',
- 'SN' => 'h\xF3',
- 'SG' => 'szemcs\xE9s h\xF3',
- 'IC' => 'j\xE9gkrist\xE1ly',
- 'PE' => 'j\xE9gdara',
- 'GR' => 'j\xE9ges\xF5',
- 'GS' => 'apr\xF3 j\xE9ges\xF5 \xE9s/vagy h\xF3dara',
+ 'DZ' => 'szitáló esõ',
+ 'RA' => 'esõ',
+ 'SN' => 'hó',
+ 'SG' => 'szemcsés hó',
+ 'IC' => 'jégkristály',
+ 'PE' => 'jégdara',
+ 'GR' => 'jégesõ',
+ 'GS' => 'apró jégesõ és/vagy hódara',
 'UP' => 'ismeretlen',
- 'BR' => 'k\xF6d',
- 'FG' => 's\xFBr\xFB k\xF6d',
- 'FU' => 'f\xFCst',
- 'VA' => 'vulk\xE1ni hamu',
+ 'BR' => 'köd',
+ 'FG' => 'sûrû köd',
+ 'FU' => 'füst',
+ 'VA' => 'vulkáni hamu',
 'DU' => 'kiterjedt por',
 'SA' => 'homok',
- 'HZ' => 'p\xE1ra',
+ 'HZ' => 'pára',
 'PY' => 'permet',
- 'PO' => 'por/homok \xF6rv\xE9ny',
- 'SQ' => 'sz\xE9lroham',
- 'FC' => 'felh\xF5t\xF6lcs\xE9r/torn\xE1d\xF3/v\xEDzoszlop',
+ 'PO' => 'por/homok örvény',
+ 'SQ' => 'szélroham',
+ 'FC' => 'felhõtölcsér/tornádó/vízoszlop',
 'SS' => 'homokvihar/porvihar'
 );
 
- $this->strings['visibility'] = 'A l\xE1that\xF3s\xE1g \xE1ltal\xE1ban ';
+ $this->strings['visibility'] = 'A láthatóság általában ';
 $this->strings['visibility_greater_than'] = 'nagyobb, mint ';
 $this->strings['visibility_less_than'] = 'kisebb, mint ';
- $this->strings['runway_upward_tendency'] = ' %sn\xF6vekv\xF5%s tendenci\xE1val';
- $this->strings['runway_downward_tendency'] = ' %scs\xF6kken\xF5%s tendenci\xE1val';
- $this->strings['runway_no_tendency'] = ' hat\xE1rozott %stendencia n\xE9lk\xFCl%s';
- $this->strings['runway_between'] = 'k\xF6z\xF6tti? ';
+ $this->strings['runway_upward_tendency'] = ' %snövekvõ%s tendenciával';
+ $this->strings['runway_downward_tendency'] = ' %scsökkenõ%s tendenciával';
+ $this->strings['runway_no_tendency'] = ' határozott %stendencia nélkül%s';
+ $this->strings['runway_between'] = 'közötti? ';
 $this->strings['runway_left'] = ' bal';
- $this->strings['runway_central'] = ' k\xF6z\xE9ps\xF5';
+ $this->strings['runway_central'] = ' középsõ';
 $this->strings['runway_right'] = ' jobb';
- $this->strings['runway_visibility'] = 'A l\xE1that\xF3s\xE1g ';
- $this->strings['runway_for_runway'] = ' a kifut\xF3p\xE1ly\xE1n ';
+ $this->strings['runway_visibility'] = 'A láthatóság ';
+ $this->strings['runway_for_runway'] = ' a kifutópályán ';
 
 /* We run the parent constructor */
 
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_pl.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_pl.php	2016年02月08日 09:55:20 UTC (rev 9782)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_pl.php	2016年02月08日 12:48:14 UTC (rev 9783)
@@ -19,51 +19,51 @@
 */
 function pw_text_pl($weather, $input = array()) {
 $this->strings['charset'] = 'ISO-8859-2';
- $this->strings['no_data'] = 'Przepraszamy! Nie ma danych dost\xEApnych dla %s%s%s.';
+ $this->strings['no_data'] = 'Przepraszamy! Nie ma danych dostêpnych dla %s%s%s.';
 $this->strings['list_sentences_and'] = ' i ';
 $this->strings['list_sentences_comma'] = ', ';
 $this->strings['list_sentences_final_and'] = ', i ';
 $this->strings['location'] = 'To jest raport dla %s%s%s.';
 $this->strings['minutes'] = ' minut';
- $this->strings['time_format'] = 'Raport zosta\xB3 utworzony %s temu, o godzinie %s%s%s UTC.';
+ $this->strings['time_format'] = 'Raport zosta3 utworzony %s temu, o godzinie %s%s%s UTC.';
 $this->strings['time_minutes'] = 'i %s%s%s minut';
- $this->strings['time_one_hour'] = '%sjedn\xB1%s godzin\xEA %s';
+ $this->strings['time_one_hour'] = '%sjedn±%s godzinê %s';
 $this->strings['time_several_hours'] = '%s%s%s godzin %s';
- $this->strings['time_a_moment'] = 'chwil\xEA';
- $this->strings['meters_per_second'] = ' metr\xF3w na sekund\xEA';
- $this->strings['miles_per_hour'] = ' mil na godzin\xEA';
- $this->strings['meter'] = ' metr\xF3w';
- $this->strings['meters'] = ' metr\xF3w';
- $this->strings['feet'] = ' st\xF3p';
- $this->strings['kilometers'] = ' kilometr\xF3w';
+ $this->strings['time_a_moment'] = 'chwilê';
+ $this->strings['meters_per_second'] = ' metrów na sekundê';
+ $this->strings['miles_per_hour'] = ' mil na godzinê';
+ $this->strings['meter'] = ' metrów';
+ $this->strings['meters'] = ' metrów';
+ $this->strings['feet'] = ' stóp';
+ $this->strings['kilometers'] = ' kilometrów';
 $this->strings['miles'] = ' mil';
 $this->strings['and'] = ' i ';
 $this->strings['plus'] = ' plus ';
 $this->strings['with'] = ' z ';
- $this->strings['wind_blowing'] = 'Wiatr wia\xB3 z pr\xEAdko\xB6ci\xB1 ';
+ $this->strings['wind_blowing'] = 'Wiatr wia3 z prêdko¶ci± ';
 $this->strings['wind_with_gusts'] = ' w porywach do ';
 $this->strings['wind_from'] = ' z kierunku ';
 $this->strings['wind_variable'] = ' ze %szmiennego%s kierunku';
- $this->strings['wind_varying'] = ', wahaj\xB1ce si\xEA pomi\xEAdzy %s%s%s (%s%s&deg;%s) a %s%s%s (%s%s&deg;%s)';
- $this->strings['wind_calm'] = 'Wiatr by\xB3 %sspokojny%s';
+ $this->strings['wind_varying'] = ', wahaj±ce siê pomiêdzy %s%s%s (%s%s&deg;%s) a %s%s%s (%s%s&deg;%s)';
+ $this->strings['wind_calm'] = 'Wiatr by3 %sspokojny%s';
 $this->strings['wind_dir'] = array(
- 'p\xF3\xB3nocnego',
- 'p\xF3\xB3nocnego/p\xF3\xB3nocno-wschodniego',
- 'p\xF3\xB3nocno-wschodniego',
- 'wschodniego/po\xB3nocno-wschodniego',
+ 'pó3nocnego',
+ 'pó3nocnego/pó3nocno-wschodniego',
+ 'pó3nocno-wschodniego',
+ 'wschodniego/po3nocno-wschodniego',
 'wschodniego',
- 'wschodniego/po\xB3udniowo-wschodniego',
- 'po\xB3udnioweo-wschodniego',
- 'po\xB3udniowego/po\xB3udniowo-wschodniego',
- 'po\xB3udniowego',
- 'po\xB3udniowego/po\xB3udniowo-zachodniego',
- 'po\xB3udniowo-zachodniego',
- 'zachodniego/po\xB3udniowo-zachodniego',
+ 'wschodniego/po3udniowo-wschodniego',
+ 'po3udnioweo-wschodniego',
+ 'po3udniowego/po3udniowo-wschodniego',
+ 'po3udniowego',
+ 'po3udniowego/po3udniowo-zachodniego',
+ 'po3udniowo-zachodniego',
+ 'zachodniego/po3udniowo-zachodniego',
 'zachodniego',
- 'zachodniego/p\xF3\xB3nocno-zachodniego',
- 'p\xF3\xB3nocno-zachodniego',
- 'p\xF3\xB3nocnego/p\xF3\xB3nocno-zachodniego',
- 'p\xF3\xB3nocnego');
+ 'zachodniego/pó3nocno-zachodniego',
+ 'pó3nocno-zachodniego',
+ 'pó3nocnego/pó3nocno-zachodniego',
+ 'pó3nocnego');
 $this->strings['wind_dir_short'] = array(
 'N',
 'NNE',
@@ -92,19 +92,19 @@
 'W' => 'west',
 'NW' => 'northwest'
 );
- $this->strings['temperature'] = 'Temperatura wynosi\xB3a ';
+ $this->strings['temperature'] = 'Temperatura wynosi3a ';
 $this->strings['dew_point'] = ', punkt rosy ';
- $this->strings['altimeter'] = 'Ci\xB6nienie QHN wynosi\xB3o ';
+ $this->strings['altimeter'] = 'Ci¶nienie QHN wynosi3o ';
 $this->strings['hPa'] = ' hPa';
 $this->strings['inHg'] = ' inHg';
- $this->strings['rel_humidity'] = 'Wilgotno\xB6\xE6 wzgl\xEAdna wynosi\xB3a ';
- $this->strings['feelslike'] = 'Temperatura by\xB3a odczuwalna jako ';
- $this->strings['cloud_group_beg'] = 'By\xB3o ';
+ $this->strings['rel_humidity'] = 'Wilgotno¶æ wzglêdna wynosi3a ';
+ $this->strings['feelslike'] = 'Temperatura by3a odczuwalna jako ';
+ $this->strings['cloud_group_beg'] = 'By3o ';
 $this->strings['cloud_group_end'] = '.';
- $this->strings['cloud_clear'] = 'Niebo by\xB3o %sczyste%s.';
- $this->strings['cloud_height'] = ' na wysoko\xB6ci ';
- $this->strings['cloud_overcast'] = 'Ca\xB3kowite %szachmurzenie%s o podstawie ';
- $this->strings['cloud_vertical_visibility'] = '%spionowa widzialno\xB6\xE6%s ';
+ $this->strings['cloud_clear'] = 'Niebo by3o %sczyste%s.';
+ $this->strings['cloud_height'] = ' na wysoko¶ci ';
+ $this->strings['cloud_overcast'] = 'Ca3kowite %szachmurzenie%s o podstawie ';
+ $this->strings['cloud_vertical_visibility'] = '%spionowa widzialno¶æ%s ';
 $this->strings['cloud_condition'] =
 array(
 	 'SKC' => 'niebo bezchmurne',
@@ -112,58 +112,58 @@
 	 'FEW' => 'zachmurzenie niewielkie (1/8 - 2/8)',
 	 'SCT' => 'zachmurzenie rozrzucone (3/8 - 4/8)',
 	 'BKN' => 'zachmurzenie poprzerywane (5/8 - 7/8) ',
-	 'OVC' => 'zachmurzenie ca\xB3kowite (8/8)');
+	 'OVC' => 'zachmurzenie ca3kowite (8/8)');
 $this->strings['cumulonimbus'] = ' cumulonimbus';
- $this->strings['towering_cumulus'] = ' cumulus wypi\xEAtrzony';
- $this->strings['cavok'] = ' brak chmur poni\xBFej %s, brak cumulonimbus\xF3w oraz brak zjawisk atmosferycznych';
+ $this->strings['towering_cumulus'] = ' cumulus wypiêtrzony';
+ $this->strings['cavok'] = ' brak chmur poni¿ej %s, brak cumulonimbusów oraz brak zjawisk atmosferycznych';
 $this->strin...
 
[truncated message content]

Revision: 9782
 http://sourceforge.net/p/phpwiki/code/9782
Author: vargenau
Date: 2016年02月08日 09:55:20 +0000 (2016年2月08日)
Log Message:
-----------
Remove useless PHP Weather files
Removed Paths:
-------------
 trunk/lib/phpweather-2.2.2/doc/
 trunk/lib/phpweather-2.2.2/test.php
 trunk/lib/phpweather-2.2.2/test2.php
Deleted: trunk/lib/phpweather-2.2.2/test.php
===================================================================
--- trunk/lib/phpweather-2.2.2/test.php	2016年02月08日 09:44:57 UTC (rev 9781)
+++ trunk/lib/phpweather-2.2.2/test.php	2016年02月08日 09:55:20 UTC (rev 9782)
@@ -1,76 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"DTD/xhtml1-transitional.dtd">
-<html>
-<head>
- <link rel="stylesheet" type="text/css" href="pw_style.css" />
- <title>PHP Weather - Test Page</title>
-</head>
-<body>
-
-<img src="icons/phpweather-long-white.png" width="187" height="50"
-alt="PHP Weather" align="right" />
-
-<h1>PHP Weather Test Page</h1>
-
-<p>You can use this page to test a specific METAR report. Enter the
-report below, select a language and see how PHP Weather handles the
-report:</p>
-
-<?php
-error_reporting(E_ALL);
-
-/* We need the GET variables: */
-extract($HTTP_GET_VARS);
-
-/* Load PHP Weather */
-require('phpweather.php');
-/* Load utilities to make forms */
-require('pw_utilities.php');
-
-if (empty($language)) $language = 'en';
-
-$weather = new phpweather();
-
-?>
-
-<form action="test.php" method="GET">
-<p>Metar: <input type="text" name="metar" size="60"
- value="<?php if (!empty($metar)) echo $metar; ?>"></p>
-<p>Language: <?php echo get_languages_select($language); ?>
-<input type="submit"></p>
-</form>
-
-<?php
-if (!empty($metar)) {
-
- $weather->set_metar($metar);
- 
- require(PHPWEATHER_BASE_DIR . "/output/pw_text_$language.php");
- require(PHPWEATHER_BASE_DIR . "/output/pw_images.php");
- 
- $type = 'pw_text_' . $language;
- $text = new $type($weather);
-
- echo "<h2>Report made by <code>$type</code></h2>\n";
- 
- echo "<p>\n" . $text->print_pretty() . "</p>\n";
-
- echo "<h2>Images selected by <code>pw_images</code></h2>\n";
-
- $icons = new pw_images($weather);
- echo '<p><img src="'.$icons->get_sky_image().'" /> ';
- echo '<img src="'.$icons->get_winddir_image().'" /> ';
- echo '<img src="'.$icons->get_temp_image().'" /></p>';
-
- echo "<h2>The decoded METAR follows</h2>\n";
-
- echo "<pre>\n";
- print_r($weather->decode_metar());
- echo "</pre>\n";
-
-}
-
-?>
-
-</body>
-</html>
Deleted: trunk/lib/phpweather-2.2.2/test2.php
===================================================================
--- trunk/lib/phpweather-2.2.2/test2.php	2016年02月08日 09:44:57 UTC (rev 9781)
+++ trunk/lib/phpweather-2.2.2/test2.php	2016年02月08日 09:55:20 UTC (rev 9782)
@@ -1,63 +0,0 @@
-<?php
-
-/*
-Call with a icao parameter i.e. test2.php?icao=KSFO
-
-You can add time_from and time_to to get only parts of the taf 
-i.e. test2.php?icao=CYUL&time_from=20030920220000&time_to=20030920230000
-*/
-
-error_reporting(E_ALL);
-
-/* We need the GET variables: */
-extract($HTTP_GET_VARS);
-
-/* Load PHP Weather */
-require('phpweather.php');
-
-if (empty($language)) $language = 'en';
-
-$weather = new phpweather();
-// $weather->properties['verbosity'] = 5;
-
-if (!empty($icao)) {
-
- $weather->set_icao($icao); 
-
- $language = 'en';
- require(PHPWEATHER_BASE_DIR . "/output/pw_text_$language.php");
- $type = 'pw_text_' . $language;
- $text = new $type($weather);
- 
- require(PHPWEATHER_BASE_DIR . "/output/pw_images.php");
- $icons = new pw_images($weather);
-
-
- echo "METAR for $icao : ".$weather->get_metar()."<br>\n";
-// echo "<br>Decoded METAR:<pre>";
-// $weather->decode_metar();
-// print_r( $weather->decoded_metar );
-// echo "</pre><br>\n";
-
-// echo "time:".$weather->decoded_metar["time"]."<br>";
-// echo "time:".tms_unix2date($weather->decoded_metar["time"])."<br>";
-
-
- echo "TAF for $icao : ".$weather->get_taf()."<br>\n"; 
- echo "<br>Print TAF:<br><br>";
- if(empty($time_from) || empty($time_to) || $time_from=="" || $time_to=="") 
- $text->print_taf();
- else $text->print_taf($time_from,$time_to);
- echo "<br>\n";
-
- echo "taf: <pre>";print_r($weather->taf);echo "</pre><br>";
- $weather->decode_taf();
- echo "decoded_taf: <pre>";print_r($weather->decoded_taf);echo "</pre><br>";
-
- 
-}
-
-?>
-
-</body>
-</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9781
 http://sourceforge.net/p/phpwiki/code/9781
Author: vargenau
Date: 2016年02月08日 09:44:57 +0000 (2016年2月08日)
Log Message:
-----------
phpweather-2.2.2 included in PhpWiki; PhpWeather plugin allowed in Fusionforge
Modified Paths:
--------------
 trunk/config/config-dist.ini
 trunk/configurator.php
 trunk/lib/IniConfig.php
 trunk/lib/plugin/PhpWeather.php
 trunk/locale/Makefile
 trunk/locale/de/LC_MESSAGES/phpwiki.mo
 trunk/locale/es/LC_MESSAGES/phpwiki.mo
 trunk/locale/fr/LC_MESSAGES/phpwiki.mo
 trunk/locale/it/LC_MESSAGES/phpwiki.mo
 trunk/locale/ja/LC_MESSAGES/phpwiki.mo
 trunk/locale/nl/LC_MESSAGES/phpwiki.mo
 trunk/locale/po/de.po
 trunk/locale/po/es.po
 trunk/locale/po/fr.po
 trunk/locale/po/it.po
 trunk/locale/po/ja.po
 trunk/locale/po/nl.po
 trunk/locale/po/phpwiki.pot
 trunk/locale/po/sv.po
 trunk/locale/po/zh.po
 trunk/locale/sv/LC_MESSAGES/phpwiki.mo
 trunk/locale/zh/LC_MESSAGES/phpwiki.mo
 trunk/pgsrc/Help%2FPluginManagerPlugin
 trunk/pgsrc/ReleaseNotes
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/config/config-dist.ini	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -1252,10 +1252,6 @@
 ; http://edgar.netflint.net/howto.php
 ;MY_JABBER_ID =
 
-; PhpWeather needs this external php project
-; http://sourceforge.net/projects/phpweather/
-;PHPWEATHER_BASE_DIR =
-
 ;===========================================================================
 ; Part Eight: PLUGINCACHED Pear/Cache Settings
 ;===========================================================================
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/configurator.php	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -1580,8 +1580,6 @@
 new _define_commented_optional('PLOTICUS_PREFABS'); // /usr/share/ploticus
 $properties["MY_JABBER_ID"] =
 new _define_commented_optional('MY_JABBER_ID'); //
-$properties["PHPWEATHER_BASE_DIR"] =
- new _define_commented_optional('PHPWEATHER_BASE_DIR'); //
 
 $properties["Part Eight"] =
 new part('_part8', $SEPARATOR . "\n", "
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/lib/IniConfig.php	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -633,6 +633,7 @@
 $AllAllowedPlugins[] = 'PageTrail';
 $AllAllowedPlugins[] = 'PhotoAlbum';
 $AllAllowedPlugins[] = 'PhpHighlight';
+ $AllAllowedPlugins[] = 'PhpWeather';
 $AllAllowedPlugins[] = 'PopularTags';
 $AllAllowedPlugins[] = 'PopUp';
 $AllAllowedPlugins[] = 'PrevNext';
@@ -680,7 +681,6 @@
 $AllAllowedPlugins[] = 'HtmlConverter';
 $AllAllowedPlugins[] = 'JabberPresence';
 $AllAllowedPlugins[] = 'ListPages';
- $AllAllowedPlugins[] = 'PhpWeather';
 $AllAllowedPlugins[] = 'Ploticus';
 $AllAllowedPlugins[] = 'PopularNearby';
 $AllAllowedPlugins[] = 'PreferenceApp';
Modified: trunk/lib/plugin/PhpWeather.php
===================================================================
--- trunk/lib/plugin/PhpWeather.php	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/lib/plugin/PhpWeather.php	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -21,11 +21,6 @@
 */
 
 /**
- * This plugin requires a separate program called PhpWeather. For more
- * information and to download PhpWeather, see:
- *
- * http://sourceforge.net/projects/phpweather/
- *
 * Usage:
 *
 * <<PhpWeather >>
@@ -74,11 +69,6 @@
 */
 function run($dbi, $argstr, &$request, $basepage)
 {
- // When 'phpweather/phpweather.php' is not installed then
- // PHPWEATHER_BASE_DIR will be undefined.
- if (!defined('PHPWEATHER_BASE_DIR'))
- return $this->error(_("You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)")); //early return
-
 require_once(PHPWEATHER_BASE_DIR . '/output/pw_images.php');
 require_once(PHPWEATHER_BASE_DIR . '/pw_utilities.php');
 
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/locale/Makefile	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -153,6 +153,279 @@
 ${POT_FILE}: .././lib/pear/File_Passwd.php
 ${POT_FILE}: .././lib/pear/JSON.php
 ${POT_FILE}: .././lib/pear/PEAR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/base_object.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/connectivity_test.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/index.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/make_config.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/make_db.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/make_stations.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_dependency_and.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_dependency_equal.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_dependency_not.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_dependency_or.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_dependency.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_option_boolean.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_optiongroup.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_option_integer.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_option_multi_select.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_option.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_option_select.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_option_text.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_validator_ereg.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_validator.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/pw_validator_range.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/reset_session.php
+${POT_FILE}: .././lib/phpweather-2.2.2/config/speed_test.php
+${POT_FILE}: .././lib/phpweather-2.2.2/currentimage.php
+${POT_FILE}: .././lib/phpweather-2.2.2/data_retrieval.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AF.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AG.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AL.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AN.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AO.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AQ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AT.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AU.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AW.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/AZ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BA.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BB.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BD.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BF.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BG.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BH.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BI.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BJ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BN.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BO.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BS.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BW.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BY.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/BZ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CA.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CD.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CF.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CG.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CH.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CI.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CK.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CL.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CN.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CO.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/countries.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CU.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CV.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CX.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CY.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/CZ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/DE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/DJ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/DK.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/DM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/DO.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/DZ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/EC.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/EE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/EG.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/EH.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ES.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ET.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/FI.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/FJ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/FK.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/FM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/FR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GA.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GB.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GD.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GF.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GH.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GI.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GL.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GN.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GP.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GQ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GS.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GT.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GW.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/GY.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/HK.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/HN.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/HR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/HT.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/HU.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ID.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IL.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IN.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IO.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IQ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IS.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/IT.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/JM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/JO.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/JP.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KH.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KI.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KN.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KP.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KW.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KY.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/KZ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LA.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LB.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LC.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LK.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LS.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LT.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LU.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LV.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/LY.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MA.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MD.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MG.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MH.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MK.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ML.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MO.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MQ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MT.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MU.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MV.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MW.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MX.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MY.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/MZ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NA.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NC.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NG.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NI.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NL.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NO.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NP.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/NZ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/OM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PA.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PF.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PG.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PH.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PK.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PL.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PT.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PW.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/PY.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/QA.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/RE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/RO.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/RU.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/RW.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SA.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SB.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SC.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SD.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SG.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SH.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SI.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SK.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SL.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SN.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SO.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ST.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SV.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SY.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/SZ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TD.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TG.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TH.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TJ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TL.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TN.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TO.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TR.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TT.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TV.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TW.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/TZ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/UA.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/UG.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/UM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/US.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/UY.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/UZ.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/VC.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/VE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/VG.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/VI.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/VN.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/VU.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/WS.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/YE.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/YU.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ZA.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ZM.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/files/ZW.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db_layer.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/pw_db_adodb.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/pw_db_common.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/pw_db_dba.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/pw_db_mysql.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/pw_db_null.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db/pw_db_pgsql.php
+${POT_FILE}: .././lib/phpweather-2.2.2/db_updater.php
+${POT_FILE}: .././lib/phpweather-2.2.2/defaults-dist.php
+${POT_FILE}: .././lib/phpweather-2.2.2/images-test.php
+${POT_FILE}: .././lib/phpweather-2.2.2/index.php
+${POT_FILE}: .././lib/phpweather-2.2.2/languages.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_images.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_output.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_cs.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_da.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_de.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_en_GB.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_en.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_en_US.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_es.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_fi.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_fr.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_hu.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_it.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_nl.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_no.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_pl.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_pt.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_sk.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_sv.php
+${POT_FILE}: .././lib/phpweather-2.2.2/output/pw_text_tr.php
+${POT_FILE}: .././lib/phpweather-2.2.2/phpweather.php
+${POT_FILE}: .././lib/phpweather-2.2.2/pw_utilities.php
+${POT_FILE}: .././lib/phpweather-2.2.2/test2.php
+${POT_FILE}: .././lib/phpweather-2.2.2/test.php
 ${POT_FILE}: .././lib/plugin/AddComment.php
 ${POT_FILE}: .././lib/plugin/AllPages.php
 ${POT_FILE}: .././lib/plugin/AllUsers.php
@@ -333,7 +606,7 @@
 ${POT_FILE}: .././lib/WikiDB/backend/PDO_pgsql.php
 ${POT_FILE}: .././lib/WikiDB/backend/PDO.php
 ${POT_FILE}: .././lib/WikiDB/backend/PearDB_ffpgsql.php
-${POT_FILE}: .././lib/WikiDB/backend/PearDB_mysql.php
+${POT_FILE}: .././lib/WikiDB/backend/PearDB_mysqli.php
 ${POT_FILE}: .././lib/WikiDB/backend/PearDB_oci8.php
 ${POT_FILE}: .././lib/WikiDB/backend/PearDB_pgsql.php
 ${POT_FILE}: .././lib/WikiDB/backend/PearDB.php
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/locale/po/de.po	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年12月10日 18:54+0100\n"
+"POT-Creation-Date: 2016年02月08日 10:40+0100\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -2266,9 +2266,6 @@
 msgid "Provide weather reports from the Internet."
 msgstr "Der PhpWetter plugin gibt Auskunft zur Wetterlage vom Internet."
 
-msgid "You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"
-msgstr ""
-
 #, php-format
 msgid "The ICAO "%s" wasn't recognized."
 msgstr "Die angegebene ICAO »%s« war nicht bekannt."
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/locale/po/es.po	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年12月10日 18:54+0100\n"
+"POT-Creation-Date: 2016年02月08日 10:40+0100\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2205,9 +2205,6 @@
 msgid "Provide weather reports from the Internet."
 msgstr ""
 
-msgid "You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"
-msgstr ""
-
 #, php-format
 msgid "The ICAO "%s" wasn't recognized."
 msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/locale/po/fr.po	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年12月10日 18:54+0100\n"
+"POT-Creation-Date: 2016年02月08日 10:40+0100\n"
 "PO-Revision-Date: 2004年06月22日 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -2241,11 +2241,6 @@
 msgid "Provide weather reports from the Internet."
 msgstr "Météo importée d'internet."
 
-msgid "You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"
-msgstr ""
-"Vous devez définir PHPWEATHER_BASE_DIR avant de l'utiliser (config/config."
-"ini)"
-
 #, php-format
 msgid "The ICAO "%s" wasn't recognized."
 msgstr "L'ICAO « %s » n'a pas été reconnu."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/locale/po/it.po	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年12月10日 18:54+0100\n"
+"POT-Creation-Date: 2016年02月08日 10:40+0100\n"
 "PO-Revision-Date: 2005年02月12日 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -2184,9 +2184,6 @@
 msgid "Provide weather reports from the Internet."
 msgstr ""
 
-msgid "You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"
-msgstr ""
-
 #, php-format
 msgid "The ICAO "%s" wasn't recognized."
 msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/locale/po/ja.po	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年12月10日 18:54+0100\n"
+"POT-Creation-Date: 2016年02月08日 10:40+0100\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2206,9 +2206,6 @@
 msgid "Provide weather reports from the Internet."
 msgstr ""
 
-msgid "You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"
-msgstr ""
-
 #, php-format
 msgid "The ICAO "%s" wasn't recognized."
 msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/locale/po/nl.po	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年12月10日 18:54+0100\n"
+"POT-Creation-Date: 2016年02月08日 10:40+0100\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -2173,9 +2173,6 @@
 msgid "Provide weather reports from the Internet."
 msgstr ""
 
-msgid "You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"
-msgstr ""
-
 #, php-format
 msgid "The ICAO "%s" wasn't recognized."
 msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/locale/po/phpwiki.pot	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年12月10日 18:54+0100\n"
+"POT-Creation-Date: 2016年02月08日 10:40+0100\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -2167,9 +2167,6 @@
 msgid "Provide weather reports from the Internet."
 msgstr ""
 
-msgid "You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"
-msgstr ""
-
 #, php-format
 msgid "The ICAO "%s" wasn't recognized."
 msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/locale/po/sv.po	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年12月10日 18:54+0100\n"
+"POT-Creation-Date: 2016年02月08日 10:40+0100\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2168,9 +2168,6 @@
 msgid "Provide weather reports from the Internet."
 msgstr ""
 
-msgid "You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"
-msgstr ""
-
 #, php-format
 msgid "The ICAO "%s" wasn't recognized."
 msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/locale/po/zh.po	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年12月10日 18:54+0100\n"
+"POT-Creation-Date: 2016年02月08日 10:40+0100\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2258,9 +2258,6 @@
 msgid "Provide weather reports from the Internet."
 msgstr "PhpWeather plugin 由網路取得資訊並提供天氣報告."
 
-msgid "You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"
-msgstr ""
-
 #, php-format
 msgid "The ICAO "%s" wasn't recognized."
 msgstr "ICAO "%s" 無法被認可."
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/pgsrc/Help%2FPluginManagerPlugin
===================================================================
--- trunk/pgsrc/Help%2FPluginManagerPlugin	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/pgsrc/Help%2FPluginManagerPlugin	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -1,4 +1,4 @@
-Date: 2015年12月10日 18:48:03 +0000
+Date: Mon, 8 Feb 2016 10:43:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=Help%2FPluginManagerPlugin;
@@ -56,7 +56,6 @@
 * [[ftp://ftp.dante.de/tex-archive/support/latex2html | LaTeX2HTML]] for the [[Help:TexToPngPlugin|TexToPng]] plugin and [[Help:TeX2pngPlugin|TeX2png]] plugin,
 * [[http://graphviz.org/ | graphviz]] for the [[Help:GraphVizPlugin|GraphViz]] plugin and [[Help:VisualWikiPlugin|VisualWiki]] plugin,
 * [[http://ploticus.sourceforge.net/ | ploticus]] for the [[Help:PloticusPlugin|Ploticus]] plugin,
-* [[http://phpweather.sf.net | phpweather]] for the [[Help:PhpWeatherPlugin|PhpWeather]] plugin,
 * USE_DB_SESSION = true (default for the peardb, adodb or dba backends) for the [[Help:WhoIsOnlinePlugin|WhoIsOnline]] plugin,
 * --with-xml support (with expat or libxml2) for the [[Help:RssFeedPlugin|RssFeed]] plugin (~ProjectSummary, ~RecentReleases) and ~HtmlParser support (~ImportHtml, ~HtmlAreaEditing),
 * PHP Mail functionality (php.ini: SMTP + sendmail_from on Windows or sendmail_path) for email PageChangeNotifications and ModeratedPage's,
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016年02月08日 09:26:42 UTC (rev 9780)
+++ trunk/pgsrc/ReleaseNotes	2016年02月08日 09:44:57 UTC (rev 9781)
@@ -1,4 +1,4 @@
-Date: Thu, 4 Jan 2016 21:47:53 +0000
+Date: Mon, 8 Feb 2016 10:43:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -10,8 +10,9 @@
 
 == 1.5.6 2016-XX-XX Marc-Etienne Vargenau ==
 
-* Use ##mysqli## instead of ##mysql##
+* Pear: use ##mysqli## instead of ##mysql##
 * Upload plugin: put date and author in history
+* phpweather-2.2.2 included in PhpWiki; ~PhpWeather plugin allowed in Fusionforge
 
 == 1.5.5 2015年12月11日 Marc-Etienne Vargenau ==
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.