From a7e3538e5b0cb12610b5c051a5d30292970249d1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 11 Jan 2014 01:44:48 +0100
Subject: [ticket/11201] Move get_options to type classes

PHPBB3-11201
---
 phpBB/phpbb/profilefields/admin.php                | 190 ---------------------
 phpBB/phpbb/profilefields/type/type_bool.php       |  63 +++++++
 phpBB/phpbb/profilefields/type/type_date.php       |  71 ++++++++
 phpBB/phpbb/profilefields/type/type_dropdown.php   |  67 ++++++++
 phpBB/phpbb/profilefields/type/type_int.php        |  51 ++++++
 phpBB/phpbb/profilefields/type/type_interface.php  |  39 +++++
 phpBB/phpbb/profilefields/type/type_string.php     |  51 ++++++
 .../profilefields/type/type_string_common.php      |  30 ++++
 phpBB/phpbb/profilefields/type/type_text.php       |  51 ++++++
 9 files changed, 423 insertions(+), 190 deletions(-)
 delete mode 100644 phpBB/phpbb/profilefields/admin.php
 create mode 100644 phpBB/phpbb/profilefields/type/type_bool.php
 create mode 100644 phpBB/phpbb/profilefields/type/type_date.php
 create mode 100644 phpBB/phpbb/profilefields/type/type_dropdown.php
 create mode 100644 phpBB/phpbb/profilefields/type/type_int.php
 create mode 100644 phpBB/phpbb/profilefields/type/type_interface.php
 create mode 100644 phpBB/phpbb/profilefields/type/type_string.php
 create mode 100644 phpBB/phpbb/profilefields/type/type_string_common.php
 create mode 100644 phpBB/phpbb/profilefields/type/type_text.php

(limited to 'phpBB/phpbb/profilefields')

diff --git a/phpBB/phpbb/profilefields/admin.php b/phpBB/phpbb/profilefields/admin.php
deleted file mode 100644
index 1cca496265..0000000000
--- a/phpBB/phpbb/profilefields/admin.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace phpbb\profilefields;
-
-/**
-* Custom Profile Fields ACP
-* @package phpBB3
-*/
-class admin extends profilefields
-{
-	var $vars = array();
-
-	/**
-	*
-	*/
-	public function __construct($auth, $config, $db, $request, $template, $user)
-	{
-		$this->auth = $auth;
-		$this->config = $config;
-		$this->db = $db;
-		$this->request = $request;
-		$this->template = $template;
-		$this->user = $user;
-	}
-
-	/**
-	* Return possible validation options
-	*/
-	function validate_options()
-	{
-		$validate_ary = array('CHARS_ANY' => '.*', 'NUMBERS_ONLY' => '[0-9]+', 'ALPHA_ONLY' => '[\w]+', 'ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+');
-
-		$validate_options = '';
-		foreach ($validate_ary as $lang => $value)
-		{
-			$selected = ($this->vars['field_validation'] == $value) ? ' selected="selected"' : '';
-			$validate_options .= '<option value="' . $value . '"' . $selected . '>' . $this->user->lang[$lang] . '</option>';
-		}
-
-		return $validate_options;
-	}
-
-	/**
-	* Get string options for second step in ACP
-	*/
-	function get_string_options($lang_defs)
-	{
-		$options = array(
-			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
-			1 => array('TITLE' => $this->user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => $this->user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
-			3 => array('TITLE' => $this->user->lang['FIELD_VALIDATION'],	'FIELD' => '<select name="field_validation">' . $this->validate_options() . '</select>')
-		);
-
-		return $options;
-	}
-
-	/**
-	* Get text options for second step in ACP
-	*/
-	function get_text_options($lang_defs)
-	{
-		$options = array(
-			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" max="99999" name="rows" size="5" value="' . $this->vars['rows'] . '" /> ' . $user->lang['ROWS'] . '</dd><dd><input type="number" min="0" max="99999" 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' => $this->user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="9999999999" name="field_minlen" size="10" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => $this->user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="9999999999" name="field_maxlen" size="10" value="' . $this->vars['field_maxlen'] . '" />'),
-			3 => array('TITLE' => $this->user->lang['FIELD_VALIDATION'],	'FIELD' => '<select name="field_validation">' . $this->validate_options() . '</select>')
-		);
-
-		return $options;
-	}
-
-	/**
-	* Get int options for second step in ACP
-	*/
-	function get_int_options($lang_defs)
-	{
-		$options = array(
-			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" max="99999" name="field_length" size="5" value="' . $this->vars['field_length'] . '" />'),
-			1 => array('TITLE' => $this->user->lang['MIN_FIELD_NUMBER'],	'FIELD' => '<input type="number" min="0" max="99999" name="field_minlen" size="5" value="' . $this->vars['field_minlen'] . '" />'),
-			2 => array('TITLE' => $this->user->lang['MAX_FIELD_NUMBER'],	'FIELD' => '<input type="number" min="0" max="99999" name="field_maxlen" size="5" value="' . $this->vars['field_maxlen'] . '" />'),
-			3 => array('TITLE' => $this->user->lang['DEFAULT_VALUE'],		'FIELD' => '<input type="post" name="field_default_value" value="' . $this->vars['field_default_value'] . '" />')
-		);
-
-		return $options;
-	}
-
-	/**
-	* Get bool options for second step in ACP
-	*/
-	function get_bool_options($lang_defs)
-	{
-		$default_lang_id = $lang_defs['iso'][$this->config['default_lang']];
-
-		$profile_row = array(
-			'var_name'				=> 'field_default_value',
-			'field_id'				=> 1,
-			'lang_name'				=> $this->vars['lang_name'],
-			'lang_explain'			=> $this->vars['lang_explain'],
-			'lang_id'				=> $default_lang_id,
-			'field_default_value'	=> $this->vars['field_default_value'],
-			'field_ident'			=> 'field_default_value',
-			'field_type'			=> FIELD_BOOL,
-			'field_length'			=> $this->vars['field_length'],
-			'lang_options'			=> $this->vars['lang_options']
-		);
-
-		$options = array(
-			0 => array('TITLE' => $this->user->lang['FIELD_TYPE'], 'EXPLAIN' => $this->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();" /> ' . $this->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();" /> ' . $this->user->lang['CHECKBOX'] . '</label>'),
-			1 => array('TITLE' => $this->user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row))
-		);
-
-		return $options;
-	}
-
-	/**
-	* Get dropdown options for second step in ACP
-	*/
-	function get_dropdown_options($lang_defs)
-	{
-		$default_lang_id = $lang_defs['iso'][$this->config['default_lang']];
-
-		$profile_row[0] = array(
-			'var_name'				=> 'field_default_value',
-			'field_id'				=> 1,
-			'lang_name'				=> $this->vars['lang_name'],
-			'lang_explain'			=> $this->vars['lang_explain'],
-			'lang_id'				=> $default_lang_id,
-			'field_default_value'	=> $this->vars['field_default_value'],
-			'field_ident'			=> 'field_default_value',
-			'field_type'			=> FIELD_DROPDOWN,
-			'lang_options'			=> $this->vars['lang_options']
-		);
-
-		$profile_row[1] = $profile_row[0];
-		$profile_row[1]['var_name'] = 'field_novalue';
-		$profile_row[1]['field_ident'] = 'field_novalue';
-		$profile_row[1]['field_default_value']	= $this->vars['field_novalue'];
-
-		$options = array(
-			0 => array('TITLE' => $this->user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row[0])),
-			1 => array('TITLE' => $this->user->lang['NO_VALUE_OPTION'], 'EXPLAIN' => $this->user->lang['NO_VALUE_OPTION_EXPLAIN'], 'FIELD' => $this->process_field_row('preview', $profile_row[1]))
-		);
-
-		return $options;
-	}
-
-	/**
-	* Get date options for second step in ACP
-	*/
-	function get_date_options($lang_defs)
-	{
-		$default_lang_id = $lang_defs['iso'][$this->config['default_lang']];
-
-		$profile_row = array(
-			'var_name'				=> 'field_default_value',
-			'lang_name'				=> $this->vars['lang_name'],
-			'lang_explain'			=> $this->vars['lang_explain'],
-			'lang_id'				=> $default_lang_id,
-			'field_default_value'	=> $this->vars['field_default_value'],
-			'field_ident'			=> 'field_default_value',
-			'field_type'			=> FIELD_DATE,
-			'field_length'			=> $this->vars['field_length']
-		);
-
-		$always_now = request_var('always_now', -1);
-		if ($always_now == -1)
-		{
-			$s_checked = ($this->vars['field_default_value'] == 'now') ? true : false;
-		}
-		else
-		{
-			$s_checked = ($always_now) ? true : false;
-		}
-
-		$options = array(
-			0 => array('TITLE' => $this->user->lang['DEFAULT_VALUE'],	'FIELD' => $this->process_field_row('preview', $profile_row)),
-			1 => array('TITLE' => $this->user->lang['ALWAYS_TODAY'],	'FIELD' => '<label><input type="radio" class="radio" name="always_now" value="1"' . (($s_checked) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $this->user->lang['YES'] . '</label><label><input type="radio" class="radio" name="always_now" value="0"' . ((!$s_checked) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $this->user->lang['NO'] . '</label>'),
-		);
-
-		return $options;
-	}
-}
diff --git a/phpBB/phpbb/profilefields/type/type_bool.php b/phpBB/phpbb/profilefields/type/type_bool.php
new file mode 100644
index 0000000000..b3dafa30d4
--- /dev/null
+++ b/phpBB/phpbb/profilefields/type/type_bool.php
@@ -0,0 +1,63 @@
+<?php
+/**
+*
+* @package phpBB
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\profilefields\type;
+
+class type_bool implements type_interface
+{
+	/**
+	*
+	*/
+	public function __construct(\phpbb\profilefields\profilefields $profilefields, \phpbb\user $user)
+	{
+		$this->profilefields = $profilefields;
+		$this->user = $user;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_options($default_lang_id, $field_data)
+	{
+		$profile_row = array(
+			'var_name'				=> 'field_default_value',
+			'field_id'				=> 1,
+			'lang_name'				=> $field_data['lang_name'],
+			'lang_explain'			=> $field_data['lang_explain'],
+			'lang_id'				=> $default_lang_id,
+			'field_default_value'	=> $field_data['field_default_value'],
+			'field_ident'			=> 'field_default_value',
+			'field_type'			=> FIELD_BOOL,
+			'field_length'			=> $field_data['field_length'],
+			'lang_options'			=> $field_data['lang_options']
+		);
+
+		$options = array(
+			0 => array('TITLE' => $this->user->lang['FIELD_TYPE'], 'EXPLAIN' => $this->user->lang['BOOL_TYPE_EXPLAIN'], 'FIELD' => '<label><input type="radio" class="radio" name="field_length" value="1"' . (($field_data['field_length'] == 1) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $this->user->lang['RADIO_BUTTONS'] . '</label><label><input type="radio" class="radio" name="field_length" value="2"' . (($field_data['field_length'] == 2) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $this->user->lang['CHECKBOX'] . '</label>'),
+			1 => array('TITLE' => $this->user->lang['DEFAULT_VALUE'], 'FIELD' => $this->profilefields->process_field_row('preview', $profile_row))
+		);
+
+		return $options;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_default_values()
+	{
+		return array(
+			'field_length'		=> 1,
+			'field_minlen'		=> 0,
+			'field_maxlen'		=> 0,
+			'field_validation'	=> '',
+			'field_novalue'		=> 0,
+			'field_default_value'	=> 0,
+		);
+	}
+}
diff --git a/phpBB/phpbb/profilefields/type/type_date.php b/phpBB/phpbb/profilefields/type/type_date.php
new file mode 100644
index 0000000000..9639b45770
--- /dev/null
+++ b/phpBB/phpbb/profilefields/type/type_date.php
@@ -0,0 +1,71 @@
+<?php
+/**
+*
+* @package phpBB
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\profilefields\type;
+
+class type_date implements type_interface
+{
+	/**
+	*
+	*/
+	public function __construct(\phpbb\profilefields\profilefields $profilefields, \phpbb\user $user)
+	{
+		$this->profilefields = $profilefields;
+		$this->user = $user;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_options($default_lang_id, $field_data)
+	{
+		$profile_row = array(
+			'var_name'				=> 'field_default_value',
+			'lang_name'				=> $field_data['lang_name'],
+			'lang_explain'			=> $field_data['lang_explain'],
+			'lang_id'				=> $default_lang_id,
+			'field_default_value'	=> $field_data['field_default_value'],
+			'field_ident'			=> 'field_default_value',
+			'field_type'			=> FIELD_DATE,
+			'field_length'			=> $field_data['field_length']
+		);
+
+		$always_now = request_var('always_now', -1);
+		if ($always_now == -1)
+		{
+			$s_checked = ($field_data['field_default_value'] == 'now') ? true : false;
+		}
+		else
+		{
+			$s_checked = ($always_now) ? true : false;
+		}
+
+		$options = array(
+			0 => array('TITLE' => $this->user->lang['DEFAULT_VALUE'],	'FIELD' => $this->profilefields->process_field_row('preview', $profile_row)),
+			1 => array('TITLE' => $this->user->lang['ALWAYS_TODAY'],	'FIELD' => '<label><input type="radio" class="radio" name="always_now" value="1"' . (($s_checked) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $this->user->lang['YES'] . '</label><label><input type="radio" class="radio" name="always_now" value="0"' . ((!$s_checked) ? ' checked="checked"' : '') . ' onchange="document.getElementById(\'add_profile_field\').submit();" /> ' . $this->user->lang['NO'] . '</label>'),
+		);
+
+		return $options;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_default_values()
+	{
+		return array(
+			'field_length'		=> 10,
+			'field_minlen'		=> 10,
+			'field_maxlen'		=> 10,
+			'field_validation'	=> '',
+			'field_novalue'		=> ' 0- 0-   0',
+			'field_default_value'	=> ' 0- 0-   0',
+		);
+	}
+}
diff --git a/phpBB/phpbb/profilefields/type/type_dropdown.php b/phpBB/phpbb/profilefields/type/type_dropdown.php
new file mode 100644
index 0000000000..8a101f1fc1
--- /dev/null
+++ b/phpBB/phpbb/profilefields/type/type_dropdown.php
@@ -0,0 +1,67 @@
+<?php
+/**
+*
+* @package phpBB
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\profilefields\type;
+
+class type_dropdown implements type_interface
+{
+	/**
+	*
+	*/
+	public function __construct(\phpbb\profilefields\profilefields $profilefields, \phpbb\user $user)
+	{
+		$this->profilefields = $profilefields;
+		$this->user = $user;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_options($default_lang_id, $field_data)
+	{
+		$profile_row[0] = array(
+			'var_name'				=> 'field_default_value',
+			'field_id'				=> 1,
+			'lang_name'				=> $field_data['lang_name'],
+			'lang_explain'			=> $field_data['lang_explain'],
+			'lang_id'				=> $default_lang_id,
+			'field_default_value'	=> $field_data['field_default_value'],
+			'field_ident'			=> 'field_default_value',
+			'field_type'			=> FIELD_DROPDOWN,
+			'lang_options'			=> $field_data['lang_options']
+		);
+
+		$profile_row[1] = $profile_row[0];
+		$profile_row[1]['var_name'] = 'field_novalue';
+		$profile_row[1]['field_ident'] = 'field_novalue';
+		$profile_row[1]['field_default_value']	= $field_data['field_novalue'];
+
+		$options = array(
+			0 => array('TITLE' => $this->user->lang['DEFAULT_VALUE'], 'FIELD' => $this->profilefields->process_field_row('preview', $profile_row[0])),
+			1 => array('TITLE' => $this->user->lang['NO_VALUE_OPTION'], 'EXPLAIN' => $this->user->lang['NO_VALUE_OPTION_EXPLAIN'], 'FIELD' => $this->profilefields->process_field_row('preview', $profile_row[1]))
+		);
+
+		return $options;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_default_values()
+	{
+		return array(
+			'field_length'		=> 0,
+			'field_minlen'		=> 0,
+			'field_maxlen'		=> 5,
+			'field_validation'	=> '',
+			'field_novalue'		=> 0,
+			'field_default_value'	=> 0,
+		);
+	}
+}
diff --git a/phpBB/phpbb/profilefields/type/type_int.php b/phpBB/phpbb/profilefields/type/type_int.php
new file mode 100644
index 0000000000..7cc74b6e44
--- /dev/null
+++ b/phpBB/phpbb/profilefields/type/type_int.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* @package phpBB
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\profilefields\type;
+
+class type_int implements type_interface
+{
+	/**
+	*
+	*/
+	public function __construct($user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_options($default_lang_id, $field_data)
+	{
+		$options = array(
+			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" max="99999" name="field_length" size="5" value="' . $field_data['field_length'] . '" />'),
+			1 => array('TITLE' => $this->user->lang['MIN_FIELD_NUMBER'],	'FIELD' => '<input type="number" min="0" max="99999" name="field_minlen" size="5" value="' . $field_data['field_minlen'] . '" />'),
+			2 => array('TITLE' => $this->user->lang['MAX_FIELD_NUMBER'],	'FIELD' => '<input type="number" min="0" max="99999" name="field_maxlen" size="5" value="' . $field_data['field_maxlen'] . '" />'),
+			3 => array('TITLE' => $this->user->lang['DEFAULT_VALUE'],		'FIELD' => '<input type="post" name="field_default_value" value="' . $field_data['field_default_value'] . '" />')
+		);
+
+		return $options;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_default_values()
+	{
+		return array(
+			'field_length'		=> 5,
+			'field_minlen'		=> 0,
+			'field_maxlen'		=> 100,
+			'field_validation'	=> '',
+			'field_novalue'		=> 0,
+			'field_default_value'	=> 0,
+		);
+	}
+}
diff --git a/phpBB/phpbb/profilefields/type/type_interface.php b/phpBB/phpbb/profilefields/type/type_interface.php
new file mode 100644
index 0000000000..8b011aa48e
--- /dev/null
+++ b/phpBB/phpbb/profilefields/type/type_interface.php
@@ -0,0 +1,39 @@
+<?php
+/**
+*
+* @package phpBB
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\profilefields\type;
+
+interface type_interface
+{
+	/*
+	public function validate(&$value, $validation);
+
+	public function prepare_for_storage($value);
+
+	public function prepare_for_display($value);
+
+	public function prepare_for_edit($value);
+	*/
+
+	/**
+	* Get dropdown options for second step in ACP
+	*
+	* @param string	$default_lang_id	ID of the default language
+	* @param array	$field_data			Array with data for this field
+	* @return array	with the acp options
+	*/
+	public function get_options($default_lang_id, $field_data);
+
+	/**
+	* Get default values for this type
+	*
+	* @return array with values like default field size and more
+	*/
+	public function get_default_values();
+}
diff --git a/phpBB/phpbb/profilefields/type/type_string.php b/phpBB/phpbb/profilefields/type/type_string.php
new file mode 100644
index 0000000000..c7f9d188ae
--- /dev/null
+++ b/phpBB/phpbb/profilefields/type/type_string.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* @package phpBB
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\profilefields\type;
+
+class type_string extends type_string_common implements type_interface
+{
+	/**
+	*
+	*/
+	public function __construct($user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_options($default_lang_id, $field_data)
+	{
+		$options = array(
+			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" name="field_length" size="5" value="' . $field_data['field_length'] . '" />'),
+			1 => array('TITLE' => $this->user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" name="field_minlen" size="5" value="' . $field_data['field_minlen'] . '" />'),
+			2 => array('TITLE' => $this->user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" size="5" value="' . $field_data['field_maxlen'] . '" />'),
+			3 => array('TITLE' => $this->user->lang['FIELD_VALIDATION'],	'FIELD' => '<select name="field_validation">' . $this->validate_options($field_data) . '</select>')
+		);
+
+		return $options;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_default_values()
+	{
+		return array(
+			'field_length'		=> 10,
+			'field_minlen'		=> 0,
+			'field_maxlen'		=> 20,
+			'field_validation'	=> '.*',
+			'field_novalue'		=> '',
+			'field_default_value'	=> '',
+		);
+	}
+}
diff --git a/phpBB/phpbb/profilefields/type/type_string_common.php b/phpBB/phpbb/profilefields/type/type_string_common.php
new file mode 100644
index 0000000000..dc2cd2f157
--- /dev/null
+++ b/phpBB/phpbb/profilefields/type/type_string_common.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package phpBB
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\profilefields\type;
+
+abstract class type_string_common
+{
+	/**
+	* Return possible validation options
+	*/
+	function validate_options($field_data)
+	{
+		$validate_ary = array('CHARS_ANY' => '.*', 'NUMBERS_ONLY' => '[0-9]+', 'ALPHA_ONLY' => '[\w]+', 'ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+');
+
+		$validate_options = '';
+		foreach ($validate_ary as $lang => $value)
+		{
+			$selected = ($field_data['field_validation'] == $value) ? ' selected="selected"' : '';
+			$validate_options .= '<option value="' . $value . '"' . $selected . '>' . $this->user->lang[$lang] . '</option>';
+		}
+
+		return $validate_options;
+	}
+}
diff --git a/phpBB/phpbb/profilefields/type/type_text.php b/phpBB/phpbb/profilefields/type/type_text.php
new file mode 100644
index 0000000000..4b58ef0486
--- /dev/null
+++ b/phpBB/phpbb/profilefields/type/type_text.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* @package phpBB
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\profilefields\type;
+
+class type_text extends type_string_common implements type_interface
+{
+	/**
+	*
+	*/
+	public function __construct($user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_options($default_lang_id, $field_data)
+	{
+		$options = array(
+			0 => array('TITLE' => $this->user->lang['FIELD_LENGTH'],		'FIELD' => '<input type="number" min="0" max="99999" name="rows" size="5" value="' . $field_data['rows'] . '" /> ' . $this->user->lang['ROWS'] . '</dd><dd><input type="number" min="0" max="99999" name="columns" size="5" value="' . $field_data['columns'] . '" /> ' . $this->user->lang['COLUMNS'] . ' <input type="hidden" name="field_length" value="' . $field_data['field_length'] . '" />'),
+			1 => array('TITLE' => $this->user->lang['MIN_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="9999999999" name="field_minlen" size="10" value="' . $field_data['field_minlen'] . '" />'),
+			2 => array('TITLE' => $this->user->lang['MAX_FIELD_CHARS'],	'FIELD' => '<input type="number" min="0" max="9999999999" name="field_maxlen" size="10" value="' . $field_data['field_maxlen'] . '" />'),
+			3 => array('TITLE' => $this->user->lang['FIELD_VALIDATION'],	'FIELD' => '<select name="field_validation">' . $this->validate_options($field_data) . '</select>')
+		);
+
+		return $options;
+	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function get_default_values()
+	{
+		return array(
+			'field_length'		=> '5|80',
+			'field_minlen'		=> 0,
+			'field_maxlen'		=> 1000,
+			'field_validation'	=> '.*',
+			'field_novalue'		=> '',
+			'field_default_value'	=> '',
+		);
+	}
+}
-- 
cgit v1.2.1