mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity

[feature/new-tz-handling] Add previous selected value to validation if valid

Browse Source 
We also add the selected timezone if we can create an object with it.
DateTimeZone::listIdentifiers seems to not add all identifiers to the list,
because some are only kept for backward compatible reasons. If the user has
a deprecated value, we add it here, so it can still be kept. Once the user
changed his value, there is no way back to deprecated values.

PHPBB3-9558
This commit is contained in:
Joas Schilling 2012-07-19 14:36:20 +02:00
parent d099ef8cad
commit 6de222065e
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
phpBB/includes/functions.php
View File

@ -1138,6 +1138,40 @@ function phpbb_tz_select_compare($a, $b)
} }
} }
/**
* Return list of timezone identifiers
* We also add the selected timezone if we can create an object with it.
* DateTimeZone::listIdentifiers seems to not add all identifiers to the list,
* because some are only kept for backward compatible reasons. If the user has
* a deprecated value, we add it here, so it can still be kept. Once the user
* changed his value, there is no way back to deprecated values.
*
* @param string $selected_timezone Additional timezone that shall
* be added to the list of identiers
* @return array DateTimeZone::listIdentifiers and additional
* selected_timezone if it is a valid timezone.
*/
function phpbb_get_timezone_identifiers($selected_timezone)
{
$timezones = DateTimeZone::listIdentifiers();
if (!in_array($selected_timezone, $timezones))
{
try
{
// Add valid timezones that are currently selected but not returned
// by DateTimeZone::listIdentifiers
$validate_timezone = new DateTimeZone($selected_timezone);
$timezones[] = $selected_timezone;
}
catch (Exception $e)
{
}
}
return $timezones;
}
/** /**
* Pick a timezone * Pick a timezone
* *
@ -1171,9 +1205,9 @@ function phpbb_timezone_select($default = '', $truncate = false)
$default_offset = ''; $default_offset = '';
if (!isset($timezones)) if (!isset($timezones))
{ {
$unsorted_timezones = DateTimeZone::listIdentifiers(); $unsorted_timezones = phpbb_get_timezone_identifiers($default);
$timezones = array();
$timezones = array();
foreach ($unsorted_timezones as $timezone) foreach ($unsorted_timezones as $timezone)
{ {
$tz = new DateTimeZone($timezone); $tz = new DateTimeZone($timezone);
@ -1207,7 +1241,7 @@ function phpbb_timezone_select($default = '', $truncate = false)
$opt_group = $timezone['offest']; $opt_group = $timezone['offest'];
$selected = ($default_offset == $timezone['offest']) ? ' selected="selected"' : ''; $selected = ($default_offset == $timezone['offest']) ? ' selected="selected"' : '';
$tz_dates .= '<option value="' . $timezone['offest'] . ' - ' . $timezone['current'] . '"' . $selected . '>' . $timezone['offest'] . ' - ' . $timezone['current'] . ($selected ? ' ' . $user->lang['TIMEZONE_SELECTED'] : '') . '</option>'; $tz_dates .= '<option value="' . $timezone['offest'] . ' - ' . $timezone['current'] . '"' . $selected . '>' . $timezone['offest'] . ' - ' . $timezone['current'] . '</option>';
} }
if (isset($user->lang['timezones'][$timezone['tz']])) if (isset($user->lang['timezones'][$timezone['tz']]))
@ -1229,7 +1263,7 @@ function phpbb_timezone_select($default = '', $truncate = false)
} }
$selected = ($timezone['tz'] === $default) ? ' selected="selected"' : ''; $selected = ($timezone['tz'] === $default) ? ' selected="selected"' : '';
$tz_select .= '<option title="' . $title . '" value="' . $timezone['tz'] . '"' . $selected . '>' . $label . ($selected ? ' ' . $user->lang['TIMEZONE_SELECTED'] : '') . '</option>'; $tz_select .= '<option title="' . $title . '" value="' . $timezone['tz'] . '"' . $selected . '>' . $label . '</option>';
} }
$tz_select .= '</optgroup>'; $tz_select .= '</optgroup>';

2
phpBB/includes/functions_user.php
View File

@ -1420,7 +1420,7 @@ function validate_language_iso_name($lang_iso)
*/ */
function phpbb_validate_timezone($timezone) function phpbb_validate_timezone($timezone)
{ {
return (in_array($timezone, DateTimeZone::listIdentifiers())) ? false : 'TIMEZONE_INVALID'; return (in_array($timezone, phpbb_get_timezone_identifiers($timezone))) ? false : 'TIMEZONE_INVALID';
} }
/** /**