|
From: <var...@us...> - 2016-02-08 09:55:22
|
Revision: 9782
http://sourceforge.net/p/phpwiki/code/9782
Author: vargenau
Date: 2016-02-08 09:55:20 +0000 (Mon, 08 Feb 2016)
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.
|
|
From: <var...@us...> - 2016-02-08 12:48:17
|
Revision: 9783
http://sourceforge.net/p/phpwiki/code/9783
Author: vargenau
Date: 2016-02-08 12:48:14 +0000 (Mon, 08 Feb 2016)
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é ¾á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 leti¹tì %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°%s) a %s%s%s (%s%s°%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°%s) a %s%s%s (%s%s°%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ý¹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\xB5ko',*/
+ 'FEW' => 'skorojasno', /*'niekoµko',*/
'SCT' => 'polojasno',
- 'BKN' => 'obla\xE8no',
- 'OVC' => 'zata\xBEeno');
+ 'BKN' => 'oblaèno',
+ 'OVC' => 'zata¾eno');
$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'] = ' ¾ádná oblaènost pod %s ani ¾á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á¾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',
+ '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é¹»', /* ' da¾divo', */
+ 'SN' => ' sníh',
+ 'SG' => ' zrnitý sníh',
+ 'IC' => ' ledové krystalky',
+ 'PL' => ' zmrzlý dé¹»',
'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' => ' pra¹no',
+ '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ùtr¾ mraèen',
+ 'SS' => ' pra¹ná/píseèná bouøe');
+ $this->strings['visibility'] = 'Celková viditenost byla ';
+ $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\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'] = ' de¹tì';
}
} 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øjde af ';
$this->strings['cloud_overcast'] = 'Himlen var %soverskyet%s i en hø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%sº%s) und %s%s%s (%s%sº%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�ica',
'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°%s) ja %s%s%s (%s%s°%s) v\xE4lill\xE4';
+ $this->strings['wind_variable'] = ' muuttuen %ssuuntien%s välillä.';
+ $this->strings['wind_varying'] = ', vaihdellen %s%s%s (%s%s°%s) ja %s%s%s (%s%s°%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ä',
' ' => ' kohta...
[truncated message content] |
|
From: <var...@us...> - 2016-02-08 15:16:55
|
Revision: 9784
http://sourceforge.net/p/phpwiki/code/9784
Author: vargenau
Date: 2016-02-08 15:16:52 +0000 (Mon, 08 Feb 2016)
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><i></code>, <code><font " .
'color="red"></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;
}
-
+
...
[truncated message content] |
|
From: <var...@us...> - 2016-02-11 09:14:15
|
Revision: 9792
http://sourceforge.net/p/phpwiki/code/9792
Author: vargenau
Date: 2016-02-11 09:14:13 +0000 (Thu, 11 Feb 2016)
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.
|
|
From: <var...@us...> - 2016-02-11 09:33:25
|
Revision: 9797
http://sourceforge.net/p/phpwiki/code/9797
Author: vargenau
Date: 2016-02-11 09:33:23 +0000 (Thu, 11 Feb 2016)
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.
|
|
From: <var...@us...> - 2016-02-11 10:04:43
|
Revision: 9798
http://sourceforge.net/p/phpwiki/code/9798
Author: vargenau
Date: 2016-02-11 10:04:41 +0000 (Thu, 11 Feb 2016)
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.
|
|
From: <var...@us...> - 2016-10-16 16:28:22
|
Revision: 9973
http://sourceforge.net/p/phpwiki/code/9973
Author: vargenau
Date: 2016-10-16 16:28:21 +0000 (Sun, 16 Oct 2016)
Log Message:
-----------
Use __construct
Modified Paths:
--------------
trunk/lib/phpweather-2.2.2/base_object.php
trunk/lib/phpweather-2.2.2/data_retrieval.php
trunk/lib/phpweather-2.2.2/db_layer.php
trunk/lib/phpweather-2.2.2/phpweather.php
Modified: trunk/lib/phpweather-2.2.2/base_object.php
===================================================================
--- trunk/lib/phpweather-2.2.2/base_object.php 2016-10-16 15:20:15 UTC (rev 9972)
+++ trunk/lib/phpweather-2.2.2/base_object.php 2016-10-16 16:28:21 UTC (rev 9973)
@@ -40,7 +40,7 @@
* @param $input array The initial properties of the object
* @see $properties
*/
- function base_object($input = array()) {
+ function __construct($input = array()) {
include(PHPWEATHER_BASE_DIR . '/defaults-dist.php');
Modified: trunk/lib/phpweather-2.2.2/data_retrieval.php
===================================================================
--- trunk/lib/phpweather-2.2.2/data_retrieval.php 2016-10-16 15:20:15 UTC (rev 9972)
+++ trunk/lib/phpweather-2.2.2/data_retrieval.php 2016-10-16 16:28:21 UTC (rev 9973)
@@ -59,9 +59,9 @@
* @access private
* @param array The initial properties of the object.
*/
- function data_retrieval($input = array()) {
+ function __construct($input = array()) {
/* We start by calling the parent constructor. */
- $this->db_layer($input);
+ parent::__construct($input);
/* Then we set the station. */
$this->set_icao($this->properties['icao']);
Modified: trunk/lib/phpweather-2.2.2/db_layer.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db_layer.php 2016-10-16 15:20:15 UTC (rev 9972)
+++ trunk/lib/phpweather-2.2.2/db_layer.php 2016-10-16 16:28:21 UTC (rev 9973)
@@ -27,11 +27,11 @@
*
* @param $input array Initial properties for the object.
*/
- function db_layer($input = array()) {
+ function __construct($input = array()) {
/* We call the parent constructor. */
- $this->base_object($input);
+ parent::__construct($input);
- /* We then create our db object */
+ /* We then create our db object */
$this->set_db_type($this->properties['db_type']);
}
Modified: trunk/lib/phpweather-2.2.2/phpweather.php
===================================================================
--- trunk/lib/phpweather-2.2.2/phpweather.php 2016-10-16 15:20:15 UTC (rev 9972)
+++ trunk/lib/phpweather-2.2.2/phpweather.php 2016-10-16 16:28:21 UTC (rev 9973)
@@ -56,11 +56,11 @@
*
* @param array The initial properties of the object.
*/
- function phpweather($input = array()) {
+ function __construct($input = array()) {
/* This class doesn't have any defaults, so it just calls the
* parent constructor.
*/
- $this->data_retrieval($input);
+ parent::__construct($input);
$this->decoded_metar = false;
$this->decoded_metar_arch = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2021-06-16 16:53:44
|
Revision: 10286
http://sourceforge.net/p/phpwiki/code/10286
Author: vargenau
Date: 2021-06-16 16:53:46 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
phpweather: use __construct
Modified Paths:
--------------
trunk/lib/phpweather-2.2.2/base_object.php
trunk/lib/phpweather-2.2.2/config/pw_dependency.php
trunk/lib/phpweather-2.2.2/config/pw_dependency_and.php
trunk/lib/phpweather-2.2.2/config/pw_dependency_equal.php
trunk/lib/phpweather-2.2.2/config/pw_dependency_not.php
trunk/lib/phpweather-2.2.2/config/pw_dependency_or.php
trunk/lib/phpweather-2.2.2/config/pw_option.php
trunk/lib/phpweather-2.2.2/config/pw_option_boolean.php
trunk/lib/phpweather-2.2.2/config/pw_option_integer.php
trunk/lib/phpweather-2.2.2/config/pw_option_multi_select.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.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/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/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.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_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/base_object.php
===================================================================
--- trunk/lib/phpweather-2.2.2/base_object.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/base_object.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -160,5 +160,3 @@
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_dependency.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_dependency.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_dependency.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -23,7 +23,7 @@
*
* @param string $dep Other dependencies.
*/
- function pw_dependency($dep) {
+ function __construct($dep) {
$this->dep = $dep;
}
@@ -37,4 +37,3 @@
trigger_error('Abstract method', E_USER_ERROR);
}
}
-?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_dependency_and.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_dependency_and.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_dependency_and.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -23,8 +23,8 @@
* dependency is satisfied if and only if all the dependencies
* satisfied.
*/
- function pw_dependency_and() {
- $this->pw_dependency(func_get_args());
+ function __construct() {
+ parent::__construct(func_get_args());
}
/**
@@ -43,4 +43,3 @@
return true;
}
}
-?>
\ No newline at end of file
Modified: trunk/lib/phpweather-2.2.2/config/pw_dependency_equal.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_dependency_equal.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_dependency_equal.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -27,9 +27,9 @@
* @param string $dep The required value of the option.
*
*/
- function pw_dependency_equal($option, $dep) {
+ function __construct($option, $dep) {
$this->option = $option;
- $this->pw_dependency($dep);
+ parent::__construct($dep);
}
/**
@@ -49,4 +49,3 @@
}
}
-?>
\ 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 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_dependency_not.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -19,8 +19,8 @@
*
* @param object $dependency The dependency that should be negated.
*/
- function pw_dependency_not($dependency) {
- $this->pw_dependency($dependency);
+ function __construct($dependency) {
+ parent::__construct($dependency);
}
/**
@@ -33,4 +33,3 @@
return !$this->dep->check();
}
}
-?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_dependency_or.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_dependency_or.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_dependency_or.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -24,8 +24,8 @@
* dependency is satisfied if at least one of the dependencies
* satisfied.
*/
- function pw_dependency_or() {
- $this->pw_dependency(func_get_args());
+ function __construct() {
+ parent::__construct(func_get_args());
}
/**
@@ -45,5 +45,3 @@
}
}
-
-?>
\ 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 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_option.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -69,8 +69,8 @@
*/
var $validator;
- function pw_option($name, $description, $dependency = false,
- $validator = false, $default = false) {
+ function __construct($name, $description, $dependency = false,
+ $validator = false, $default = false) {
$this->name = $name;
$this->description = $description;
$this->dependency = $dependency;
@@ -185,7 +185,4 @@
}
}
-
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_option_boolean.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option_boolean.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_option_boolean.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -11,5 +11,3 @@
}
}
-
-?>
\ No newline at end of file
Modified: trunk/lib/phpweather-2.2.2/config/pw_option_integer.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option_integer.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_option_integer.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -1,14 +1,14 @@
<?php
class pw_option_integer extends pw_option_text {
- function pw_option_integer($name, $description, $dependency = false,
- $validator = false, $default = false) {
+ function __construct($name, $description, $dependency = false,
+ $validator = false, $default = false) {
if (!$validator) {
$validator = new pw_validator_ereg("Sorry, '%s' is not an integer.",
'^[-+]?[0-9]+$');
}
- $this->pw_option_text($name, $description, $dependency,
- $validator, $default);
+ parent::__construct($name, $description, $dependency,
+ $validator, $default);
}
function get_config() {
@@ -20,8 +20,4 @@
return '';
}
}
-
-
-
}
-?>
\ No newline at end of file
Modified: trunk/lib/phpweather-2.2.2/config/pw_option_multi_select.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option_multi_select.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_option_multi_select.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -4,8 +4,8 @@
var $choices = array();
- function pw_option_multi_select($name, $description, $dependency = false, $choices) {
- $this->pw_option($name, $description, $dependency);
+ function __construct($name, $description, $dependency = false, $choices) {
+ parent::__construct($name, $description, $dependency);
$this->choices = $choices;
}
@@ -62,4 +62,3 @@
}
}
} /* class multi_select */
-?>
\ 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 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_option_select.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -4,12 +4,12 @@
var $choices = array();
- function pw_option_select($name, $description, $dependency = false,
- $choices, $default = false) {
+ function __construct($name, $description, $dependency = false,
+ $choices, $default = false) {
if ($default && isset($choices[$default])) {
- $this->pw_option($name, $description, $dependency, false, $default);
+ parent::__construct($name, $description, $dependency, false, $default);
} else {
- $this->pw_option($name, $description, $dependency, false, key($choices));
+ parent::__construct($name, $description, $dependency, false, key($choices));
}
$this->choices = $choices;
}
@@ -45,5 +45,3 @@
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_option_text.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_option_text.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_option_text.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -1,9 +1,9 @@
<?php
class pw_option_text extends pw_option {
- function pw_option_text($name, $description, $dependency,
- $validator = false, $default = false) {
- $this->pw_option($name, $description, $dependency, $validator, $default);
+ function __construct($name, $description, $dependency,
+ $validator = false, $default = false) {
+ parent::__construct($name, $description, $dependency, $validator, $default);
}
function show() {
@@ -27,4 +27,3 @@
}
}
-?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_optiongroup.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_optiongroup.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_optiongroup.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -59,7 +59,7 @@
* @param array $options The names of the options in the group.
*
*/
- function pw_optiongroup($id, $title, $description, $options, $visible = true) {
+ function __construct($id, $title, $description, $options, $visible = true) {
$this->id = $id;
$this->title = $title;
$this->description = $description;
@@ -132,5 +132,3 @@
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_validator.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_validator.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_validator.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -32,7 +32,7 @@
* @param string $error The message displayed when the input is
* invalid.
*/
- function pw_validator($error) {
+ function __construct($error) {
$this->error = $error;
}
@@ -78,6 +78,3 @@
}
}
-
-
-?>
\ 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 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_validator_ereg.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -22,8 +22,8 @@
* invalid.
* @param string $regex The regular expression used when validating.
*/
- function pw_validator_ereg($error, $regex) {
- $this->pw_validator($error);
+ function __construct($error, $regex) {
+ parent::__construct($error);
$this->regex = $regex;
}
@@ -58,6 +58,4 @@
"', '$this->regex', '$id', this)";
}
-
}
-?>
Modified: trunk/lib/phpweather-2.2.2/config/pw_validator_range.php
===================================================================
--- trunk/lib/phpweather-2.2.2/config/pw_validator_range.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/config/pw_validator_range.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -2,7 +2,7 @@
/**
* Validates an integer.
*
- * This class checks that an interger is in a given range. This is
+ * This class checks that an integer is in a given range. This is
* usefull for testing port-numbers (range 1--65536) or peoples age
* (range 1--120) etc.
*
@@ -40,8 +40,8 @@
* @param integer $high The upper bound of the range.
* @param boolean $empty_ok Is the empty string valid?
*/
- function pw_validator_range($error, $low, $high, $empty_ok = false) {
- $this->pw_validator($error);
+ function __construct($error, $low, $high, $empty_ok = false) {
+ parent::__construct($error);
$this->low = $low;
$this->high = $high;
$this->empty_ok = $empty_ok;
@@ -81,4 +81,3 @@
}
}
-?>
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_adodb.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_adodb.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_adodb.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -23,8 +23,8 @@
*
* @param array the initial properties of the object
*/
- function pw_db_adodb($input) {
- $this->pw_db_common($input);
+ function __construct($input) {
+ parent::__construct($input);
}
/**
@@ -560,5 +560,3 @@
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_common.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_common.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_common.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -73,9 +73,9 @@
* @param array the initial properties of the object
* @see $is_connected, $link_id, $result_id
*/
- function pw_db_common($input) {
+ function __construct($input) {
/* We start by calling the parent constructor. */
- $this->base_object($input);
+ parent::__construct($input);
/* We're not connected at first, so we set these variables to
indicate that. */
@@ -214,7 +214,4 @@
}
}
-
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_dba.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_dba.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_dba.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -43,7 +43,7 @@
*
* @param array the initial properties of the object
*/
- function pw_db_dba($input) {
+ function __construct($input) {
/* We have to load the DBA extension on some systems: */
if (!extension_loaded('dba')) {
if (preg_match('/win/', PHP_OS)) {
@@ -52,7 +52,7 @@
dl('dba.so');
}
}
- $this->pw_db_common($input);
+ parent::__construct($input);
}
/**
@@ -387,5 +387,3 @@
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_mysql.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -20,7 +20,7 @@
*
* @param array the initial properties of the object
*/
- function pw_db_mysql($input) {
+ function __construct($input) {
/* We have to load the MySQL extension on some systems: */
if (!extension_loaded('mysql')) {
if (preg_match('/win/', PHP_OS)) {
@@ -29,7 +29,7 @@
dl('mysql.so');
}
}
- $this->pw_db_common($input);
+ parent::__construct($input);
}
/**
@@ -536,5 +536,3 @@
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_null.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_null.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_null.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -29,8 +29,8 @@
*
* @param array the initial properties of the object
*/
- function pw_db_null($input) {
- $this->pw_db_common($input);
+ function __construct($input) {
+ parent::__construct($input);
}
/**
@@ -295,5 +295,3 @@
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db/pw_db_pgsql.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -32,7 +32,7 @@
*
* @param array the initial properties of the object
*/
- function pw_db_pgsql($input = array()) {
+ function __construct($input = array()) {
/* We have to load the PgSQL extension on some systems: */
if (!extension_loaded('pgsql')) {
if (preg_match('/win/', PHP_OS)) {
@@ -41,7 +41,7 @@
dl('pgsql.so');
}
}
- $this->pw_db_common($input);
+ parent::__construct($input);
}
@@ -392,5 +392,3 @@
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/db_layer.php
===================================================================
--- trunk/lib/phpweather-2.2.2/db_layer.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/db_layer.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -88,6 +88,3 @@
}
}
-
-
-?>
Modified: trunk/lib/phpweather-2.2.2/output/pw_images.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_images.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_images.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -224,9 +224,9 @@
* @param phpweather The object with the weather.
* @access public
*/
- function pw_images($weather, $input = array()) {
+ function __construct($weather, $input = array()) {
/* We just call the parent constructor. */
- $this->pw_output($weather, $input);
+ parent::__construct($weather, $input);
}
@@ -450,5 +450,3 @@
// ------------------------------------------------------------------------
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/output/pw_output.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_output.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_output.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -15,7 +15,7 @@
var $weather = null;
- function pw_output($weather, $input = array()) {
+ function __construct($weather, $input = array()) {
$this->weather = $weather;
$this->properties = $weather->properties;
@@ -31,5 +31,3 @@
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/output/pw_text.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -39,9 +39,9 @@
* @param phpweather The object with the weather.
* @access public
*/
- function pw_text($weather, $input = array()) {
+ function __construct($weather, $input = array()) {
/* We just call the parent constructor. */
- $this->pw_output($weather, $input);
+ parent::__construct($weather, $input);
}
/**
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_cs.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_cs.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_cs.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -25,7 +25,7 @@
*
* @param array This is just passed on to pw_text().
*/
- function pw_text_cs($weather, $input = array())
+ function __construct($weather, $input = array())
{
$this->strings['charset'] = 'UTF-8';
$this->strings['no_data'] = 'Lituji, nejsou dostupné žádné informace pro %s%s%s.';
@@ -181,7 +181,7 @@
$this->strings['runway_for_runway'] = ' for runway ';
/* We run the parent constructor */
- $this->pw_text($weather, $input);
+ parent::__construct($weather, $input);
}
function print_pretty_wind($wind)
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_da.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_da.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_da.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -16,7 +16,7 @@
*
* @param array This is just passed on to pw_text().
*/
- function pw_text_da($weather, $input = array()) {
+ function __construct($weather, $input = array()) {
$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 ';
@@ -43,7 +43,7 @@
$this->strings['wind_with_gusts'] = ' med vindstød på up til ';
$this->strings['wind_from'] = ' fra ';
$this->strings['wind_variable'] = ' fra %svarierende%s retninger.';
-+ $this->strings['wind_varying'] = ', varierende mellem %s%s%s (%s%s°%s) og %s%s%s (%s%s°%s)';
+ $this->strings['wind_varying'] = ', varierende mellem %s%s%s (%s%s°%s) og %s%s%s (%s%s°%s)';
$this->strings['wind_calm'] = 'Vinden var %sstille%s';
$this->strings['wind_dir'] = array(
'nord',
@@ -164,9 +164,7 @@
$this->strings['runway_for_runway'] = ' for bane ';
/* We run the parent constructor */
- $this->pw_text($weather, $input);
+ parent::__construct($weather, $input);
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_de.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_de.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_de.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,7 +17,7 @@
*
* @param array This is just passed on to pw_text().
*/
- function pw_text_de($weather, $input = array())
+ function __construct($weather, $input = array())
{
$this->strings['charset'] = 'UTF-8';
$this->strings['no_data'] = 'Für %s%s%s stehen keine DATEN zur Verfügung.';
@@ -168,8 +168,6 @@
$this->strings['runway_for_runway'] = ' für die Landebahn ';
/* We run the parent constructor */
- $this->pw_text($weather, $input);
+ parent::__construct($weather, $input);
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_en.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_en.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_en.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -16,12 +16,10 @@
*
* @param array This is just passed on to pw_text_en_US().
*/
- function pw_text_en($weather, $input = array()) {
+ function __construct($weather, $input = array()) {
/* We run the parent constructor, this gives us American English
* output strings --- change this to pw_get_en_GB for British
* English strings. */
- $this->pw_text_en_US($weather, $input);
+ parent::__construct($weather, $input);
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_en_GB.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_en_GB.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_en_GB.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,9 +17,9 @@
*
* @param array This is just passed on to pw_text().
*/
- function pw_text_en_GB($weather, $input = array()) {
+ function __construct($weather, $input = array()) {
/* We run the parent constructor */
- $this->pw_text_en($weather, $input);
+ parent::__construct($weather, $input);
/* Now override the strings with the British English spellings: */
$this->strings['meters_per_second'] = ' metres per second';
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 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_en_US.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,7 +17,7 @@
*
* @param array This is just passed on to pw_text().
*/
- function pw_text_en_US($weather, $input = array()) {
+ function __construct($weather, $input = array()) {
$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 ';
@@ -167,8 +167,6 @@
$this->strings['runway_for_runway'] = ' for runway ';
/* We run the parent constructor */
- $this->pw_text($weather, $input);
+ parent::__construct($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 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_es.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,7 +17,7 @@
*
* @param array This is just passed on to pw_text().
*/
- function pw_text_es($weather, $input = array()) {
+ function __construct($weather, $input = array()) {
$this->strings['charset'] = 'UTF-8';
$this->strings['no_data'] = 'Datos no disponibles para %s%s%s.';
$this->strings['list_sentences_and'] = ' y ';
@@ -168,7 +168,7 @@
$this->strings['runway_for_runway'] = ' para la pista ';
/* We run the parent constructor */
- $this->pw_text($weather, $input);
+ parent::__construct($weather, $input);
}
/**
* Function used to parse a weather-group. This one puts adjective after noun.
@@ -244,5 +244,3 @@
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_fi.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_fi.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_fi.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -17,7 +17,7 @@
*
* @param array This is just passed on to pw_text().
*/
- function pw_text_fi($weather, $input = array()) {
+ function __construct($weather, $input = array()) {
$this->strings['charset'] = 'UTF-8';
$this->strings['no_data'] = 'Valitan! Ei tietoja saatavilla %s%s%s sääasemalle.';
$this->strings['list_sentences_and'] = ' ja ';
@@ -167,7 +167,7 @@
$this->strings['runway_for_runway'] = ' kiitotiellä ';
/* We run the parent constructor */
- $this->pw_text($weather, $input);
+ parent::__construct($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 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_fr.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -19,7 +19,7 @@
*
* @param array This is just passed on to pw_text().
*/
- function pw_text_fr($weather, $input = array()) {
+ function __construct($weather, $input = array()) {
$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 ';
@@ -169,8 +169,6 @@
$this->strings['runway_for_runway'] = ' pour la piste ';
/* We run the parent constructor */
- $this->pw_text($weather, $input);
+ parent::__construct($weather, $input);
}
}
-
-?>
Modified: trunk/lib/phpweather-2.2.2/output/pw_text_hu.php
===================================================================
--- trunk/lib/phpweather-2.2.2/output/pw_text_hu.php 2021-06-16 15:49:41 UTC (rev 10285)
+++ trunk/lib/phpweather-2.2.2/output/pw_text_hu.php 2021-06-16 16:53:46 UTC (rev 10286)
@@ -20,7 +20,7 @@
* @param array This is just passed on to pw_text().
* Ezt a paramétert átadjuk pw_text() -nek.
*/
- function pw_text_hu($weather, $input = array()) {
+ function __construct($weather, $input = array()) {
...
[truncated message content] |