diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-07-25 13:01:23 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-07-25 13:01:23 +0000 |
| commit | d171762bc9fb5d6aedf36fad9d76dd362bdcdc78 (patch) | |
| tree | 9c1ecf0b0a6c8922413d3f83d03dc634cf68b352 /phpBB/includes/functions_profile_fields.php | |
| parent | 09bdc7297edb4f149c0a340109bc81d1f6444aea (diff) | |
| download | forums-d171762bc9fb5d6aedf36fad9d76dd362bdcdc78.tar forums-d171762bc9fb5d6aedf36fad9d76dd362bdcdc78.tar.gz forums-d171762bc9fb5d6aedf36fad9d76dd362bdcdc78.tar.bz2 forums-d171762bc9fb5d6aedf36fad9d76dd362bdcdc78.tar.xz forums-d171762bc9fb5d6aedf36fad9d76dd362bdcdc78.zip | |
small fixes.
#13794 : Raised the used error level by one
#13763 : Removed an old Beta2 compatibility fix
#13527 : cleaned up the code
#13525 : Changed templates as proposed by damnian
#11515 : added explanation about CPF checkboxes
git-svn-id: file:///svn/phpbb/trunk@7943 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_profile_fields.php')
| -rw-r--r-- | phpBB/includes/functions_profile_fields.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index 516a4570b8..f3ebe429cd 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -14,7 +14,7 @@ */ class custom_profile { - var $profile_types = array(1 => 'int', 2 => 'string', 3 => 'text', 4 => 'bool', 5 => 'dropdown', 6 => 'date'); + var $profile_types = array(FIELD_INT => 'int', FIELD_STRING => 'string', FIELD_TEXT => 'text', FIELD_BOOL => 'bool', FIELD_DROPDOWN => 'dropdown', FIELD_DATE => 'date'); var $profile_cache = array(); var $options_lang = array(); @@ -69,7 +69,7 @@ class custom_profile 'LANG_NAME' => $row['lang_name'], 'LANG_EXPLAIN' => $row['lang_explain'], 'FIELD' => $tpl_snippet, - 'FIELD_ID' => ($type == 6 || ($type == 4 && $row['field_length'] == '1')) ? '' : 'pf_' . $row['field_ident'], + 'FIELD_ID' => ($type == FIELD_DATE || ($type == FIELD_BOOL && $row['field_length'] == '1')) ? '' : 'pf_' . $row['field_ident'], 'S_REQUIRED' => ($row['field_required']) ? true : false) ); } @@ -528,7 +528,7 @@ class custom_profile } else { - return $this->options_lang[$field_id][$lang_id][(int) ($value + 1)]; + return $this->options_lang[$field_id][$lang_id][(int) ($value) + 1]; } break; @@ -547,8 +547,7 @@ class custom_profile global $user; $profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident']; - $user_ident = 'pf_' . str_replace('pf_', '', $profile_row['field_ident']); - + $user_ident = $profile_row['field_ident']; // checkbox - only testing for isset if ($profile_row['field_type'] == FIELD_BOOL && $profile_row['field_length'] == 2) { @@ -619,7 +618,7 @@ class custom_profile global $user, $template; $profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident']; - $user_ident = 'pf_' . str_replace('pf_', '', $profile_row['field_ident']); + $user_ident = $profile_row['field_ident']; $now = getdate(); @@ -994,7 +993,7 @@ class custom_profile_admin extends custom_profile ); $options = array( - 0 => array('TITLE' => $user->lang['FIELD_TYPE'], 'EXPLAIN' => $user->lang['BOOL_TYPE_EXPLAIN'], 'FIELD' => '<label><input type="radio" class="radio" name="field_length" value="1"' . (($this->vars['field_length'] == 1) ? ' checked="checked"' : '') . ' /> ' . $user->lang['RADIO_BUTTONS'] . '</label><label><input type="radio" class="radio" name="field_length" value="2"' . (($this->vars['field_length'] == 2) ? ' checked="checked"' : '') . ' /> ' . $user->lang['CHECKBOX'] . '</label>'), + 0 => array('TITLE' => $user->lang['FIELD_TYPE'], 'EXPLAIN' => $user->lang['BOOL_TYPE_EXPLAIN'], 'FIELD' => '<label><input type="radio" class="radio" name="field_length" value="1"' . (($this->vars['field_length'] == 1) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $user->lang['RADIO_BUTTONS'] . '</label><label><input type="radio" class="radio" name="field_length" value="2"' . (($this->vars['field_length'] == 2) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $user->lang['CHECKBOX'] . '</label>'), 1 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row)) ); |