aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_profile_fields.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-06-02 08:45:48 +0200
committerNils Adermann <naderman@naderman.de>2011-06-02 08:49:59 +0200
commit7b10f859decdb5d97ffe97e647db52f29f4661f8 (patch)
tree7b216715266ec670ee09d8d7edfa1681e08d6ed5 /phpBB/includes/functions_profile_fields.php
parent2159e4f28584ad795515e0c6c509f32f634e698b (diff)
downloadforums-7b10f859decdb5d97ffe97e647db52f29f4661f8.tar
forums-7b10f859decdb5d97ffe97e647db52f29f4661f8.tar.gz
forums-7b10f859decdb5d97ffe97e647db52f29f4661f8.tar.bz2
forums-7b10f859decdb5d97ffe97e647db52f29f4661f8.tar.xz
forums-7b10f859decdb5d97ffe97e647db52f29f4661f8.zip
[ticket/10005] Add validation of dropdown custom profile field values
PHPBB3-10005
Diffstat (limited to 'phpBB/includes/functions_profile_fields.php')
-rw-r--r--phpBB/includes/functions_profile_fields.php14
1 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 78fe049f40..1eae2a9ad6 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -149,7 +149,18 @@ class custom_profile
case FIELD_DROPDOWN:
$field_value = (int) $field_value;
-
+
+ // retrieve option lang data if necessary
+ if (!isset($this->options_lang[$field_data['field_id']]) || !isset($this->options_lang[$field_data['field_id']][$field_data['lang_id']]) || !sizeof($this->options_lang[$file_data['field_id']][$field_data['lang_id']]))
+ {
+ $this->get_option_lang($field_data['field_id'], $field_data['lang_id'], FIELD_DROPDOWN, false);
+ }
+
+ if (!isset($this->options_lang[$field_data['field_id']][$field_data['lang_id']][$field_value]))
+ {
+ return 'FIELD_INVALID_VALUE';
+ }
+
if ($field_value == $field_data['field_novalue'] && $field_data['field_required'])
{
return 'FIELD_REQUIRED';
@@ -302,6 +313,7 @@ class custom_profile
switch ($cp_result)
{
case 'FIELD_INVALID_DATE':
+ case 'FIELD_INVALID_VALUE':
case 'FIELD_REQUIRED':
$error = sprintf($user->lang[$cp_result], $row['lang_name']);
break;