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

[ticket/16526] Get rid of goto operator

Browse Source 
PHPBB3-16526
This commit is contained in:
rxu
2020-08-30 17:56:12 +07:00
parent 6cd54639b5
commit 13aa1ff760
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
phpBB/includes/functions_acp.php
View File

@ -446,27 +446,29 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
switch ($validator[$type]) switch ($validator[$type])
{ {
case 'url': case 'url':
$cfg_array[$config_name] = trim($cfg_array[$config_name]);
if (!empty($cfg_array[$config_name]) && !preg_match('#^' . get_preg_expression('url') . '$#iu', $cfg_array[$config_name]))
{
$error[] = $language->lang('URL_INVALID', $language->lang($config_definition['lang']));
}
goto validate_string;
case 'csv': case 'csv':
// Validate comma separated values if ($validator[$type] == 'url')
$unfiltered_array = explode(',', $cfg_array[$config_name]);
$filtered_array = array_filter($unfiltered_array);
if (!empty($filtered_array) && count($unfiltered_array) !== count($filtered_array))
{ {
$error[] = $language->lang('CSV_INVALID', $language->lang($config_definition['lang'])); $cfg_array[$config_name] = trim($cfg_array[$config_name]);
}
if (!empty($cfg_array[$config_name]) && !preg_match('#^' . get_preg_expression('url') . '$#iu', $cfg_array[$config_name]))
{
$error[] = $language->lang('URL_INVALID', $language->lang($config_definition['lang']));
}
}
else if ($validator[$type] == 'csv')
{
// Validate comma separated values
$unfiltered_array = explode(',', $cfg_array[$config_name]);
$filtered_array = array_filter($unfiltered_array);
if (!empty($filtered_array) && count($unfiltered_array) !== count($filtered_array))
{
$error[] = $language->lang('CSV_INVALID', $language->lang($config_definition['lang']));
}
}
// no break here // no break here
validate_string:
case 'string': case 'string':
$length = utf8_strlen($cfg_array[$config_name]); $length = utf8_strlen($cfg_array[$config_name]);