makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16859] Optimize code to save SQL queries and use Twig for template

Browse source 
PHPBB3-16859
This commit is contained in:
rxu 2021-08-29 00:15:06 +07:00
parent 92a2c08616
commit c3598d0d58
No known key found for this signature in database
GPG key ID: 955F0567380E586A
3 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
phpBB/includes/functions.php
View file

@ -264,23 +264,32 @@ function phpbb_version_compare($version1, $version2, $operator = null)
/** /**
* Pick a language, any language ... * Pick a language, any language ...
*
* @param string $default Language ISO code to be selected by default in the dropdown list
* @param array $langdata Language data in format of array(array('lang_iso' => string, lang_local_name => string), ...)
*
* @return string HTML options for language selection dropdown list.
*/ */
function language_select($default = '') function language_select($default = '', array $langdata = [])
{ {
global $db; global $db;
$sql = 'SELECT lang_iso, lang_local_name if (empty($langdata))
FROM ' . LANG_TABLE . ' {
ORDER BY lang_english_name'; $sql = 'SELECT lang_iso, lang_local_name
$result = $db->sql_query($sql); FROM ' . LANG_TABLE . '
ORDER BY lang_english_name';
$result = $db->sql_query($sql);
$langdata = (array) $db->sql_fetchrowset($result);
$db->sql_freeresult($result);
}
$lang_options = ''; $lang_options = '';
while ($row = $db->sql_fetchrow($result)) foreach ($langdata as $row)
{ {
$selected = ($row['lang_iso'] == $default) ? ' selected="selected"' : ''; $selected = ($row['lang_iso'] == $default) ? ' selected="selected"' : '';
$lang_options .= '<option value="' . $row['lang_iso'] . '"' . $selected . '>' . $row['lang_local_name'] . '</option>'; $lang_options .= '<option value="' . $row['lang_iso'] . '"' . $selected . '>' . $row['lang_local_name'] . '</option>';
} }
$db->sql_freeresult($result);
return $lang_options; return $lang_options;
} }

18
phpBB/includes/ucp/ucp_register.php
View file

@ -150,10 +150,10 @@ class ucp_register
} }
// Checking amount of available languages // Checking amount of available languages
$sql = 'SELECT lang_id $sql = 'SELECT lang_iso, lang_local_name
FROM ' . LANG_TABLE; FROM ' . LANG_TABLE . '
ORDER BY lang_english_name';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$lang_row = (array) $db->sql_fetchrowset($result); $lang_row = (array) $db->sql_fetchrowset($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -167,7 +167,7 @@ class ucp_register
unset($now); unset($now);
$template_vars = array( $template_vars = array(
'S_LANG_OPTIONS' => (count($lang_row) > 1) ? language_select($user_lang) : '', 'S_LANG_OPTIONS' => (count($lang_row) > 1) ? language_select($user_lang, $lang_row) : '',
'L_COPPA_NO' => $user->lang('UCP_COPPA_BEFORE', $coppa_birthday), 'L_COPPA_NO' => $user->lang('UCP_COPPA_BEFORE', $coppa_birthday),
'L_COPPA_YES' => $user->lang('UCP_COPPA_ON_AFTER', $coppa_birthday), 'L_COPPA_YES' => $user->lang('UCP_COPPA_ON_AFTER', $coppa_birthday),
@ -182,7 +182,7 @@ class ucp_register
else else
{ {
$template_vars = array( $template_vars = array(
'S_LANG_OPTIONS' => (count($lang_row) > 1) ? language_select($user_lang) : '', 'S_LANG_OPTIONS' => (count($lang_row) > 1) ? language_select($user_lang, $lang_row) : '',
'L_TERMS_OF_USE' => sprintf($user->lang['TERMS_OF_USE_CONTENT'], $config['sitename'], generate_board_url()), 'L_TERMS_OF_USE' => sprintf($user->lang['TERMS_OF_USE_CONTENT'], $config['sitename'], generate_board_url()),
'S_SHOW_COPPA' => false, 'S_SHOW_COPPA' => false,
@ -630,10 +630,10 @@ class ucp_register
phpbb_timezone_select($template, $user, $data['tz'], true); phpbb_timezone_select($template, $user, $data['tz'], true);
// Checking amount of available languages // Checking amount of available languages
$sql = 'SELECT lang_id $sql = 'SELECT lang_iso, lang_local_name
FROM ' . LANG_TABLE; FROM ' . LANG_TABLE . '
ORDER BY lang_english_name';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$lang_row = (array) $db->sql_fetchrowset($result); $lang_row = (array) $db->sql_fetchrowset($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -647,7 +647,7 @@ class ucp_register
'L_USERNAME_EXPLAIN' => $user->lang($config['allow_name_chars'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_name_chars']), $user->lang('CHARACTERS', (int) $config['max_name_chars'])), 'L_USERNAME_EXPLAIN' => $user->lang($config['allow_name_chars'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_name_chars']), $user->lang('CHARACTERS', (int) $config['max_name_chars'])),
'L_PASSWORD_EXPLAIN' => $user->lang($config['pass_complex'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_pass_chars'])), 'L_PASSWORD_EXPLAIN' => $user->lang($config['pass_complex'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_pass_chars'])),
'S_LANG_OPTIONS' => (count($lang_row) > 1) ? language_select($data['lang']) : '', 'S_LANG_OPTIONS' => (count($lang_row) > 1) ? language_select($data['lang'], $lang_row) : '',
'S_TZ_PRESELECT' => !$submit, 'S_TZ_PRESELECT' => !$submit,
'S_CONFIRM_REFRESH' => ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false, 'S_CONFIRM_REFRESH' => ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false,
'S_REGISTRATION' => true, 'S_REGISTRATION' => true,

4
phpBB/styles/prosilver/template/ucp_register.html
View file

@ -57,12 +57,12 @@
<hr /> <hr />
<!-- EVENT ucp_register_options_before --> <!-- EVENT ucp_register_options_before -->
<!-- IF S_LANG_OPTIONS --> {% if S_LANG_OPTIONS %}
<dl> <dl>
<dt><label for="lang">{L_LANGUAGE}{L_COLON}</label></dt> <dt><label for="lang">{L_LANGUAGE}{L_COLON}</label></dt>
<dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="6" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd> <dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" tabindex="6" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
</dl> </dl>
<!-- ENDIF --> {% endif %}
<!-- INCLUDE timezone_option.html --> <!-- INCLUDE timezone_option.html -->