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

[ticket/17100] Move timezone select HTML from PHP file

Browse Source 
PHPBB3-17100
This commit is contained in:
Marc Alexander
2022-06-01 21:08:12 +02:00
parent 540097eed7
commit 015472ab91
10 changed files with 113 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
phpBB/includes/functions.php
View File

@@ -443,14 +443,13 @@ function phpbb_get_timezone_identifiers($selected_timezone)
/**
* Options to pick a timezone and date/time
*
* @param \phpbb\template\template $template phpBB template object
* @param \phpbb\user $user Object of the current user
* @param string $default A timezone to select
* @param boolean $truncate Shall we truncate the options text
*
* @return string Returns an array containing the options for the time selector.
*/
function phpbb_timezone_select($template, $user, $default = '', $truncate = false)
function phpbb_timezone_select($user, $default = '', $truncate = false)
{
static $timezones;
@@ -482,27 +481,22 @@ function phpbb_timezone_select($template, $user, $default = '', $truncate = fals
uksort($timezones, 'phpbb_tz_select_compare');
}
$tz_select = $opt_group = '';
$opt_group = '';
$tz_data = [];
foreach ($timezones as $key => $timezone)
{
if ($opt_group != $timezone['offset'])
{
// Generate tz_select for backwards compatibility
$tz_select .= ($opt_group) ? '</optgroup>' : '';
$tz_select .= '<optgroup label="' . $user->lang(array('timezones', 'UTC_OFFSET_CURRENT'), $timezone['offset'], $timezone['current']) . '">';
$opt_group = $timezone['offset'];
$template->assign_block_vars('timezone_select', array(
'LABEL' => $user->lang(array('timezones', 'UTC_OFFSET_CURRENT'), $timezone['offset'], $timezone['current']),
'VALUE' => $key . ' - ' . $timezone['current'],
));
$tz_data[$timezone['offset']] = [
'label' => $user->lang(array('timezones', 'UTC_OFFSET_CURRENT'), $timezone['offset'], $timezone['current']),
'value' => $key . ' - ' . $timezone['current'],
'options' => [],
'selected' => !empty($default_offset) && strpos($key, $default_offset) !== false,
'data' => ['tz-value' => $key . ' - ' . $timezone['current']],
];
$selected = (!empty($default_offset) && strpos($key, $default_offset) !== false) ? ' selected="selected"' : '';
$template->assign_block_vars('timezone_date', array(
'VALUE' => $key . ' - ' . $timezone['current'],
'SELECTED' => !empty($selected),
'TITLE' => $user->lang(array('timezones', 'UTC_OFFSET_CURRENT'), $timezone['offset'], $timezone['current']),
));
$opt_group = $timezone['offset'];
}
$label = $timezone['tz'];
@@ -517,19 +511,15 @@ function phpbb_timezone_select($template, $user, $default = '', $truncate = fals
$label = truncate_string($label, 50, 255, false, '...');
}
// Also generate timezone_select for backwards compatibility
$selected = ($timezone['tz'] === $default) ? ' selected="selected"' : '';
$tz_select .= '<option title="' . $title . '" value="' . $timezone['tz'] . '"' . $selected . '>' . $label . '</option>';
$template->assign_block_vars('timezone_select.timezone_options', array(
$tz_data[$timezone['offset']]['options'][] = [
'TITLE' => $title,
'VALUE' => $timezone['tz'],
'SELECTED' => !empty($selected),
'LABEL' => $label,
));
'value' => $timezone['tz'],
'selected' => $timezone['tz'] === $default,
'label' => $label,
];
}
$tz_select .= '</optgroup>';
return $tz_select;
return $tz_data;
}
// Functions handling topic/post tracking/marking