diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-04-29 08:35:30 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-04-29 08:35:30 +0200 |
| commit | 055d7658db7817b80d00b27d6e99cad961d0ee15 (patch) | |
| tree | aa34996f9d7248e7c58d64361329685a64b21d91 /phpBB/includes/functions_acp.php | |
| parent | bd2ddc1d2ec3e94a13e397198a8406d81481e9f2 (diff) | |
| parent | 2575b499a38ccf2480d5da9d5c566f47a9e2d824 (diff) | |
| download | forums-055d7658db7817b80d00b27d6e99cad961d0ee15.tar forums-055d7658db7817b80d00b27d6e99cad961d0ee15.tar.gz forums-055d7658db7817b80d00b27d6e99cad961d0ee15.tar.bz2 forums-055d7658db7817b80d00b27d6e99cad961d0ee15.tar.xz forums-055d7658db7817b80d00b27d6e99cad961d0ee15.zip | |
Merge branch 'prep-release-3.2.6' into 3.2.x
Diffstat (limited to 'phpBB/includes/functions_acp.php')
| -rw-r--r-- | phpBB/includes/functions_acp.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 9b7491305c..dd326c3db6 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -419,7 +419,7 @@ function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars) */ function validate_config_vars($config_vars, &$cfg_array, &$error) { - global $phpbb_root_path, $user, $phpbb_dispatcher, $phpbb_filesystem; + global $phpbb_root_path, $user, $phpbb_dispatcher, $phpbb_filesystem, $language; $type = 0; $min = 1; @@ -442,6 +442,16 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) // Validate a bit. ;) (0 = type, 1 = min, 2= max) switch ($validator[$type]) { + 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'])); + } + + // no break here + case 'string': $length = utf8_strlen($cfg_array[$config_name]); |