mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/new-tz-handling] Fix selecting and validating of timezone in UCP

Browse Source 
PHPBB3-9558
This commit is contained in:
Joas Schilling
2012-06-04 19:06:46 +02:00
parent 8f027b68d6
commit 50936cb2ef
4 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
phpBB/includes/functions.php
View File

@@ -1139,34 +1139,38 @@ function tz_select($default = '', $truncate = false)
if (!isset($timezones))
{
$timezones = DateTimeZone::listIdentifiers();
$unsorted_timezones = DateTimeZone::listIdentifiers();
$timezones = array();
foreach ($timezones as &$timezone)
foreach ($unsorted_timezones as $timezone)
{
$tz = new DateTimeZone($timezone);
$dt = new phpbb_datetime('now', $tz);
$offset = $dt->getOffset();
$offset_string = phpbb_format_timezone_offset($offset);
$timezone = 'GMT' . $offset_string . ' - ' . $timezone;
$timezones['GMT' . $offset_string . ' - ' . $timezone] = array(
'tz' => $timezone,
'label' => 'GMT' . $offset_string . ' - ' . $timezone,
);
}
unset($timezone);
unset($unsorted_timezones);
usort($timezones, 'tz_select_compare');
uksort($timezones, 'tz_select_compare');
}
$tz_select = '';
foreach ($timezones as $timezone)
{
if (isset($user->lang['timezones'][$timezone]))
if (isset($user->lang['timezones'][$timezone['tz']]))
{
$title = $label = $user->lang['timezones'][$timezone];
$title = $label = $user->lang['timezones'][$timezone['tz']];
}
else
{
// No label, we'll figure one out
// @todo rtl languages?
$bits = explode('/', str_replace('_', ' ', $timezone));
$bits = explode('/', str_replace('_', ' ', $timezone['label']));
$title = $label = implode(' - ', $bits);
}
@@ -1176,8 +1180,8 @@ function tz_select($default = '', $truncate = false)
$label = truncate_string($label, 50, 255, false, '...');
}
$selected = ($timezone === $default) ? ' selected="selected"' : '';
$tz_select .= '<option title="' . $title . '" value="' . $timezone . '"' . $selected . '>' . $label . '</option>';
$selected = ($timezone['tz'] === $default) ? ' selected="selected"' : '';
$tz_select .= '<option title="' . $title . '" value="' . $timezone['tz'] . '"' . $selected . '>' . $label . '</option>';
}
return $tz_select;