[ticket/11201] Move type specific error messages to type class

PHPBB3-11201

phpBB/phpbb/profilefields/type/type_base.php

@@ -49,4 +49,12 @@ abstract class type_base implements type_interface
 	{
 		return $this->request->variable('lang_options', '', true);
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function validate_options_on_submit($error, $field_data)
+	{
+		return $error;
+	}
 }

phpBB/phpbb/profilefields/type/type_bool.php

@@ -239,4 +239,17 @@ class type_bool extends type_base
 
 		return $this->request->variable('lang_options', array(''), true);
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function validate_options_on_submit($error, $field_data)
+	{
+		if (empty($field_data['lang_options'][0]) || empty($field_data['lang_options'][1]))
+		{
+			$error[] = $this->user->lang['NO_FIELD_ENTRIES'];
+		}
+
+		return $error;
+	}
 }

phpBB/phpbb/profilefields/type/type_dropdown.php

@@ -211,4 +211,17 @@ class type_dropdown extends type_base
 
 		return $this->request->variable('lang_options', '', true);
 	}
+
+	/**
+	* {@inheritDoc}
+	*/
+	public function validate_options_on_submit($error, $field_data)
+	{
+		if (!sizeof($field_data['lang_options']))
+		{
+			$error[] = $this->user->lang['NO_FIELD_ENTRIES'];
+		}
+
+		return $error;
+	}
 }

phpBB/phpbb/profilefields/type/type_interface.php

@@ -122,4 +122,13 @@ interface type_interface
 	* @return mixed		Returns the provided language options
 	*/
 	public function prepare_options_form(&$exclude_options, &$visibility_options);
+
+	/**
+	* Allows exclusion of options in single steps of the creation process
+	*
+	* @param array	$error					Array with error messages
+	* @param array	$field_data		Array with data for this field
+	* @return array		Array with error messages
+	*/
+	public function validate_options_on_submit($error, $field_data);
 }