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()) { $this->strings['charset'] = 'UTF-8'; $this->strings['no_data'] = 'Sajnos nincs adat %s%s%s számára.'; $this->strings['list_sentences_and'] = ' és '; @@ -176,11 +176,8 @@ $this->strings['runway_visibility'] = 'A láthatóság '; $this->strings['runway_for_runway'] = ' a kifutópályán '; - /* We run the parent constructor */ + /* We run the parent constructor */ + parent::__construct($weather, $input); - $this->pw_text($weather, $input); - } } - -?> Modified: trunk/lib/phpweather-2.2.2/output/pw_text_it.php =================================================================== --- trunk/lib/phpweather-2.2.2/output/pw_text_it.php 2021-06-16 15:49:41 UTC (rev 10285) +++ trunk/lib/phpweather-2.2.2/output/pw_text_it.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_it($weather, $input = array()) { + function __construct($weather, $input = array()) { $this->strings['charset'] = 'UTF-8'; $this->strings['no_data'] = 'Spiacente! Nessun dato disponibile per %s%s%s.'; $this->strings['list_sentences_and'] = ' e '; @@ -167,8 +167,6 @@ $this->strings['runway_for_runway'] = ' per la pista d\'atterraggio 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_nl.php =================================================================== --- trunk/lib/phpweather-2.2.2/output/pw_text_nl.php 2021-06-16 15:49:41 UTC (rev 10285) +++ trunk/lib/phpweather-2.2.2/output/pw_text_nl.php 2021-06-16 16:53:46 UTC (rev 10286) @@ -21,7 +21,7 @@ * * @param array This is just passed on to pw_text(). */ - function pw_text_nl($weather, $input = array()) { + function __construct($weather, $input = array()) { $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 '; @@ -177,7 +177,7 @@ $this->strings['runway_for_runway'] = ' voor de start- landingsbaan '; /* We run the parent constructor */ - $this->pw_text($weather, $input); + parent::__construct($weather, $input); } } Modified: trunk/lib/phpweather-2.2.2/output/pw_text_no.php =================================================================== --- trunk/lib/phpweather-2.2.2/output/pw_text_no.php 2021-06-16 15:49:41 UTC (rev 10285) +++ trunk/lib/phpweather-2.2.2/output/pw_text_no.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_no($weather, $input = array()) { + function __construct($weather, $input = array()) { $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 '; @@ -164,9 +164,7 @@ $this->strings['runway_for_runway'] = ' for rullebane '; /* We run the parent constructor */ - $this->pw_text($weather, $input); + parent::__construct($weather, $input); } } - -?> Modified: trunk/lib/phpweather-2.2.2/output/pw_text_pl.php =================================================================== --- trunk/lib/phpweather-2.2.2/output/pw_text_pl.php 2021-06-16 15:49:41 UTC (rev 10285) +++ trunk/lib/phpweather-2.2.2/output/pw_text_pl.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_pl($weather, $input = array()) { + function __construct($weather, $input = array()) { $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 '; @@ -167,8 +167,6 @@ $this->strings['runway_for_runway'] = ' dla pasa '; /* We run the parent constructor */ - $this->pw_text($weather, $input); + parent::__construct($weather, $input); } } - -?> Modified: trunk/lib/phpweather-2.2.2/output/pw_text_pt.php =================================================================== --- trunk/lib/phpweather-2.2.2/output/pw_text_pt.php 2021-06-16 15:49:41 UTC (rev 10285) +++ trunk/lib/phpweather-2.2.2/output/pw_text_pt.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_pt($weather, $input = array()) { + function __construct($weather, $input = array()) { $this->strings['charset'] = 'UTF-8'; $this->strings['no_data'] = 'Dado não disponiveis para %s%s%s.'; $this->strings['list_sentences_and'] = ' e '; @@ -168,9 +168,7 @@ $this->strings['runway_for_runway'] = ' para a estrada '; /* We run the parent constructor */ - $this->pw_text_es($weather, $input); + parent::__construct($weather, $input); } } - -?> Modified: trunk/lib/phpweather-2.2.2/output/pw_text_sk.php =================================================================== --- trunk/lib/phpweather-2.2.2/output/pw_text_sk.php 2021-06-16 15:49:41 UTC (rev 10285) +++ trunk/lib/phpweather-2.2.2/output/pw_text_sk.php 2021-06-16 16:53:46 UTC (rev 10286) @@ -22,7 +22,7 @@ * * @param array This is just passed on to pw_text(). */ - function pw_text_sk($weather, $input = array()) + function __construct($weather, $input = array()) { $this->strings['charset'] = 'UTF-8'; $this->strings['no_data'] = 'Ľutujem, momentálne nie sú dostupné žiadne informácie pre %s%s%s.'; @@ -178,7 +178,7 @@ $this->strings['runway_for_runway'] = ' pre pristávaciu dráhu číslo '; /* 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_sv.php =================================================================== --- trunk/lib/phpweather-2.2.2/output/pw_text_sv.php 2021-06-16 15:49:41 UTC (rev 10285) +++ trunk/lib/phpweather-2.2.2/output/pw_text_sv.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_sv($weather, $input = array()) { + function __construct($weather, $input = array()) { $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 '; @@ -165,9 +165,7 @@ $this->strings['runway_for_runway'] = ' för landningsbanan '; /* We run the parent constructor */ - $this->pw_text($weather, $input); + parent::__construct($weather, $input); } } - -?> Modified: trunk/lib/phpweather-2.2.2/output/pw_text_tr.php =================================================================== --- trunk/lib/phpweather-2.2.2/output/pw_text_tr.php 2021-06-16 15:49:41 UTC (rev 10285) +++ trunk/lib/phpweather-2.2.2/output/pw_text_tr.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_tr($weather, $input = array()) { + function __construct($weather, $input = array()) { $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 '; @@ -166,8 +166,6 @@ $this->strings['runway_for_runway'] = ' uçak pisti için '; /* We run the parent constructor */ - $this->pw_text($weather, $input); + parent::__construct($weather, $input); } } - -?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |