Update of /cvsroot/phpweather/phpweather In directory usw-pr-cvs1:/tmp/cvs-serv22694 Modified Files: configurator.php data_retrieval.php Log Message: Minor comment modifications. Index: configurator.php =================================================================== RCS file: /cvsroot/phpweather/phpweather/configurator.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- configurator.php 2001/07/17 12:22:13 1.10 +++ configurator.php 2001/07/31 18:52:41 1.11 @@ -41,7 +41,7 @@ /** * The data of the property. * - * If the property can one out of several different values, + * If the property can be one out of several different values, * then this should be an array, where the first entry is * the default. Else it should be a string. * @@ -51,7 +51,7 @@ var $data; /** - * A header used in the each line in the config-file. + * A header used in each line in the config-file. * * All lines in the file start with * '$this->properties['property'] =' @@ -238,14 +238,14 @@ new text('icao', 'EKYT', 'This will be the default station used by PHP Weather. ' . - 'You should enter a four-letter ICAO.'); + 'You should enter a valid four-letter ICAO.'); $properties['use_proxy'] = new boolean('use_proxy', array('false' => 'No', 'true' => 'Yes'), - "Set this option to 'Yes' to enable support for " . - "proxy servers. If you do so, you'll have to set the " . + "Set this option to 'Yes' to enable support for a " . + "proxy server. If you do so, you'll have to set the " . "next two options as well."); $properties['proxy_host'] = @@ -276,7 +276,8 @@ $properties['db_username'] = new text('db_username', '', - 'This is the username that PHP Weather will use.'); + 'This is the username that PHP Weather will use ' + 'for accessing the database.'); $properties['db_password'] = new text('db_password', @@ -346,7 +347,7 @@ 'both_imperial' => 'Imperial first, then metric', 'only_metric' => 'Only metric', 'only_imperial' => 'Only imperial'), - 'You can choose to display the data in several ' . + 'You may choose to display the data in several ' . 'formats. Please choose one that fits your need.'); $properties['mark_begin'] = @@ -354,7 +355,7 @@ '<b>', 'This string will be placed in front of all the ' . 'changable parts of the output. If you don\'t want ' . - ' this to happen, then just use an empty string. ' . + 'this to happen, then just use an empty string. ' . 'Other good choices include \'<i>\', \'<font ' . 'color="red">, etc. [default string: \'<b>\']'); @@ -374,7 +375,7 @@ 'you\'re not interested in information about ' . ' runways-visibility, then select it in this list. ' . 'You can select several options at once in Netscape ' . - ' by holding down Ctrl while clicking on the option.'); + 'by holding down Ctrl while clicking on the option.'); $properties['language'] = new select('language', @@ -382,7 +383,7 @@ 'da' => 'Danish', 'hu' => 'Hungarian'), 'PHP Weather can produce output in several languages ' . - '- please select the default from the list.'); + '- please select your default from the list.'); if ($action == 'make_config') { @@ -404,9 +405,9 @@ } $config .= "\n?>\n"; - /* We first check to see, if there's already a config-file. */ + /* We first check if the config-file exists. */ if (file_exists('defaults.php')) { - /* We make a copy of the file */ + /* We make a backup copy of the file */ $new_filename = 'defaults.' . time() . '.php'; if (@copy('defaults.php', $new_filename)) { $fp = @fopen('defaults.php', 'w'); Index: data_retrieval.php =================================================================== RCS file: /cvsroot/phpweather/phpweather/data_retrieval.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- data_retrieval.php 2001/07/08 21:25:31 1.14 +++ data_retrieval.php 2001/07/31 18:52:41 1.15 @@ -93,7 +93,7 @@ /** * Retrieves a raw METAR, either from the web or from a database. * - * If the METAR is already set, then it just return that. + * If the METAR is already set, then it just returns that. * If it's not set, then it tries to get it from the database. * * @access public @@ -119,7 +119,7 @@ * this function, just make sure that you have passed the right * properties to the object. * - * If $this->properties['always_use_db'] is true, then it ignores + * If $this->properties['always_use_db'] is True, then it ignores * the timestamp of the METAR and just returns it. Otherwise it will * try to get a new METAR from the web, if the old one is older than * one hour. @@ -152,7 +152,7 @@ $this->debug('get_metar_from_db(): Using previously cached METAR for <code>' . $this->get_location() . '</code>. The METAR expires in ' . ($timestamp + 3600 - time()) . ' seconds.'); return $metar; } else { - /* The METAR is too old, so we fetch a new */ + /* The METAR is too old, so we fetch new */ $this->debug('get_metar_from_db(): The METAR for <code>' . $this->get_location() . '</code> was ' . (time() - 3600 - $timestamp) . ' seconds too old.'); return $this->get_metar_from_web(false); } @@ -258,7 +258,7 @@ * station was a new station, we set the metar to an empty * string, else we just use the old METAR. We adjust the time * stored in the database in both cases, so that the server - * isn't stressed to much. + * isn't stressed too much. */ if ($new_station) { $metar = ''; _______________________________________________ PHPWeather-checkins mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/phpweather-checkins