6 files changed, 1706 insertions, 17 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
new file mode 100644
index 0000000000..f7c3817c99
--- /dev/null
+++ b/phpBB/includes/acp/acp_profile.php
@@ -0,0 +1,1268 @@
+<?php
+/** 
+*
+* @package acp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package acp
+*/
+class acp_profile
+{
+	var $u_action = '';
+
+	function main($id, $mode)
+	{
+		global $config, $db, $user, $auth, $template, $cache;
+		global $SID, $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;
+
+		include($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
+		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+		include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
+
+		$user->add_lang(array('ucp', 'acp/profile'));
+		$this->tpl_name = 'acp_profile';
+		$this->page_title = 'ACP_CUSTOM_PROFILE_FIELDS';
+
+		$action = (isset($_POST['create'])) ? 'create' : request_var('action', '');
+
+		$this->u_action = "{$phpbb_admin_path}index.$phpEx$SID&amp;i=$id&amp;mode=$mode";
+		$error = array();
+		$s_hidden_fields = '';
+
+		// Define some default values for each field type
+		$default_values = array(
+			FIELD_STRING	=> array('field_length' => 10, 'field_minlen' => 0, 'field_maxlen' => 20, 'field_validation' => '.*', 'field_novalue' => '', 'field_default_value' => ''),
+			FIELD_TEXT		=> array('field_length' => '5|80', 'field_minlen' => 0, 'field_maxlen' => 1000, 'field_validation' => '.*', 'field_novalue' => '', 'field_default_value' => ''),
+			FIELD_INT		=> array('field_length' => 5, 'field_minlen' => 0, 'field_maxlen' => 100, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0),
+			FIELD_DATE		=> array('field_length' => 10, 'field_minlen' => 10, 'field_maxlen' => 10, 'field_validation' => '', 'field_novalue' => ' 0- 0-   0', 'field_default_value' => ' 0- 0-   0'),
+			FIELD_BOOL		=> array('field_length' => 1, 'field_minlen' => 0, 'field_maxlen' => 0, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0),
+			FIELD_DROPDOWN	=> array('field_length' => 0, 'field_minlen' => 0, 'field_maxlen' => 5, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0),
+		);
+
+		$cp = new custom_profile_admin();
+
+		// Build Language array
+		// Based on this, we decide which elements need to be edited later and which language items are missing
+		$lang_defs = array();
+
+		$sql = 'SELECT lang_id, lang_iso
+			FROM ' . LANG_TABLE;
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			// Make some arrays with all available languages
+			$lang_defs['id'][] = $row['lang_id'];
+			$lang_defs['iso'][$row['lang_iso']] = $row['lang_id'];
+		}
+		$db->sql_freeresult($result);
+
+		$sql = 'SELECT field_id, lang_id
+			FROM ' . PROFILE_LANG_TABLE . '
+				ORDER BY lang_id';
+		$result = $db->sql_query($sql);
+	
+		while ($row = $db->sql_fetchrow($result))
+		{
+			// Which languages are available for each item
+			$lang_defs['entry'][$row['field_id']][] = $row['lang_id'];
+		}
+		$db->sql_freeresult($result);
+
+		// Have some fields been defined?
+		if (isset($lang_defs['entry']))
+		{
+			foreach ($lang_defs['entry'] as $field_id => $field_ary)
+			{
+				// Fill an array with the languages that are missing for each field
+				$lang_defs['diff'][$field_id] = array_diff($lang_defs['id'], $field_ary);
+			}
+		}
+
+		switch ($action)
+		{
+			case 'delete':
+				$field_id = request_var('field_id', 0);
+
+				if (!$field_id)
+				{
+					trigger_error($user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action));
+				}
+
+				if (confirm_box(true))
+				{
+					$sql = 'SELECT field_ident 
+						FROM ' . PROFILE_FIELDS_TABLE . " 
+						WHERE field_id = $field_id";
+					$result = $db->sql_query($sql);
+					$field_ident = $db->sql_fetchfield('field_ident', 0, $result);
+					$db->sql_freeresult($result);
+
+					$db->sql_query('DELETE FROM ' . PROFILE_FIELDS_TABLE . " WHERE field_id = $field_id");
+					$db->sql_query('DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . " WHERE field_id = $field_id");
+					$db->sql_query('DELETE FROM ' . PROFILE_LANG_TABLE . " WHERE field_id = $field_id");
+					$db->sql_query('ALTER TABLE ' . PROFILE_DATA_TABLE . " DROP $field_ident");
+
+					$order = 0;
+
+					$sql = 'SELECT *
+						FROM ' . PROFILE_FIELDS_TABLE . '
+						ORDER BY field_order';
+					$result = $db->sql_query($sql);
+
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$order++;
+						if ($row['field_order'] != $order)
+						{
+							$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . " 
+								SET field_order = $order 
+								WHERE field_id = {$row['field_id']}";
+							$db->sql_query($sql);
+						}
+					}
+					$db->sql_freeresult($result);
+
+					add_log('admin', 'LOG_PROFILE_FIELD_REMOVED', $field_ident);
+					trigger_error($user->lang['REMOVED_PROFILE_FIELD'] . adm_back_link($this->u_action));
+				}
+				else
+				{
+					confirm_box(false, 'DELETE_PROFILE_FIELD', build_hidden_fields(array(
+						'i'			=> $id,
+						'mode'		=> $mode,
+						'action'	=> $action,
+						'field_id'	=> $field_id,
+					)));
+				}
+	
+			break;
+
+			case 'activate':
+				$field_id = request_var('field_id', 0);
+
+				if (!$field_id)
+				{
+					trigger_error($user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action));
+				}
+	
+				$sql = 'SELECT lang_id 
+					FROM ' . LANG_TABLE . " 
+					WHERE lang_iso = '{$config['default_lang']}'";
+				$result = $db->sql_query($sql);
+				$default_lang_id = (int) $db->sql_fetchfield('lang_id', 0, $result);
+				$db->sql_freeresult($result);
+
+				if (!in_array($default_lang_id, $lang_defs['entry'][$field_id]))
+				{
+					trigger_error($user->lang['DEFAULT_LANGUAGE_NOT_FILLED'] . adm_back_link($this->u_action));
+				}
+
+				$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . " 
+					SET field_active = 1 
+					WHERE field_id = $field_id";
+				$db->sql_query($sql);
+
+				$sql = 'SELECT field_ident 
+					FROM ' . PROFILE_FIELDS_TABLE . " 
+					WHERE field_id = $field_id";
+				$result = $db->sql_query($sql);
+				$field_ident = $db->sql_fetchfield('field_ident', 0, $result);
+				$db->sql_freeresult($result);
+
+				add_log('admin', 'LOG_PROFILE_FIELD_ACTIVATE', $field_ident);
+				trigger_error($user->lang['PROFILE_FIELD_ACTIVATED'] . adm_back_link($this->u_action));
+
+			break;
+
+			case 'deactivate':
+				$field_id = request_var('field_id', 0);
+
+				if (!$field_id)
+				{
+					trigger_error($user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action));
+				}
+	
+				$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . "
+					SET field_active = 0 
+					WHERE field_id = $field_id";
+				$db->sql_query($sql);
+
+				$sql = 'SELECT field_ident 
+					FROM ' . PROFILE_FIELDS_TABLE . " 
+					WHERE field_id = $field_id";
+				$result = $db->sql_query($sql);
+				$field_ident = $db->sql_fetchfield('field_ident', 0, $result);
+				$db->sql_freeresult($result);
+
+				add_log('admin', 'LOG_PROFILE_FIELD_DEACTIVATE', $field_ident);
+				trigger_error($user->lang['PROFILE_FIELD_DEACTIVATED'] . adm_back_link($this->u_action));
+
+			break;
+
+			case 'move_up':
+			case 'move_down':
+				$field_order = request_var('order', 0);
+				$order_total = $field_order * 2 + (($action == 'move_up') ? -1 : 1);
+
+				$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . "
+					SET field_order = $order_total - field_order
+					WHERE field_order IN ($field_order, " . (($action == 'move_up') ? $field_order - 1 : $field_order + 1) . ')';
+				$db->sql_query($sql);
+
+			break;
+
+			case 'create':
+			case 'edit':
+		
+				$field_id = request_var('field_id', 0);
+				$step = request_var('step', 1);
+
+				$submit = (isset($_REQUEST['next']) || isset($_REQUEST['prev'])) ? true : false;
+				$update = (isset($_REQUEST['update'])) ? true : false;
+				$save = (isset($_REQUEST['save'])) ? true : false;
+
+				// We are editing... we need to grab basic things
+				if ($action == 'edit')
+				{
+					if (!$field_id)
+					{
+						trigger_error($user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action));
+					}
+
+					$sql = 'SELECT l.*, f.*
+						FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f 
+						WHERE l.lang_id = ' . $lang_defs['iso'][$config['default_lang']] . "
+							AND f.field_id = $field_id
+							AND l.field_id = f.field_id";
+					$result = $db->sql_query($sql);
+					$field_row = $db->sql_fetchrow($result);
+					$db->sql_freeresult($result);
+
+					if (!$field_row)
+					{
+						trigger_error($user->lang['FIELD_NOT_FOUND'] . adm_back_link($this->u_action));
+					}
+					$field_type = $field_row['field_type'];
+
+					// Get language entries
+					$sql = 'SELECT * FROM ' . PROFILE_FIELDS_LANG_TABLE . ' 
+						WHERE lang_id = ' . $lang_defs['iso'][$config['default_lang']] . "
+							AND field_id = $field_id
+							ORDER BY option_id ASC";
+					$result = $db->sql_query($sql);
+
+					$lang_options = array();
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$lang_options[$row['option_id']] = $row['value'];
+					}
+					$db->sql_freeresult($result);
+
+					$field_row['pf_preview'] = '';
+
+					$s_hidden_fields = '<input type="hidden" name="field_id" value="' . $field_id . '" />';
+				}
+				else
+				{
+					// We are adding a new field, define basic params
+					$lang_options = $field_row = array();
+		
+					$field_type = request_var('field_type', 0);
+			
+					if (!$field_type)
+					{
+						trigger_error($user->lang['NO_FIELD_TYPE'] . adm_back_link($this->u_action));
+					}
+
+					$field_row = array_merge($default_values[$field_type], array(
+						'field_ident'		=> request_var('field_ident', ''),
+						'field_required'	=> 0,
+						'field_hide'		=> 0,
+						'field_no_view'		=> 0,
+						'field_show_on_reg'	=> 0,
+						'lang_name'			=> '',
+						'lang_explain'		=> '',
+						'lang_default_value'=> '',
+						'pf_preview'		=> '')
+					);
+
+					$s_hidden_fields = '<input type="hidden" name="field_type" value="' . $field_type . '" />';
+				}
+
+				// $exclude contains the data that we gather in each step
+				$exclude = array(
+					1	=> array('field_ident', 'lang_name', 'lang_explain'),
+					2	=> array('field_length', 'pf_preview', 'field_maxlen', 'field_minlen', 'field_validation', 'field_novalue', 'field_default_value', 'field_required', 'field_show_on_reg', 'field_hide', 'field_no_view'),
+					3	=> array('l_lang_name', 'l_lang_explain', 'l_lang_default_value', 'l_lang_options')
+				);
+
+				// Text-based fields require the lang_default_value to be excluded
+				if ($field_type == FIELD_STRING || $field_type == FIELD_TEXT)
+				{
+					$exclude[1][] = 'lang_default_value';
+				}
+
+				// option-specific fields require lang_options to be excluded
+				if ($field_type == FIELD_BOOL || $field_type == FIELD_DROPDOWN)
+				{
+					$exclude[1][] = 'lang_options';
+				}
+
+				$cp->vars['field_ident']		= request_var('field_ident', $field_row['field_ident']);
+				$cp->vars['lang_name']			= request_var('field_ident', $field_row['lang_name']);
+				$cp->vars['lang_explain']		= request_var('lang_explain', $field_row['lang_explain']);
+				$cp->vars['lang_default_value']	= request_var('lang_default_value', $field_row['lang_default_value']);
+
+				$options = request_var('lang_options', '');
+
+				// If the user has submitted a form with options (i.e. dropdown field)
+				if ($options)
+				{
+					$exploded_options = explode("\n", $options);
+
+					if (sizeof($exploded_options) == sizeof($lang_options) || $action == 'create')
+					{
+						// The number of options in the field is equal to the number of options already in the database
+						// Or we are creating a new dropdown list.
+						$cp->vars['lang_options']	= explode("\n", $options);
+					}
+					else if ($action == 'edit')
+					{
+						// Changing the number of options? (We remove and re-create the option fields)
+						$cp->vars['lang_options']	= explode("\n", $options);
+					}
+				}
+				else
+				{
+					$cp->vars['lang_options']	= $lang_options;
+				}
+
+				// step 2
+				foreach ($exclude[2] as $key)
+				{
+					if ($key == 'field_required' || $key == 'field_show_on_reg' || $key == 'field_hide' || $key == 'field_no_view')
+					{
+						// Are we creating or editing a field?
+						$var = (!$submit && $step == 1) ? $field_row[$key] : request_var($key, 0);
+				
+						// Damn checkboxes...
+						if (!$submit && $step == 1)
+						{
+							$_REQUEST[$key] = $var;
+						}
+					}
+					else
+					{
+						$var = request_var($key, $field_row[$key]);
+					}
+
+					// Manipulate the intended variables a little bit if needed
+					if ($field_type == FIELD_DROPDOWN && $key == 'field_maxlen')
+					{
+						// Get the number of options if this key is 'field_maxlen'
+						$var = sizeof(explode("\n", request_var('lang_options', '')));
+					}
+
+					if ($field_type == FIELD_TEXT && $key == 'field_length')
+					{
+						if (isset($_REQUEST['rows']))
+						{
+							$cp->vars['rows'] = request_var('rows', 0);
+							$cp->vars['columns'] = request_var('columns', 0);
+							$var = $cp->vars['rows'] . '|' . $cp->vars['columns'];
+						}
+						else
+						{
+							$row_col = explode('|', $var);
+							$cp->vars['rows'] = $row_col[0];
+							$cp->vars['columns'] = $row_col[1];
+						}
+					}
+
+					if ($field_type == FIELD_DATE && $key == 'field_default_value')
+					{
+						if (isset($_REQUEST['always_now']) || $var == 'now')
+						{
+							$now = getdate();
+
+							$cp->vars['field_default_value_day'] = $now['mday'];
+							$cp->vars['field_default_value_month'] = $now['mon'];
+							$cp->vars['field_default_value_year'] = $now['year'];
+							$var = $_POST['field_default_value'] = 'now';
+						}
+						else
+						{
+							if (isset($_REQUEST['field_default_value_day']))
+							{
+								$cp->vars['field_default_value_day'] = request_var('field_default_value_day', 0);
+								$cp->vars['field_default_value_month'] = request_var('field_default_value_month', 0);
+								$cp->vars['field_default_value_year'] = request_var('field_default_value_year', 0);
+								$var = $_POST['field_default_value'] = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']);
+							}
+							else
+							{
+								list($cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']) = explode('-', $var);
+							}
+						}	
+					}
+
+					$cp->vars[$key] = $var;
+				}
+
+				// step 3 - all arrays
+				if ($action == 'edit')
+				{
+					// Get language entries
+					$sql = 'SELECT * FROM ' . PROFILE_FIELDS_LANG_TABLE . ' 
+						WHERE lang_id <> ' . $lang_defs['iso'][$config['default_lang']] . "
+							AND field_id = $field_id
+						ORDER BY option_id ASC";
+					$result = $db->sql_query($sql);
+
+					$l_lang_options = array();
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$l_lang_options[$row['lang_id']][$row['option_id']] = $row['value'];
+					}
+					$db->sql_freeresult($result);
+
+		
+					$sql = 'SELECT lang_id, lang_name, lang_explain, lang_default_value FROM ' . PROFILE_LANG_TABLE . ' 
+						WHERE lang_id <> ' . $lang_defs['iso'][$config['default_lang']] . "
+							AND field_id = $field_id
+						ORDER BY lang_id ASC";
+					$result = $db->sql_query($sql);
+
+					$l_lang_name = $l_lang_explain = $l_lang_default_value = array();
+					while ($row = $db->sql_fetchrow($result))
+					{
+						$l_lang_name[$row['lang_id']] = $row['lang_name'];
+						$l_lang_explain[$row['lang_id']] = $row['lang_explain'];
+						$l_lang_default_value[$row['lang_id']] = $row['lang_default_value'];
+					}
+					$db->sql_freeresult($result);
+				}
+		
+				foreach ($exclude[3] as $key)
+				{
+					$cp->vars[$key] = request_var($key, '');
+
+					if (!$cp->vars[$key] && $action == 'edit')
+					{
+						$cp->vars[$key] = $$key;
+					}
+					else if ($key == 'l_lang_options' && sizeof($cp->vars[$key]) > 1)
+					{
+						foreach ($cp->vars[$key] as $lang_id => $options)
+						{
+							$cp->vars[$key][$lang_id] = explode("\n", $options);
+						}
+					}
+				}
+
+				if ($submit && $step == 1)
+				{
+					// Check values for step 1
+					if ($cp->vars['field_ident'] == '')
+					{
+						$error[] = $user->lang['EMPTY_FIELD_IDENT'];
+					}
+
+					if (!preg_match('/^[a-z_]+$/', $cp->vars['field_ident']))
+					{
+						$error[] = $user->lang['INVALID_CHARS_FIELD_IDENT'];
+					}
+
+					if ($cp->vars['lang_name'] == '')
+					{
+						$error[] = $user->lang['EMPTY_USER_FIELD_IDENT'];
+					}
+
+					if ($field_type == FIELD_BOOL || $field_type == FIELD_DROPDOWN)
+					{
+						if (!sizeof($cp->vars['lang_options']))
+						{
+							$error[] = $user->lang['NO_FIELD_ENTRIES'];
+						}
+					}	
+				}
+
+				$user_error = '';
+				if ($update && $step == 2)
+				{
+					// Validate Field
+					$user_error = $cp->validate_profile_field($field_type, $cp->vars['pf_preview'], $cp->vars);
+				}
+
+				$step = (isset($_REQUEST['next'])) ? $step + 1 : ((isset($_REQUEST['prev'])) ? $step - 1 : $step);
+
+				if (sizeof($error))
+				{
+					$step--;
+					$submit = false;
+				}
+
+				if (isset($_REQUEST['prev']) || isset($_REQUEST['next']))
+				{
+					$update = false;
+					$pf_preview = '';
+					unset($_REQUEST['pf_preview']);
+				}
+
+				// Build up the specific hidden fields
+				foreach ($exclude as $num => $key_ary)
+				{
+					if ($num == $step)
+					{
+						continue;
+					}
+					
+					$_new_key_ary = array();
+				
+					foreach ($key_ary as $key)
+					{
+						$var = isset($_REQUEST[$key]) ? request_var($key, '') : false;
+
+						if ($var !== false)
+						{
+							$_new_key_ary[$key] = $var;
+						}
+					}
+
+					$s_hidden_fields .= build_hidden_fields($_new_key_ary);
+				}
+
+				if (!sizeof($error))
+				{
+					if ($step == 3 && (sizeof($lang_defs['iso']) == 1 || $save))
+					{
+						$this->save_profile_field($cp, $field_type, $lang_defs, $action);
+					}
+				}
+
+				$template->assign_vars(array(
+					'S_EDIT'			=> true,
+					'ERROR_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
+
+					'L_TITLE'			=> $user->lang['STEP_' . $step . '_TITLE_' . strtoupper($action)],
+					'L_EXPLAIN'			=> $user->lang['STEP_' . $step . '_EXPLAIN_' . strtoupper($action)],
+					
+					'U_ACTION'			=> $this->u_action . "&amp;action=$action&amp;step=$step",
+					'U_BACK'			=> $this->u_action)
+				);
+
+				// Now go through the steps
+				switch ($step)
+				{
+					// Create basic options - only small differences between field types
+					case 1: 
+	
+						// Build common create options
+						$template->assign_vars(array(
+							'S_STEP_ONE'		=> true,
+							'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
+
+							'L_LANG_SPECIFIC'	=> sprintf($user->lang['LANG_SPECIFIC_OPTIONS'], $config['default_lang']),
+							'FIELD_TYPE'		=> $user->lang['FIELD_' . strtoupper($cp->profile_types[$field_type])],
+							'FIELD_IDENT'		=> $cp->vars['field_ident'],
+							'LANG_NAME'			=> $cp->vars['lang_name'],
+							'LANG_EXPLAIN'		=> $cp->vars['lang_explain'])
+						);
+
+						// String and Text needs to set default values here...
+						if ($field_type == FIELD_STRING || $field_type == FIELD_TEXT)
+						{
+							$template->assign_vars(array(
+								'S_TEXT'		=> ($field_type == FIELD_TEXT) ? true : false,
+								'S_STRING'		=> ($field_type == FIELD_STRING) ? true : false,
+
+								'L_DEFAULT_VALUE_EXPLAIN'	=> $user->lang[strtoupper($cp->profile_types[$field_type]) . '_DEFAULT_VALUE_EXPLAIN'],
+								'LANG_DEFAULT_VALUE'		=> $cp->vars['lang_default_value'])
+							);
+						}
+			
+						if ($field_type == FIELD_BOOL || $field_type == FIELD_DROPDOWN)
+						{
+							// Initialize these array elements if we are creating a new field
+							if (!sizeof($cp->vars['lang_options']))
+							{
+								if ($field_type == FIELD_BOOL)
+								{
+									// No options have been defined for a boolean field.
+									$cp->vars['lang_options'][0] = '';
+									$cp->vars['lang_options'][1] = '';
+								}
+								else
+								{
+									// No options have been defined for the dropdown menu
+									$cp->vars['lang_options'] = array();
+								}
+							}
+
+							$template->assign_vars(array(
+								'S_BOOL'		=> ($field_type == FIELD_BOOL) ? true : false,
+								'S_DROPDOWN'	=> ($field_type == FIELD_DROPDOWN) ? true : false,
+
+								'L_LANG_OPTIONS_EXPLAIN'	=> $user->lang[strtoupper($cp->profile_types[$field_type]) . '_ENTRIES_EXPLAIN'],
+								'LANG_OPTIONS'				=> ($field_type == FIELD_DROPDOWN) ? implode("\n", $cp->vars['lang_options']) : '',
+								'FIRST_LANG_OPTION'			=> ($field_type == FIELD_BOOL) ? $cp->vars['lang_options'][0] : '',
+								'SECOND_LANG_OPTION'		=> ($field_type == FIELD_BOOL) ? $cp->vars['lang_options'][1] : '')
+							);
+						}
+					
+					break;
+
+					case 2:
+						
+						$template->assign_vars(array(
+							'S_STEP_TWO'		=> true,
+							'S_FIELD_REQUIRED'	=> ($cp->vars['field_required']) ? true : false,
+							'S_SHOW_ON_REG'		=> ($cp->vars['field_show_on_reg']) ? true : false,
+							'S_FIELD_HIDE'		=> ($cp->vars['field_hide']) ? true : false,
+							'S_FIELD_NO_VIEW'	=> ($cp->vars['field_no_view']) ? true : false,
+							'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
+							
+							'L_NEXT'			=> (sizeof($lang_defs['iso']) == 1) ? $user->lang['SAVE'] : $user->lang['PROFILE_LANG_OPTIONS'])
+						);
+
+						// Build options based on profile type
+						$function = 'get_' . $cp->profile_types[$field_type] . '_options';
+						$options = $cp->$function();
+
+						foreach ($options as $num => $option_ary)
+						{
+							$template->assign_block_vars('option', $option_ary);
+						}
+
+						if ($user_error || $update) 
+						{
+							// If not and only showing common error messages, use this one
+							switch ($user_error)
+							{
+								case 'FIELD_INVALID_DATE':
+								case 'FIELD_REQUIRED':
+									$user_error = sprintf($user->lang[$user_error], $cp->vars['lang_name']);
+								break;
+								
+								case 'FIELD_TOO_SHORT':
+								case 'FIELD_TOO_SMALL':
+									$user_error = sprintf($user->lang[$user_error], $cp->vars['lang_name'], $cp->vars['field_minlen']);
+								break;
+								
+								case 'FIELD_TOO_LONG':
+								case 'FIELD_TOO_LARGE':
+									$user_error = sprintf($user->lang[$user_error], $cp->vars['lang_name'], $cp->vars['field_maxlen']);
+								break;
+								
+								case 'FIELD_INVALID_CHARS':
+									switch ($cp->vars['field_validation'])
+									{
+										case '[0-9]+':
+											$user_error = sprintf($user->lang[$user_error . '_NUMBERS_ONLY'], $cp->vars['lang_name']);
+										break;
+	
+										case '[\w]+':
+											$user_error = sprintf($user->lang[$user_error . '_ALPHA_ONLY'], $cp->vars['lang_name']);
+										break;
+										
+										case '[\w_\+\. \-\[\]]+':
+											$user_error = sprintf($user->lang[$user_error . '_SPACERS_ONLY'], $cp->vars['lang_name']);
+										break;
+									}
+								break;
+
+								default:
+									$user_error = '';
+							}
+
+							$template->assign_var('USER_ERROR', $user_error);
+						}
+			
+						$preview_field = $cp->process_field_row('preview', array(
+							'lang_name'		=> $cp->vars['lang_name'],
+							'lang_explain'	=> $cp->vars['lang_explain'],
+							'lang_id'		=> $lang_defs['iso'][$config['default_lang']],
+							'field_id'		=> 1,
+
+							'lang_default_value'	=> $cp->vars['lang_default_value'],
+							'field_default_value'	=> $cp->vars['field_default_value'],
+							'field_ident'			=> 'preview',
+							'field_type'			=> $field_type,
+
+							'field_length'	=> $cp->vars['field_length'],
+							'field_maxlen'	=> $cp->vars['field_maxlen'],
+							'lang_options'	=> $cp->vars['lang_options'])
+						);
+						
+						$template->assign_vars(array(
+							'PREVIEW_LANG_NAME'		=> $cp->vars['lang_name'],
+							'PREVIEW_LANG_EXPLAIN'	=> $cp->vars['lang_explain'],
+							'PREVIEW_FIELD'			=> $preview_field)
+						);
+
+					break;
+
+					// Define remaining language variables
+					case 3: 
+
+						$template->assign_vars(array(
+							'S_STEP_THREE'		=> true,
+							'S_HIDDEN_FIELDS'	=> $s_hidden_fields)
+						);
+						
+						$options = $this->build_language_options($cp, $field_type, $action);
+
+						foreach ($options as $lang_id => $lang_ary)
+						{
+							$template->assign_block_vars('options', array(
+								'LANGUAGE'		=> ($lang_ary['lang_iso'] == $config['default_lang']) ? sprintf($user->lang['DEFAULT_ISO_LANGUAGE'], $config['default_lang']) : sprintf($user->lang['ISO_LANGUAGE'], $lang_ary['lang_iso']))
+							);
+
+							foreach ($lang_ary['fields'] as $field_ident => $field_ary)
+							{
+								$template->assign_block_vars('options.field', array(
+									'L_TITLE'		=> $field_ary['TITLE'],
+									'L_EXPLAIN'		=> (isset($field_ary['EXPLAIN'])) ? $field_ary['EXPLAIN'] : '',
+									'FIELD'			=> $field_ary['FIELD'])
+								);
+							}
+						}
+		
+					break;
+				}
+			
+				return;
+
+			break;
+		}
+		
+		$sql = 'SELECT *
+			FROM ' . PROFILE_FIELDS_TABLE . '
+			ORDER BY field_order';
+		$result = $db->sql_query($sql);
+
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$active_lang = (!$row['field_active']) ? 'ACTIVATE' : 'DEACTIVATE';
+			$active_value = (!$row['field_active']) ? 'activate' : 'deactivate';
+			$id = $row['field_id'];
+
+			$template->assign_block_vars('fields', array(
+				'FIELD_IDENT'		=> $row['field_ident'],
+				'FIELD_TYPE'		=> $user->lang['FIELD_' . strtoupper($cp->profile_types[$row['field_type']])],
+
+				'L_ACTIVATE_DEACTIVATE'		=> $user->lang[$active_lang],
+				'U_ACTIVATE_DEACTIVATE'		=> $this->u_action . "&amp;action=$active_value&amp;field_id=$id",
+				'U_EDIT'					=> $this->u_action . "&amp;action=edit&amp;field_id=$id",
+				'U_DELETE'					=> $this->u_action . "&amp;action=delete&amp;field_id=$id",
+				'U_MOVE_UP'					=> $this->u_action . "&amp;action=move_up&amp;order={$row['field_order']}",
+				'U_MOVE_DOWN'				=> $this->u_action . "&amp;action=move_down&amp;order={$row['field_order']}",
+
+				'S_NEED_EDIT'		=> (sizeof($lang_defs['diff'][$row['field_id']])) ? true : false)
+			);
+		}
+		$db->sql_freeresult($result);
+
+		$s_select_type = '';
+		foreach ($cp->profile_types as $key => $value)
+		{
+			$s_select_type .= '<option value="' . $key . '">' . $user->lang['FIELD_' . strtoupper($value)] . '</option>';
+		}
+
+		$template->assign_vars(array(
+			'U_ACTION'			=> $this->u_action,
+			'S_TYPE_OPTIONS'	=> $s_select_type)
+		);
+	}
+
+	/**
+	* Build all Language specific options
+	*/
+	function build_language_options(&$cp, $field_type, $action = 'create')
+	{
+		global $user, $config, $db;
+
+		$sql = 'SELECT lang_id, lang_iso 
+			FROM ' . LANG_TABLE . "
+			WHERE lang_iso <> '" . $config['default_lang'] . "'";
+		$result = $db->sql_query($sql);
+
+		$languages = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$languages[$row['lang_id']] = $row['lang_iso'];
+		}
+		$db->sql_freeresult($result);
+		
+		$options = array();
+		$options['lang_name'] = 'string';
+		if ($cp->vars['lang_explain'])
+		{
+			$options['lang_explain'] = 'text';
+		}
+	
+		switch ($field_type)
+		{
+			case FIELD_BOOL:
+				$options['lang_options'] = 'two_options';
+			break;
+
+			case FIELD_DROPDOWN:
+				$options['lang_options'] = 'optionfield';
+			break;
+			
+			case FIELD_TEXT:
+			case FIELD_STRING:
+				if ($cp->vars['lang_default_value'])
+				{
+					$options['lang_default_value'] = ($field_type == FIELD_STRING) ? 'string' : 'text';
+				}
+			break;
+		}
+	
+		$lang_options = array();
+
+		foreach ($options as $field => $field_type)
+		{
+			$lang_options[1]['lang_iso'] = $config['default_lang'];
+			$lang_options[1]['fields'][$field] = array(
+				'TITLE'		=> $user->lang['CP_' . strtoupper($field)],
+				'FIELD'		=> '<dd>' . ((is_array($cp->vars[$field])) ? implode('<br />', $cp->vars[$field]) : str_replace("\n", '<br />', $cp->vars[$field])) . '</dd>'
+			);
+
+			if (isset($user->lang['CP_' . strtoupper($field) . '_EXPLAIN']))
+			{
+				$lang_options[1]['fields'][$field]['EXPLAIN'] = $user->lang['CP_' . strtoupper($field) . '_EXPLAIN'];
+			}
+		}
+
+		foreach ($languages as $lang_id => $lang_iso)
+		{
+			$lang_options[$lang_id]['lang_iso'] = $lang_iso;
+			foreach ($options as $field => $field_type)
+			{
+				$value = ($action == 'create') ? request_var('l_' . $field, '') : $cp->vars['l_' . $field];
+					 
+				if ($field == 'lang_options')
+				{
+
+					$var = ($action == 'create' || !is_array($cp->vars['lang_options'][$lang_id])) ? $cp->vars['lang_options'] : $cp->vars['lang_options'][$lang_id];
+					
+					switch ($field_type)
+					{
+						case 'two_options':
+
+							$lang_options[$lang_id]['fields'][$field] = array(
+								'TITLE'		=> $user->lang['CP_' . strtoupper($field)],
+								'FIELD'		=> '
+											<dd><input class="medium" name="l_' . $field . '[' . $lang_id . '][]" value="' . ((isset($value[$lang_id][0])) ? $value[$lang_id][0] : $var[0]) . '" /> ' . $user->lang['FIRST_OPTION'] . '</dd>
+											<dd><input class="medium" name="l_' . $field . '[' . $lang_id . '][]" value="' . ((isset($value[$lang_id][1])) ? $value[$lang_id][1] : $var[1]) . '" /> ' . $user->lang['SECOND_OPTION'] . '</dd>'
+							);
+						break;
+
+						case 'optionfield':
+
+							$lang_options[$lang_id]['fields'][$field] = array(
+								'TITLE'		=> $user->lang['CP_' . strtoupper($field)],
+								'FIELD'		=> '<dd><textarea name="l_' . $field . '[' . $lang_id . ']" rows="7" cols="80">' . ((isset($value[$lang_id])) ? implode("\n", $value[$lang_id]) : implode("\n", $var)) . '</textarea></dd>'
+							);
+						break;
+					}
+				
+					if (isset($user->lang['CP_' . strtoupper($field) . '_EXPLAIN']))
+					{
+						$lang_options[$lang_id]['fields'][$field]['EXPLAIN'] = $user->lang['CP_' . strtoupper($field) . '_EXPLAIN'];
+					}
+				}
+				else
+				{
+					$var = ($action == 'create' || !is_array($cp->vars[$field])) ? $cp->vars[$field] : $cp->vars[$field][$lang_id];
+
+					$lang_options[$lang_id]['fields'][$field] = array(
+						'TITLE'		=> $user->lang['CP_' . strtoupper($field)],
+						'FIELD'		=> ($field_type == 'string') ? '<dd><input class="medium" type="text" name="l_' . $field . '[' . $lang_id . ']" value="' . ((isset($value[$lang_id])) ? $value[$lang_id] : $var) . '" /></dd>' : '<dd><textarea name="l_' . $field . '[' . $lang_id . ']" rows="3" cols="80">' . ((isset($value[$lang_id])) ? $value[$lang_id] : $var) . '</textarea></dd>'
+					);
+			
+					if (isset($user->lang['CP_' . strtoupper($field) . '_EXPLAIN']))
+					{
+						$lang_options[$lang_id]['fields'][$field]['EXPLAIN'] = $user->lang['CP_' . strtoupper($field) . '_EXPLAIN'];
+					}
+				}
+			}
+		}
+
+		return $lang_options;
+	}
+
+	/**
+	* Save Profile Field
+	*/
+	function save_profile_field(&$cp, $field_type, &$lang_defs, $action = 'create')
+	{
+		global $db, $config, $user;
+
+		$field_id = request_var('field_id', 0);
+
+		// Collect all informations, if something is going wrong, abort the operation
+		$profile_sql = $profile_lang = $empty_lang = $profile_lang_fields = array();
+
+		$default_lang_id = $lang_defs['iso'][$config['default_lang']];
+
+		if ($action == 'create')
+		{
+			$result = $db->sql_query('SELECT MAX(field_order) as max_field_order FROM ' . PROFILE_FIELDS_TABLE);
+			$new_field_order = (int) $db->sql_fetchfield('max_field_order', 0, $result);
+			$db->sql_freeresult($result);
+			
+			$field_ident = $cp->vars['field_ident'];
+		}
+
+		// Save the field
+		$profile_fields = array(
+			'field_length'		=> $cp->vars['field_length'],
+			'field_minlen'		=> $cp->vars['field_minlen'],
+			'field_maxlen'		=> $cp->vars['field_maxlen'],
+			'field_novalue'		=> $cp->vars['field_novalue'],
+			'field_default_value'	=> $cp->vars['field_default_value'],
+			'field_validation'	=> $cp->vars['field_validation'],
+			'field_required'	=> $cp->vars['field_required'],
+			'field_show_on_reg'	=> $cp->vars['field_show_on_reg'],
+			'field_hide'		=> $cp->vars['field_hide'],
+			'field_no_view'		=> $cp->vars['field_no_view']
+		);
+
+		if ($action == 'create')
+		{
+			$profile_fields += array(
+				'field_type'		=> $field_type,
+				'field_ident'		=> $field_ident,
+				'field_order'		=> $new_field_order + 1,
+				'field_active'		=> 1
+			);
+
+			$db->sql_query('INSERT INTO ' . PROFILE_FIELDS_TABLE . ' ' . $db->sql_build_array('INSERT', $profile_fields));
+
+			$field_id = $db->sql_nextid();
+		}
+		else
+		{
+			$db->sql_query('UPDATE ' . PROFILE_FIELDS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $profile_fields) . "
+				WHERE field_id = $field_id");
+		}
+		
+		if ($action == 'create')
+		{
+			// We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
+			$sql = 'ALTER TABLE ' . PROFILE_DATA_TABLE . " ADD $field_ident ";
+
+			switch ($field_type)
+			{
+				case FIELD_STRING:
+					$sql .= ' VARCHAR(255) DEFAULT NULL NULL';
+				break;
+
+				case FIELD_DATE:
+					$sql .= 'VARCHAR(10) DEFAULT NULL NULL';
+				break;
+
+				case FIELD_TEXT:
+					$sql .= "TEXT NULL,
+						ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL,
+						ADD {$field_ident}_bbcode_bitfield INT(11) UNSIGNED";
+				break;
+
+				case FIELD_BOOL:
+					$sql .= 'TINYINT(2) DEFAULT NULL NULL';
+				break;
+		
+				case FIELD_DROPDOWN:
+					$sql .= 'MEDIUMINT(8) DEFAULT NULL NULL';
+				break;
+
+				case FIELD_INT:
+					$sql .= 'BIGINT(20) DEFAULT NULL NULL';
+				break;
+			}
+	
+			$profile_sql[] = $sql;
+		}
+
+		$sql_ary = array(
+			'lang_name'		=> $cp->vars['lang_name'],
+			'lang_explain'	=> $cp->vars['lang_explain'],
+			'lang_default_value'	=> $cp->vars['lang_default_value']
+		);
+
+		if ($action == 'create')
+		{
+			$sql_ary['field_id'] = $field_id;
+			$sql_ary['lang_id'] = $default_lang_id;
+		
+			$profile_sql[] = 'INSERT INTO ' . PROFILE_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
+		}
+		else
+		{
+			$this->update_insert(PROFILE_LANG_TABLE, $sql_ary, array('field_id' => $field_id, 'lang_id' => $default_lang_id));
+		}
+
+		if (is_array($cp->vars['l_lang_name']) && sizeof($cp->vars['l_lang_name']))
+		{
+			foreach ($cp->vars['l_lang_name'] as $lang_id => $data)
+			{
+				if (($cp->vars['lang_name'] != '' && $cp->vars['l_lang_name'][$lang_id] == '')
+					|| ($cp->vars['lang_explain'] != '' && $cp->vars['l_lang_explain'][$lang_id] == '')
+					|| ($cp->vars['lang_default_value'] != '' && $cp->vars['l_lang_default_value'][$lang_id] == ''))
+				{
+					$empty_lang[$lang_id] = true;
+					break;
+				}
+
+				if (!isset($empty_lang[$lang_id]))
+				{
+					$profile_lang[] = array(
+						'field_id'		=> $field_id,
+						'lang_id'		=> $lang_id,
+						'lang_name'		=> $cp->vars['l_lang_name'][$lang_id],
+						'lang_explain'	=> (isset($cp->vars['l_lang_explain'][$lang_id])) ? $cp->vars['l_lang_explain'][$lang_id] : '',
+						'lang_default_value'	=> (isset($cp->vars['l_lang_default_value'][$lang_id])) ? $cp->vars['l_lang_default_value'][$lang_id] : ''
+					);
+				}
+			}
+
+			foreach ($empty_lang as $lang_id => $NULL)
+			{
+				$sql = 'DELETE FROM ' . PROFILE_LANG_TABLE . " 
+					WHERE field_id = $field_id
+					AND lang_id = " . (int) $lang_id;
+				$db->sql_query($sql);
+			}
+		}
+
+		$cp->vars['l_lang_name']			= request_var('l_lang_name', '');
+		$cp->vars['l_lang_explain']			= request_var('l_lang_explain', '');
+		$cp->vars['l_lang_default_value']	= request_var('l_lang_default_value', '');
+		$cp->vars['l_lang_options']			= request_var('l_lang_options', '');
+
+		if ($cp->vars['lang_options'])
+		{
+			if (!is_array($cp->vars['lang_options']))
+			{
+				$cp->vars['lang_options'] = explode("\n", $cp->vars['lang_options']);
+			}
+
+			if ($action != 'create')
+			{
+				$sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . " 
+					WHERE field_id = $field_id
+						AND lang_id = " . (int) $default_lang_id;
+				$db->sql_query($sql);
+			}
+			
+			foreach ($cp->vars['lang_options'] as $option_id => $value)
+			{
+				$sql_ary = array(
+					'field_type'	=> (int) $field_type,
+					'value'			=> $value
+				);
+
+				if ($action == 'create')
+				{
+					$sql_ary['field_id'] = $field_id;
+					$sql_ary['lang_id'] = $default_lang_id;
+					$sql_ary['option_id'] = (int) $option_id;
+
+					$profile_sql[] = 'INSERT INTO ' . PROFILE_FIELDS_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
+				}
+				else
+				{
+					$this->update_insert(PROFILE_FIELDS_LANG_TABLE, $sql_ary, array(
+						'field_id' => $field_id,
+						'lang_id' => (int) $default_lang_id,
+						'option_id' => (int) $option_id)
+					);
+				}
+			}
+		}
+
+		if (is_array($cp->vars['l_lang_options']) && sizeof($cp->vars['l_lang_options']))
+		{
+			$empty_lang = array();
+
+			foreach ($cp->vars['l_lang_options'] as $lang_id => $lang_ary)
+			{
+				if (!is_array($lang_ary))
+				{
+					$lang_ary = explode("\n", $lang_ary);
+				}
+
+				if (sizeof($lang_ary) != sizeof($cp->vars['lang_options']))
+				{
+					$empty_lang[$lang_id] = true;
+				}
+
+				if (!isset($empty_lang[$lang_id]))
+				{
+					if ($action != 'create')
+					{
+						$sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . " 
+							WHERE field_id = $field_id
+							AND lang_id = " . (int) $lang_id;
+						$db->sql_query($sql);
+					}
+
+					foreach ($lang_ary as $option_id => $value)
+					{
+						$profile_lang_fields[] = array(
+							'field_id'		=> (int) $field_id,
+							'lang_id'		=> (int) $lang_id,
+							'option_id'		=> (int) $option_id,
+							'field_type'	=> (int) $field_type,
+							'value'			=> $value
+						);
+					}
+				}
+			}
+
+			foreach ($empty_lang as $lang_id => $NULL)
+			{
+				$sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . " 
+					WHERE field_id = $field_id
+					AND lang_id = " . (int) $lang_id;
+				$db->sql_query($sql);
+			}
+		}
+
+		foreach ($profile_lang as $sql)
+		{
+			if ($action == 'create')
+			{
+				$profile_sql[] = 'INSERT INTO ' . PROFILE_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql);
+			}
+			else
+			{
+				$lang_id = $sql['lang_id'];
+				unset($sql['lang_id'], $sql['field_id']);
+
+				$this->update_insert(PROFILE_LANG_TABLE, $sql, array('lang_id' => (int) $lang_id, 'field_id' => $field_id));
+			}
+		}
+
+		if (sizeof($profile_lang_fields))
+		{
+			foreach ($profile_lang_fields as $sql)
+			{
+				if ($action == 'create')
+				{
+					$profile_sql[] = 'INSERT INTO ' . PROFILE_FIELDS_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql);
+				}
+				else
+				{
+					$lang_id = $sql['lang_id'];
+					$option_id = $sql['option_id'];
+					unset($sql['lang_id'], $sql['field_id'], $sql['option_id']);
+					
+					$this->update_insert(PROFILE_FIELDS_LANG_TABLE, $sql, array(
+						'lang_id'	=> $lang_id, 
+						'field_id'	=> $field_id,
+						'option_id'	=> $option_id)
+					);
+				}
+			}
+		}
+
+		$db->sql_transaction();
+
+		if ($action == 'create')
+		{
+			foreach ($profile_sql as $sql)
+			{
+				$db->sql_query($sql);
+			}
+		}
+		
+		$db->sql_transaction('commit');
+
+		if ($action == 'edit')
+		{
+			add_log('admin', 'LOG_PROFILE_FIELD_EDIT', $cp->vars['field_ident'] . ':' . $cp->vars['lang_name']);
+			trigger_error($user->lang['CHANGED_PROFILE_FIELD'] . adm_back_link($this->u_action));
+		}
+		else
+		{
+			add_log('admin', 'LOG_PROFILE_FIELD_CREATE', $field_ident . ':' . $cp->vars['lang_name']);
+			trigger_error($user->lang['ADDED_PROFILE_FIELD'] . adm_back_link($this->u_action));
+		}
+	}
+
+	/**
+	* Update, then insert if not successfull
+	*/
+	function update_insert($table, $sql_ary, $where_fields)
+	{
+		global $db;
+
+		$where_sql = array();
+		$check_key = '';
+
+		foreach ($where_fields as $key => $value)
+		{
+			$check_key = (!$check_key) ? $key : $check_key;
+			$where_sql[] = $key . ' = ' . ((is_string($value)) ? "'" . $db->sql_escape($value) . "'" : (int) $value);
+		}
+
+		$sql = "SELECT $check_key 
+			FROM $table
+			WHERE " . implode(' AND ', $where_sql);
+		$result = $db->sql_query($sql);
+	
+		if (!$db->sql_fetchrow($result))
+		{
+			$db->sql_freeresult($result);
+
+			$sql_ary = array_merge($where_fields, $sql_ary);
+			$db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql_ary));
+		}
+		else
+		{
+			$db->sql_freeresult($result);
+	
+			$sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql_ary) . ' 
+				WHERE ' . implode(' AND ', $where_sql);
+			$db->sql_query($sql);
+		}
+	}
+}
+
+/**
+* @package module_install
+*/
+class acp_profile_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_profile',
+			'title'		=> 'ACP_CUSTOM_PROFILE_FIELDS',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'profile'	=> array('title' => 'ACP_CUSTOM_PROFILE_FIELDS', 'auth' => 'acl_a_user'),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}
+
+?>
+\ No newline at end of file
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
new file mode 100644
index 0000000000..532380aa66
--- /dev/null
+++ b/phpBB/includes/acp/acp_prune.php
@@ -0,0 +1,409 @@
+<?php
+/** 
+*
+* @package acp
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* @package acp
+*/
+class acp_prune
+{
+	var $u_action = '';
+
+	function main($id, $mode)
+	{
+		global $user, $phpEx, $SID, $phpbb_admin_path;
+
+		$user->add_lang('acp/prune');
+
+		$this->u_action = "{$phpbb_admin_path}index.$phpEx$SID&amp;i=$id&amp;mode=$mode";
+
+		switch ($mode)
+		{
+			case 'forums':
+				$this->tpl_name = 'acp_prune_forums';
+				$this->page_header = 'ACP_PRUNE_FORUMS';
+				$this->prune_forums($id, $mode);
+			break;
+
+			case 'users':
+				$this->tpl_name = 'acp_prune_users';
+				$this->page_header = 'ACP_PRUNE_USERS';
+				$this->prune_users($id, $mode);
+			break;
+		}
+	}
+
+	/**
+	* Prune forums
+	*/
+	function prune_forums($id, $mode)
+	{
+		global $db, $user, $auth, $template, $cache;
+		global $config, $SID, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		$forum_id = request_var('f', array(0));
+		$submit = (isset($_POST['submit'])) ? true : false;
+
+		if ($submit)
+		{
+			$prune_posted = request_var('prune_days', 0);
+			$prune_viewed = request_var('prune_vieweddays', 0);
+			$prune_all = !$prune_posted && !$prune_viewed;
+	
+			$prune_flags = 0;
+			$prune_flags += (request_var('prune_old_polls', 0)) ? 2 : 0;
+			$prune_flags += (request_var('prune_announce', 0)) ? 4 : 0;
+			$prune_flags += (request_var('prune_sticky', 0)) ? 8 : 0;
+
+			// Convert days to seconds for timestamp functions...
+			$prunedate_posted = time() - ($prune_posted * 86400);
+			$prunedate_viewed = time() - ($prune_viewed * 86400);
+
+			$template->assign_vars(array(
+				'S_PRUNED'		=> true)
+			);
+
+			$sql_forum = (sizeof($forum_id)) ? ' AND forum_id IN (' . implode(', ', $forum_id) . ')' : '';
+
+			// Get a list of forum's or the data for the forum that we are pruning.
+			$sql = 'SELECT forum_id, forum_name 
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type = ' . FORUM_POST . "
+					$sql_forum 
+				ORDER BY left_id ASC";
+			$result = $db->sql_query($sql);
+
+			if ($row = $db->sql_fetchrow($result))
+			{
+				$prune_ids = array();
+				$p_result['topics'] = 0;
+				$p_result['posts'] = 0;
+				$log_data = '';
+		
+				do
+				{
+					if (!$auth->acl_get('f_list', $row['forum_id']))
+					{
+						continue;
+					}
+
+					if ($prune_all)
+					{
+						$p_result = prune($row['forum_id'], 'posted', time(), $prune_flags, false);
+					}
+					else
+					{
+						if ($prune_posted)
+						{
+							$return = prune($row['forum_id'], 'posted', $prunedate_posted, $prune_flags, false);
+							$p_result['topics'] += $return['topics'];
+							$p_result['posts'] += $return['posts'];
+						}
+		
+						if ($prune_viewed)
+						{
+							$return = prune($row['forum_id'], 'viewed', $prunedate_viewed, $prune_flags, false);
+							$p_result['topics'] += $return['topics'];
+							$p_result['posts'] += $return['posts'];
+						}
+					}
+
+					$prune_ids[] = $row['forum_id'];
+
+					$template->assign_block_vars('pruned', array(
+						'FORUM_NAME'	=> $row['forum_name'],
+						'NUM_TOPICS'	=> $p_result['topics'],
+						'NUM_POSTS'		=> $p_result['posts'])
+					);
+	
+					$log_data .= (($log_data != '') ? ', ' : '') . $row['forum_name'];
+				}
+				while ($row = $db->sql_fetchrow($result));
+	
+				// Sync all pruned forums at once
+				sync('forum', 'forum_id', $prune_ids, true);
+				add_log('admin', 'LOG_PRUNE', $log_data);
+			}
+			$db->sql_freeresult($result);
+
+			return;
+		}
+
+		// If they haven't selected a forum for pruning yet then
+		// display a select box to use for pruning.
+		if (!sizeof($forum_id))
+		{
+			$template->assign_vars(array(
+				'U_ACTION'			=> $this->u_action,
+				'S_SELECT_FORUM'	=> true,
+				'S_FORUM_OPTIONS'	=> make_forum_select(false, false, false))
+			);		
+		}
+		else
+		{
+			$sql = 'SELECT forum_id, forum_name 
+				FROM ' . FORUMS_TABLE . ' 
+				WHERE forum_id IN (' . implode(', ', $forum_id) . ')';
+			$result = $db->sql_query($sql);
+
+			if (!($row = $db->sql_fetchrow($result)))
+			{
+				trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action));
+			}
+
+			$forum_list = $s_hidden_fields = '';
+			do
+			{
+				$forum_list .= (($forum_list != '') ? ', ' : '') . '<b>' . $row['forum_name'] . '</b>';
+				$s_hidden_fields .= '<input type="hidden" name="f[]" value="' . $row['forum_id'] . '" />';
+			}
+			while ($row = $db->sql_fetchrow($result));
+
+			$db->sql_freeresult($result);
+
+			$l_selected_forums = (sizeof($forum_id) == 1) ? 'SELECTED_FORUM' : 'SELECTED_FORUMS';
+
+			$template->assign_vars(array(
+				'L_SELECTED_FORUMS'		=> $user->lang[$l_selected_forums],
+				'U_ACTION'				=> $this->u_action,
+				'U_BACK'				=> $this->u_action,
+				'FORUM_LIST'			=> $forum_list,
+				'S_HIDDEN_FIELDS'		=> $s_hidden_fields)
+			);
+
+		}
+
+	}
+
+	/**
+	* Prune users
+	*/
+	function prune_users($id, $mode)
+	{
+		global $db, $user, $auth, $template, $cache;
+		global $config, $SID, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		$user->add_lang('memberlist');
+
+		$prune = (isset($_POST['prune'])) ? true : false;
+
+		if ($prune)
+		{
+			if (confirm_box(true))
+			{
+				$users = request_var('users', '');
+				$action = request_var('action', 'deactivate');
+				$deleteposts = request_var('deleteposts', 0);
+		
+				if ($users)
+				{
+					$users = explode("\n", $users);
+
+					$where_sql = '';
+		
+					foreach ($users as $username)
+					{
+						$where_sql .= (($where_sql != '') ? ', ' : '') . "'" . $db->sql_escape($username) . "'";
+					}
+					$where_sql = " AND username IN ($where_sql)";
+				}
+				else
+				{
+					$username = request_var('username', '');
+					$email = request_var('email', '');
+
+					$joined_select = request_var('joined_select', 'lt');
+					$active_select = request_var('active_select', 'lt');
+					$count_select = request_var('count_select', 'eq');
+					$joined = request_var('joined', '');
+					$active = request_var('active', '');
+
+					$active = ($active) ? explode('-', $active) : array();
+					$joined = ($joined) ? explode('-', $joined) : array();
+
+					$count = request_var('count', 0);
+
+					$key_match = array('lt' => '<', 'gt' => '>', 'eq' => '=');
+					$sort_by_types = array('username', 'user_email', 'user_posts', 'user_regdate', 'user_lastvisit');
+
+					$where_sql = '';
+					$where_sql .= ($username) ? " AND username LIKE '" . $db->sql_escape(str_replace('*', '%', $username)) . "'" : '';
+					$where_sql .= ($email) ? " AND user_email LIKE '" . $db->sql_escape(str_replace('*', '%', $email)) . "' " : '';
+					$where_sql .= (sizeof($joined)) ? " AND user_regdate " . $key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, (int) $joined[1], (int) $joined[2], (int) $joined[0]) : '';
+					$where_sql .= ($count) ? " AND user_posts " . $key_match[$count_select] . " $count " : '';
+					$where_sql .= (sizeof($active)) ? " AND user_lastvisit " . $key_match[$active_select] . " " . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]) : '';
+				}
+
+				// Get bot ids
+				$sql = 'SELECT user_id 
+					FROM ' . BOTS_TABLE;
+				$result = $db->sql_query($sql);
+
+				$bot_ids = array();
+				while ($row = $db->sql_fetchrow($result))
+				{
+					$bot_ids[] = $row['user_id'];
+				}
+				$db->sql_freeresult($result);
+				
+				$sql = 'SELECT username, user_id FROM ' . USERS_TABLE . '
+					WHERE user_id <> ' . ANONYMOUS . "
+					$where_sql";
+				$result = $db->sql_query($sql);
+
+				$where_sql = '';
+				$user_ids = $usernames = array();
+
+				if ($row = $db->sql_fetchrow($result))
+				{
+					do
+					{
+						if (!in_array($row['user_id'], $bot_ids))
+						{
+							$where_sql .= (($where_sql != '') ? ', ' : '') . $row['user_id'];
+							$user_ids[] = $row['user_id'];
+							$usernames[] = $row['username'];
+						}
+					}
+					while ($row = $db->sql_fetchrow($result));
+
+					if ($where_sql)
+					{
+						$where_sql = " AND user_id IN ($where_sql)";
+					}
+				}
+				$db->sql_freeresult($result);
+
+				if ($where_sql)
+				{
+					$sql = '';
+
+					if ($action == 'delete')
+					{
+						if ($deleteposts)
+						{
+							delete_posts('poster_id', $user_ids, true);
+							$l_log = 'LOG_PRUNE_USER_DEL_DEL';
+						}
+						else
+						{
+							for ($i = 0, $size = sizeof($user_ids); $i < $size; $i++)
+							{
+								$sql = 'UPDATE ' . POSTS_TABLE . '
+									SET poster_id = ' . ANONYMOUS . ", post_username = '" . $db->sql_escape($usernames[$i]) . "'
+									WHERE user_id = " . $userids[$i];
+								$db->sql_query($sql);
+							}
+
+							$l_log = 'LOG_PRUNE_USER_DEL_ANON';
+						}
+
+						$sql = 'DELETE FROM ' . USERS_TABLE;
+					}
+					else if ($action == 'deactivate')
+					{
+						$sql = 'UPDATE ' . USERS_TABLE . " 
+							SET user_active = 0";
+
+						$l_log = 'LOG_PRUNE_USER_DEAC';
+					}
+
+					$sql .= ' WHERE user_id <> ' . ANONYMOUS . "
+						$where_sql";
+					$db->sql_query($sql);
+
+					add_log('admin', $l_log, implode(', ', $usernames));
+				}
+
+				trigger_error($user->lang['USER_' . strtoupper($action) . '_SUCCESS'] . adm_back_link($this->u_action));
+			}
+			else
+			{
+				confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+					'i'				=> $id,
+					'mode'			=> $mode,
+					'prune'			=> 1,
+
+					'users'			=> request_var('users', ''),
+					'username'		=> request_var('username', ''),
+					'email'			=> request_var('email', ''),
+					'joined_select'	=> request_var('joined_select', ''),
+					'joined'		=> request_var('joined', ''),
+					'active_select'	=> request_var('active_select', ''),
+					'active'		=> request_var('active', ''),
+					'count_select'	=> request_var('count_select', ''),
+					'count'			=> request_var('count', 0),
+					'deleteposts'	=> request_var('deleteposts', 0),
+
+					'action'		=> request_var('action', ''),
+				)));
+			}
+		}
+
+		$find_count = array('lt' => $user->lang['LESS_THAN'], 'eq' => $user->lang['EQUAL_TO'], 'gt' => $user->lang['MORE_THAN']);
+		$s_find_count = '';
+
+		foreach ($find_count as $key => $value)
+		{
+			$selected = ($key == 'eq') ? ' selected="selected"' : '';
+			$s_find_count .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>';
+		}
+
+		$find_time = array('lt' => $user->lang['BEFORE'], 'gt' => $user->lang['AFTER']);
+		$s_find_join_time = '';
+		foreach ($find_time as $key => $value)
+		{
+			$s_find_join_time .= '<option value="' . $key . '">' . $value . '</option>';
+		}
+		
+		$s_find_active_time = '';
+		foreach ($find_time as $key => $value)
+		{
+			$s_find_active_time .= '<option value="' . $key . '">' . $value . '</option>';
+		}
+
+		$template->assign_vars(array(
+			'U_ACTION'			=> $this->u_action,
+			'S_JOINED_OPTIONS'	=> $s_find_join_time,
+			'S_ACTIVE_OPTIONS'	=> $s_find_active_time,
+			'S_COUNT_OPTIONS'	=> $s_find_count,
+			'U_FIND_USER'		=> $phpbb_root_path . "memberlist.$phpEx$SID&amp;mode=searchuser&amp;form=acp_prune&amp;field=users")
+		);
+
+	}
+}
+
+/**
+* @package module_install
+*/
+class acp_prune_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'acp_prune',
+			'title'		=> 'ACP_PRUNING',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'forums'	=> array('title' => 'ACP_PRUNE_FORUMS', 'auth' => 'acl_a_prune'),
+				'users'		=> array('title' => 'ACP_PRUNE_USERS', 'auth' => 'acl_a_userdel'),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}
+
+?>
+\ No newline at end of file
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 431e4c7731..b90a4ca317 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1050,6 +1050,14 @@ function meta_refresh($time, $url)
 
 /**
 * Build Confirm box
+* @param boolean $check True for checking if confirmed (without any additional parameters) and false for displaying the confirm box
+* @param string $title Title/Message used for confirm box.
+*		message text is _CONFIRM appended to title. 
+*		If title can not be found in user->lang a default one is displayed
+*		If title_CONFIRM can not be found in user->lang the text given is used.
+* @param string $hidden Hidden variables
+* @param string $html_body Template used for confirm box
+* @param string $u_action Custom form action
 */
 function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_body.html', $u_action = '')
 {
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index cc39ecbdda..967f76d40e 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1501,6 +1501,7 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync
 	{
 		$sql_and .= ' AND topic_type <> ' . POST_ANNOUNCE;
 	}
+
 	if (!($prune_flags & 8))
 	{
 		$sql_and .= ' AND topic_type <> ' . POST_STICKY;
@@ -1510,6 +1511,7 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync
 	{
 		$sql_and .= " AND topic_last_post_time < $prune_date";
 	}
+
 	if ($prune_mode == 'viewed')
 	{
 		$sql_and .= " AND topic_last_view_time < $prune_date";
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 5c5f7e30e2..ae7e2d47f7 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -145,7 +145,9 @@ class p_master
 
 			$right = $row['right_id'];
 
-			$url_func = $row['module_name'] . '_' . $row['module_mode'] . '_url';
+			// We need to prefix the functions to not create a naming conflict
+			$url_func = '_module_' . $row['module_name'] . '_' . $row['module_mode'] . '_url';
+			$lang_func = '_module_' . $row['module_name'];
 
 			$this->module_ary[$i] = array(
 				'depth'		=> $depth,
@@ -160,7 +162,7 @@ class p_master
 
 				'url_extra'	=> (function_exists($url_func)) ? $url_func() : '',
 				
-				'lang'		=> (function_exists($row['module_name'])) ? $row['module_name']($row['module_mode'], $row['module_langname']) : ((!empty($user->lang[$row['module_langname']])) ? $user->lang[$row['module_langname']] : $row['module_langname']),
+				'lang'		=> ($row['module_name'] && function_exists($lang_func)) ? $lang_func($row['module_mode'], $row['module_langname']) : ((!empty($user->lang[$row['module_langname']])) ? $user->lang[$row['module_langname']] : $row['module_langname']),
 				'langname'	=> $row['module_langname'],
 
 				'left'		=> $row['left_id'],
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 1ba203bcd6..606976c99b 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -303,9 +303,9 @@ class custom_profile
 			case FIELD_DATE:
 				$field_validate = explode('-', $field_value);
 				
-				$day = (int) $field_validate[0];
-				$month = (int) $field_validate[1];
-				$year = (int) $field_validate[2];
+				$day = (isset($field_validate[0])) ? (int) $field_validate[0] : 0;
+				$month = (isset($field_validate[1])) ? (int) $field_validate[1] : 0;
+				$year = (isset($field_validate[2])) ? (int) $field_validate[2] : 0;
 
 				if ((!$day || !$month || !$year) && !$field_data['field_required'])
 				{
@@ -587,7 +587,7 @@ class custom_profile
 
 		$value = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview);
 
-		if (!isset($this->options_lang[$profile_row['field_id']]) || !sizeof($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]))
+		if (!isset($this->options_lang[$profile_row['field_id']]) || !isset($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]) || !sizeof($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]))
 		{
 			$this->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], FIELD_DROPDOWN, $preview);
 		}
@@ -774,9 +774,9 @@ class custom_profile_admin extends custom_profile
 		global $user;
 
 		$options = array(
-			0 => array('TITLE' => $user->lang['FIELD_LENGTH'], 'FIELD' => '<input class="post" type="text" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
-			1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'], 'FIELD' => '<input class="post" type="text" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'], 'FIELD' => '<input class="post" type="text" name="field_maxlen" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
+			0 => array('TITLE' => $user->lang['FIELD_LENGTH'], 'FIELD' => '<input type="text" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
+			1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'], 'FIELD' => '<input type="text" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
+			2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'], 'FIELD' => '<input type="text" name="field_maxlen" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
 			3 => array('TITLE' => $user->lang['FIELD_VALIDATION'], 'FIELD' => '<select name="field_validation">' . $this->validate_options() . '</select>')
 		);
 
@@ -788,9 +788,9 @@ class custom_profile_admin extends custom_profile
 		global $user;
 
 		$options = array(
-			0 => array('TITLE' => $user->lang['FIELD_LENGTH'], 'FIELD' => '<table border=0><tr><td><input name="rows" size="5" value="' . $this->vars['rows'] . '" class="post" /></td><td>[ ' . $user->lang['ROWS'] . ' ]</td></tr><tr><td><input name="columns" size="5" value="' . $this->vars['columns'] . '" class="post" /></td><td>[ ' . $user->lang['COLUMNS'] . ' ] <input type="hidden" name="field_length" value="' . $this->vars['field_length'] . '" /></td></tr></table>'),
-			1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'], 'FIELD' => '<input class="post" type="text" name="field_minlen" size="10" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'], 'FIELD' => '<input class="post" type="text" name="field_maxlen" size="10" value="' . $this->vars['field_maxlen'] . '" />'),
+			0 => array('TITLE' => $user->lang['FIELD_LENGTH'], 'FIELD' => '<input name="rows" size="5" value="' . $this->vars['rows'] . '" /> ' . $user->lang['ROWS'] . '</dd><dd><input name="columns" size="5" value="' . $this->vars['columns'] . '" /> ' . $user->lang['COLUMNS'] . ' <input type="hidden" name="field_length" value="' . $this->vars['field_length'] . '" />'),
+			1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'], 'FIELD' => '<input type="text" name="field_minlen" size="10" value="' . $this->vars['field_minlen'] . '" />'),
+			2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'], 'FIELD' => '<input type="text" name="field_maxlen" size="10" value="' . $this->vars['field_maxlen'] . '" />'),
 			3 => array('TITLE' => $user->lang['FIELD_VALIDATION'], 'FIELD' => '<select name="field_validation">' . $this->validate_options() . '</select>')
 		);
 
@@ -802,10 +802,10 @@ class custom_profile_admin extends custom_profile
 		global $user;
 
 		$options = array(
-			0 => array('TITLE' => $user->lang['FIELD_LENGTH'], 'FIELD' => '<input class="post" type="text" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
-			1 => array('TITLE' => $user->lang['MIN_FIELD_NUMBER'], 'FIELD' => '<input class="post" type="text" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => $user->lang['MAX_FIELD_NUMBER'], 'FIELD' => '<input class="post" type="text" name="field_maxlen" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
-			3 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => '<input class="post" type="post" name="field_default_value" value="' . $this->vars['field_default_value'] . '" />')
+			0 => array('TITLE' => $user->lang['FIELD_LENGTH'], 'FIELD' => '<input type="text" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
+			1 => array('TITLE' => $user->lang['MIN_FIELD_NUMBER'], 'FIELD' => '<input type="text" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
+			2 => array('TITLE' => $user->lang['MAX_FIELD_NUMBER'], 'FIELD' => '<input type="text" name="field_maxlen" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
+			3 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => '<input type="post" name="field_default_value" value="' . $this->vars['field_default_value'] . '" />')
 		);
 
 		return $options;
@@ -888,7 +888,7 @@ class custom_profile_admin extends custom_profile
 		);
 
 		$options = array(
-			0 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => $this->generate_date($profile_row, true) . '<br /><input type="checkbox" name="always_now"' . ((isset($_REQUEST['always_now']) || $this->vars['field_default_value'] == 'now') ? ' checked="checked"' : '') . ' />&nbsp; ' . $user->lang['ALWAYS_TODAY'])
+			0 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => $this->generate_date($profile_row, true) . '</dd><dd><input type="checkbox" name="always_now"' . ((isset($_REQUEST['always_now']) || $this->vars['field_default_value'] == 'now') ? ' checked="checked"' : '') . ' />&nbsp; ' . $user->lang['ALWAYS_TODAY'])
 		);
 
 		return $options;