From 7bcbdfc1b15e0d014a22c76bb1eab6ccbc3d6dc7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 2 Feb 2014 12:53:29 +0100
Subject: [ticket/11201] Rename profilefields class to manager

PHPBB3-11201
---
 phpBB/phpbb/profilefields/manager.php | 408 ++++++++++++++++++++++++++++++++++
 1 file changed, 408 insertions(+)
 create mode 100644 phpBB/phpbb/profilefields/manager.php

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
new file mode 100644
index 0000000000..9f64e1dcf7
--- /dev/null
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -0,0 +1,408 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\profilefields;
+
+/**
+* Custom Profile Fields
+* @package phpBB3
+*/
+class manager
+{
+	/**
+	* Auth object
+	* @var \phpbb\auth\auth
+	*/
+	protected $auth;
+
+	/**
+	* Database object
+	* @var \phpbb\db\driver\driver
+	*/
+	protected $db;
+
+	/**
+	* Request object
+	* @var \phpbb\request\request
+	*/
+	protected $request;
+
+	/**
+	* Template object
+	* @var \phpbb\template\template
+	*/
+	protected $template;
+
+	/**
+	* User object
+	* @var \phpbb\user
+	*/
+	protected $user;
+
+	protected $fields_table;
+
+	protected $fields_language_table;
+
+	protected $fields_data_table;
+
+	protected $profile_cache = array();
+
+	/**
+	* Construct
+	*
+	* @param	\phpbb\auth\auth			$auth		Auth object
+	* @param	\phpbb\db\driver\driver		$db			Database object
+	* @param	\phpbb\request\request		$request	Request object
+	* @param	\phpbb\template\template	$template	Template object
+	* @param	\phpbb\user					$user		User object
+	* @param	string				$fields_table
+	* @param	string				$fields_language_table
+	* @param	string				$fields_data_table
+	*/
+	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver $db, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
+	{
+		$this->auth = $auth;
+		$this->db = $db;
+		$this->request = $request;
+		$this->template = $template;
+		$this->user = $user;
+
+		$this->fields_table = $fields_table;
+		$this->fields_language_table = $fields_language_table;
+		$this->fields_data_table = $fields_data_table;
+	}
+
+	/**
+	* Setter for the type collection
+	*
+	* We need to set the type collection later,
+	* in order to avoid a circular dependency
+	*
+	* @param \phpbb\di\service_collection $type_collection
+	* @return null
+	*/
+	public function set_type_collection(\phpbb\di\service_collection $type_collection)
+	{
+		$this->type_collection = $type_collection;
+	}
+
+	/**
+	* Assign editable fields to template, mode can be profile (for profile change) or register (for registration)
+	* Called by ucp_profile and ucp_register
+	*/
+	public function generate_profile_fields($mode, $lang_id)
+	{
+		$sql_where = '';
+		switch ($mode)
+		{
+			case 'register':
+				// If the field is required we show it on the registration page
+				$sql_where .= ' AND f.field_show_on_reg = 1';
+			break;
+
+			case 'profile':
+				// Show hidden fields to moderators/admins
+				if (!$this->auth->acl_gets('a_', 'm_') && !$this->auth->acl_getf_global('m_'))
+				{
+					$sql_where .= ' AND f.field_show_profile = 1';
+				}
+			break;
+
+			default:
+				trigger_error('Wrong profile mode specified', E_USER_ERROR);
+			break;
+		}
+
+		$sql = 'SELECT l.*, f.*
+			FROM ' . $this->fields_language_table . ' l, ' . $this->fields_table . " f
+			WHERE f.field_active = 1
+				$sql_where
+				AND l.lang_id = " . (int) $lang_id . '
+				AND l.field_id = f.field_id
+			ORDER BY f.field_order';
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			// Return templated field
+			$tpl_snippet = $this->process_field_row('change', $row);
+			$profile_field = $this->type_collection[$row['field_type']];
+
+			$this->template->assign_block_vars('profile_fields', array(
+				'LANG_NAME'		=> $this->user->lang($row['lang_name']),
+				'LANG_EXPLAIN'	=> $this->user->lang($row['lang_explain']),
+				'FIELD'			=> $tpl_snippet,
+				'FIELD_ID'		=> $profile_field->get_field_ident($row),
+				'S_REQUIRED'	=> ($row['field_required']) ? true : false,
+			));
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	/**
+	* Build profile cache, used for display
+	*/
+	protected function build_cache()
+	{
+		$this->profile_cache = array();
+
+		// Display hidden/no_view fields for admin/moderator
+		$sql = 'SELECT l.*, f.*
+			FROM ' . $this->fields_language_table . ' l, ' . $this->fields_table . ' f
+			WHERE l.lang_id = ' . $this->user->get_iso_lang_id() . '
+				AND f.field_active = 1 ' .
+				((!$this->auth->acl_gets('a_', 'm_') && !$this->auth->acl_getf_global('m_')) ? '	AND f.field_hide = 0 ' : '') . '
+				AND f.field_no_view = 0
+				AND l.field_id = f.field_id
+			ORDER BY f.field_order';
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$this->profile_cache[$row['field_ident']] = $row;
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	/**
+	* Submit profile field for validation
+	*/
+	public function submit_cp_field($mode, $lang_id, &$cp_data, &$cp_error)
+	{
+		$sql_where = '';
+		switch ($mode)
+		{
+			case 'register':
+				// If the field is required we show it on the registration page
+				$sql_where .= ' AND f.field_show_on_reg = 1';
+			break;
+
+			case 'profile':
+				// Show hidden fields to moderators/admins
+				if (!$this->auth->acl_gets('a_', 'm_') && !$this->auth->acl_getf_global('m_'))
+				{
+					$sql_where .= ' AND f.field_show_profile = 1';
+				}
+			break;
+
+			default:
+				trigger_error('Wrong profile mode specified', E_USER_ERROR);
+			break;
+		}
+
+		$sql = 'SELECT l.*, f.*
+			FROM ' . $this->fields_language_table . ' l, ' . $this->fields_table . ' f
+			WHERE l.lang_id = ' . (int) $lang_id . "
+				AND f.field_active = 1
+				$sql_where
+				AND l.field_id = f.field_id
+			ORDER BY f.field_order";
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$profile_field = $this->type_collection[$row['field_type']];
+			$cp_data['pf_' . $row['field_ident']] = $profile_field->get_profile_field($row);
+			$check_value = $cp_data['pf_' . $row['field_ident']];
+
+			if (($cp_result = $profile_field->validate_profile_field($check_value, $row)) !== false)
+			{
+				// If the result is not false, it's an error message
+				$cp_error[] = $cp_result;
+			}
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	/**
+	* Update profile field data directly
+	*/
+	public function update_profile_field_data($user_id, $cp_data)
+	{
+		if (!sizeof($cp_data))
+		{
+			return;
+		}
+
+		$sql = 'UPDATE ' . $this->fields_data_table . '
+			SET ' . $this->db->sql_build_array('UPDATE', $cp_data) . '
+			WHERE user_id = ' . (int) $user_id;
+		$this->db->sql_query($sql);
+
+		if (!$this->db->sql_affectedrows())
+		{
+			$cp_data['user_id'] = (int) $user_id;
+
+			$this->db->sql_return_on_error(true);
+
+			$sql = 'INSERT INTO ' . $this->fields_data_table . ' ' . $this->db->sql_build_array('INSERT', $cp_data);
+			$this->db->sql_query($sql);
+
+			$this->db->sql_return_on_error(false);
+		}
+	}
+
+	/**
+	* Assign fields to template, used for viewprofile, viewtopic and memberlist (if load setting is enabled)
+	* This is directly connected to the user -> mode == grab is to grab the user specific fields, mode == show is for assigning the row to the template
+	*/
+	public function generate_profile_fields_template($mode, $user_id = 0, $profile_row = false)
+	{
+		if ($mode == 'grab')
+		{
+			if (!is_array($user_id))
+			{
+				$user_id = array($user_id);
+			}
+
+			if (!sizeof($this->profile_cache))
+			{
+				$this->build_cache();
+			}
+
+			if (!sizeof($user_id))
+			{
+				return array();
+			}
+
+			$sql = 'SELECT *
+				FROM ' . $this->fields_data_table . '
+				WHERE ' . $this->db->sql_in_set('user_id', array_map('intval', $user_id));
+			$result = $this->db->sql_query($sql);
+
+			$field_data = array();
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$field_data[$row['user_id']] = $row;
+			}
+			$this->db->sql_freeresult($result);
+
+			$user_fields = array();
+
+			$user_ids = $user_id;
+
+			// Go through the fields in correct order
+			foreach (array_keys($this->profile_cache) as $used_ident)
+			{
+				foreach ($field_data as $user_id => $row)
+				{
+					$user_fields[$user_id][$used_ident]['value'] = $row['pf_' . $used_ident];
+					$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
+				}
+
+				foreach ($user_ids as $user_id)
+				{
+					if (!isset($user_fields[$user_id][$used_ident]) && $this->profile_cache[$used_ident]['field_show_novalue'])
+					{
+						$user_fields[$user_id][$used_ident]['value'] = '';
+						$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
+					}
+				}
+			}
+
+			return $user_fields;
+		}
+		else if ($mode == 'show')
+		{
+			// $profile_row == $user_fields[$row['user_id']];
+			$tpl_fields = array();
+			$tpl_fields['row'] = $tpl_fields['blockrow'] = array();
+
+			foreach ($profile_row as $ident => $ident_ary)
+			{
+				$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
+				$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
+
+				if ($value === NULL)
+				{
+					continue;
+				}
+
+				$tpl_fields['row'] += array(
+					'PROFILE_' . strtoupper($ident) . '_VALUE'	=> $value,
+					'PROFILE_' . strtoupper($ident) . '_TYPE'	=> $ident_ary['data']['field_type'],
+					'PROFILE_' . strtoupper($ident) . '_NAME'	=> $this->user->lang($ident_ary['data']['lang_name']),
+					'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $this->user->lang($ident_ary['data']['lang_explain']),
+
+					'S_PROFILE_' . strtoupper($ident)			=> true,
+				);
+
+				$tpl_fields['blockrow'][] = array(
+					'PROFILE_FIELD_VALUE'	=> $value,
+					'PROFILE_FIELD_TYPE'	=> $ident_ary['data']['field_type'],
+					'PROFILE_FIELD_NAME'	=> $this->user->lang($ident_ary['data']['lang_name']),
+					'PROFILE_FIELD_EXPLAIN'	=> $this->user->lang($ident_ary['data']['lang_explain']),
+
+					'S_PROFILE_' . strtoupper($ident)		=> true,
+				);
+			}
+
+			return $tpl_fields;
+		}
+		else
+		{
+			trigger_error('Wrong mode for custom profile', E_USER_ERROR);
+		}
+	}
+
+	/**
+	* Return Templated value/field. Possible values for $mode are:
+	* change == user is able to set/enter profile values; preview == just show the value
+	*/
+	public function process_field_row($mode, $profile_row)
+	{
+		$preview_options = ($mode == 'preview') ? $this->vars['lang_options'] : false;
+
+		// set template filename
+		$this->template->set_filenames(array(
+			'cp_body'		=> 'custom_profile_fields.html',
+		));
+
+		// empty previously filled blockvars
+		foreach ($this->type_collection as $field_key => $field_type)
+		{
+			$this->template->destroy_block_vars($field_type->get_name_short());
+		}
+
+		// Assign template variables
+		$profile_field = $this->type_collection[$profile_row['field_type']];
+		$profile_field->generate_field($profile_row, $preview_options);
+
+		// Return templated data
+		return $this->template->assign_display('cp_body');
+	}
+
+	/**
+	* Build Array for user insertion into custom profile fields table
+	*/
+	public function build_insert_sql_array($cp_data)
+	{
+		$sql_not_in = array();
+		foreach ($cp_data as $key => $null)
+		{
+			$sql_not_in[] = (strncmp($key, 'pf_', 3) === 0) ? substr($key, 3) : $key;
+		}
+
+		$sql = 'SELECT f.field_type, f.field_ident, f.field_default_value, l.lang_default_value
+			FROM ' . $this->fields_language_table . ' l, ' . $this->fields_table . ' f
+			WHERE l.lang_id = ' . $this->user->get_iso_lang_id() . '
+				' . ((sizeof($sql_not_in)) ? ' AND ' . $this->db->sql_in_set('f.field_ident', $sql_not_in, true) : '') . '
+				AND l.field_id = f.field_id';
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$profile_field = $this->type_collection[$row['field_type']];
+			$cp_data['pf_' . $row['field_ident']] = $profile_field->get_default_field_value($row);
+		}
+		$this->db->sql_freeresult($result);
+
+		return $cp_data;
+	}
+}
-- 
cgit v1.2.1


From cacd43bfbd547d711bfdd4c424adfef9d20528e7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 2 Feb 2014 16:05:01 +0100
Subject: [ticket/11201] Remove dependency from types on the manager

PHPBB3-11201
---
 phpBB/phpbb/profilefields/manager.php | 53 +++++++----------------------------
 1 file changed, 10 insertions(+), 43 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 9f64e1dcf7..7564c920c9 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -39,6 +39,12 @@ class manager
 	*/
 	protected $template;
 
+	/**
+	* Service Collection object
+	* @var \phpbb\di\service_collection
+	*/
+	protected $type_collection;
+
 	/**
 	* User object
 	* @var \phpbb\user
@@ -60,17 +66,19 @@ class manager
 	* @param	\phpbb\db\driver\driver		$db			Database object
 	* @param	\phpbb\request\request		$request	Request object
 	* @param	\phpbb\template\template	$template	Template object
+	* @param	\phpbb\di\service_collection $type_collection
 	* @param	\phpbb\user					$user		User object
 	* @param	string				$fields_table
 	* @param	string				$fields_language_table
 	* @param	string				$fields_data_table
 	*/
-	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver $db, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
+	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver $db, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
 	{
 		$this->auth = $auth;
 		$this->db = $db;
 		$this->request = $request;
 		$this->template = $template;
+		$this->type_collection = $type_collection;
 		$this->user = $user;
 
 		$this->fields_table = $fields_table;
@@ -78,20 +86,6 @@ class manager
 		$this->fields_data_table = $fields_data_table;
 	}
 
-	/**
-	* Setter for the type collection
-	*
-	* We need to set the type collection later,
-	* in order to avoid a circular dependency
-	*
-	* @param \phpbb\di\service_collection $type_collection
-	* @return null
-	*/
-	public function set_type_collection(\phpbb\di\service_collection $type_collection)
-	{
-		$this->type_collection = $type_collection;
-	}
-
 	/**
 	* Assign editable fields to template, mode can be profile (for profile change) or register (for registration)
 	* Called by ucp_profile and ucp_register
@@ -131,8 +125,8 @@ class manager
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			// Return templated field
-			$tpl_snippet = $this->process_field_row('change', $row);
 			$profile_field = $this->type_collection[$row['field_type']];
+			$tpl_snippet = $profile_field->process_field_row('change', $row);
 
 			$this->template->assign_block_vars('profile_fields', array(
 				'LANG_NAME'		=> $this->user->lang($row['lang_name']),
@@ -351,33 +345,6 @@ class manager
 		}
 	}
 
-	/**
-	* Return Templated value/field. Possible values for $mode are:
-	* change == user is able to set/enter profile values; preview == just show the value
-	*/
-	public function process_field_row($mode, $profile_row)
-	{
-		$preview_options = ($mode == 'preview') ? $this->vars['lang_options'] : false;
-
-		// set template filename
-		$this->template->set_filenames(array(
-			'cp_body'		=> 'custom_profile_fields.html',
-		));
-
-		// empty previously filled blockvars
-		foreach ($this->type_collection as $field_key => $field_type)
-		{
-			$this->template->destroy_block_vars($field_type->get_name_short());
-		}
-
-		// Assign template variables
-		$profile_field = $this->type_collection[$profile_row['field_type']];
-		$profile_field->generate_field($profile_row, $preview_options);
-
-		// Return templated data
-		return $this->template->assign_display('cp_body');
-	}
-
 	/**
 	* Build Array for user insertion into custom profile fields table
 	*/
-- 
cgit v1.2.1


From 6f92996d98239e93b8a6e8002b048b9afd2bf352 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 3 Feb 2014 22:25:43 +0100
Subject: [ticket/12159] Fix codesniffer complaints due to profilefields and
 passwords

The two PRs regarding profilefields and passwords manager that were recently
merged caused a few codesniffer complaints that are fixed by these changes.

PHPBB3-12159
---
 phpBB/phpbb/profilefields/manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 7564c920c9..ead978374c 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -313,7 +313,7 @@ class manager
 				$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
 				$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
 
-				if ($value === NULL)
+				if ($value === null)
 				{
 					continue;
 				}
-- 
cgit v1.2.1


From 3c46aeb0055d88919e1438941c34b97445a17878 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Feb 2014 16:32:25 +0100
Subject: [ticket/12169] Allow displaying profile fields on memberlist

We can not sort by profile field values atm. And also I'm not sure
whether this is possible at all.

PHPBB3-12169
---
 phpBB/phpbb/profilefields/manager.php | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index ead978374c..3948f32e93 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -246,9 +246,35 @@ class manager
 	* Assign fields to template, used for viewprofile, viewtopic and memberlist (if load setting is enabled)
 	* This is directly connected to the user -> mode == grab is to grab the user specific fields, mode == show is for assigning the row to the template
 	*/
-	public function generate_profile_fields_template($mode, $user_id = 0, $profile_row = false)
+	public function generate_profile_fields_template($mode, $user_id = 0, $profile_row = false, $restrict_option = false)
 	{
-		if ($mode == 'grab')
+		if ($mode == 'headlines')
+		{
+			if (!sizeof($this->profile_cache))
+			{
+				$this->build_cache();
+			}
+
+			// Go through the fields in correct order
+			foreach ($this->profile_cache as $field_ident => $field_data)
+			{
+				if ($restrict_option && !$field_data[$restrict_option])
+				{
+					continue;
+				}
+
+				$profile_field = $this->type_collection[$field_data['field_type']];
+
+				$tpl_fields[] = array(
+					'PROFILE_FIELD_TYPE'	=> $field_data['field_type'],
+					'PROFILE_FIELD_NAME'	=> $profile_field->get_field_name($field_data['lang_name']),
+					'PROFILE_FIELD_EXPLAIN'	=> $this->user->lang($field_data['lang_explain']),
+				);
+			}
+
+			return $tpl_fields;
+		}
+		else if ($mode == 'grab')
 		{
 			if (!is_array($user_id))
 			{
-- 
cgit v1.2.1


From 5550f0fa870d531879d53d1bfdd76dcd29a16ce6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 10 Feb 2014 19:04:10 +0100
Subject: [ticket/12169] Split mode==headline into it's own function

PHPBB3-12169
---
 phpBB/phpbb/profilefields/manager.php | 53 ++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 23 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 3948f32e93..6a8d32f150 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -243,38 +243,45 @@ class manager
 	}
 
 	/**
-	* Assign fields to template, used for viewprofile, viewtopic and memberlist (if load setting is enabled)
-	* This is directly connected to the user -> mode == grab is to grab the user specific fields, mode == show is for assigning the row to the template
+	* Generate the template arrays in order to display the column names
+	*
+	* @param string	$restrict_option	Restrict the published fields to a certain profile field option
+	* @return array		Returns an array with the template variables type, name and explain for the fields to display
 	*/
-	public function generate_profile_fields_template($mode, $user_id = 0, $profile_row = false, $restrict_option = false)
+	public function generate_profile_fields_template_headlines($restrict_option = '')
 	{
-		if ($mode == 'headlines')
+		if (!sizeof($this->profile_cache))
 		{
-			if (!sizeof($this->profile_cache))
+			$this->build_cache();
+		}
+
+		// Go through the fields in correct order
+		foreach ($this->profile_cache as $field_ident => $field_data)
+		{
+			if ($restrict_option && !$field_data[$restrict_option])
 			{
-				$this->build_cache();
+				continue;
 			}
 
-			// Go through the fields in correct order
-			foreach ($this->profile_cache as $field_ident => $field_data)
-			{
-				if ($restrict_option && !$field_data[$restrict_option])
-				{
-					continue;
-				}
+			$profile_field = $this->type_collection[$field_data['field_type']];
 
-				$profile_field = $this->type_collection[$field_data['field_type']];
+			$tpl_fields[] = array(
+				'PROFILE_FIELD_TYPE'	=> $field_data['field_type'],
+				'PROFILE_FIELD_NAME'	=> $profile_field->get_field_name($field_data['lang_name']),
+				'PROFILE_FIELD_EXPLAIN'	=> $this->user->lang($field_data['lang_explain']),
+			);
+		}
 
-				$tpl_fields[] = array(
-					'PROFILE_FIELD_TYPE'	=> $field_data['field_type'],
-					'PROFILE_FIELD_NAME'	=> $profile_field->get_field_name($field_data['lang_name']),
-					'PROFILE_FIELD_EXPLAIN'	=> $this->user->lang($field_data['lang_explain']),
-				);
-			}
+		return $tpl_fields;
+	}
 
-			return $tpl_fields;
-		}
-		else if ($mode == 'grab')
+	/**
+	* Assign fields to template, used for viewprofile, viewtopic and memberlist (if load setting is enabled)
+	* This is directly connected to the user -> mode == grab is to grab the user specific fields, mode == show is for assigning the row to the template
+	*/
+	public function generate_profile_fields_template($mode, $user_id = 0, $profile_row = false)
+	{
+		if ($mode == 'grab')
 		{
 			if (!is_array($user_id))
 			{
-- 
cgit v1.2.1


From 30fbaab8dee3ff3890ed2b1d86bb56392b4037e0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 11 Feb 2014 19:17:24 +0100
Subject: [ticket/12184] Fix undefined variable tpl_fields in profile field
 manager

PHPBB3-12184
---
 phpBB/phpbb/profilefields/manager.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 6a8d32f150..ac2542a6d4 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -255,6 +255,8 @@ class manager
 			$this->build_cache();
 		}
 
+		$tpl_fields = array();
+
 		// Go through the fields in correct order
 		foreach ($this->profile_cache as $field_ident => $field_data)
 		{
-- 
cgit v1.2.1


From a823205403f2dbbd907c03e59fd232552351d566 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Feb 2014 11:05:48 +0100
Subject: [ticket/12233] Allow profile fields to be contact fields

Contact fields are displayed with in the contact section of the user profile
and are displayed differently in the mini profile next to posts and private
messages

PHPBB3-12233
---
 phpBB/phpbb/profilefields/manager.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index ac2542a6d4..874d0a21e0 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -353,21 +353,40 @@ class manager
 					continue;
 				}
 
+				$field_desc = $this->user->lang($ident_ary['data']['field_contact_desc']);
+				if (strpos($field_desc, '%s') !== false)
+				{
+					$field_desc = sprintf($field_desc, $value);
+				}
+				$contact_url = '';
+				if (strpos($ident_ary['data']['field_contact_url'], '%s') !== false)
+				{
+					$contact_url = sprintf($ident_ary['data']['field_contact_url'], $value);
+				}
+
 				$tpl_fields['row'] += array(
+					'PROFILE_' . strtoupper($ident) . '_IDENT'	=> $ident,
 					'PROFILE_' . strtoupper($ident) . '_VALUE'	=> $value,
+					'PROFILE_' . strtoupper($ident) . '_CONTACT'=> $contact_url,
+					'PROFILE_' . strtoupper($ident) . '_DESC'	=> $field_desc,
 					'PROFILE_' . strtoupper($ident) . '_TYPE'	=> $ident_ary['data']['field_type'],
 					'PROFILE_' . strtoupper($ident) . '_NAME'	=> $this->user->lang($ident_ary['data']['lang_name']),
 					'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $this->user->lang($ident_ary['data']['lang_explain']),
 
+					'S_PROFILE_' . strtoupper($ident) . '_CONTACT'	=> $ident_ary['data']['field_is_contact'],
 					'S_PROFILE_' . strtoupper($ident)			=> true,
 				);
 
 				$tpl_fields['blockrow'][] = array(
+					'PROFILE_FIELD_IDENT'	=> $ident,
 					'PROFILE_FIELD_VALUE'	=> $value,
+					'PROFILE_FIELD_CONTACT'	=> $contact_url,
+					'PROFILE_FIELD_DESC'	=> $field_desc,
 					'PROFILE_FIELD_TYPE'	=> $ident_ary['data']['field_type'],
 					'PROFILE_FIELD_NAME'	=> $this->user->lang($ident_ary['data']['lang_name']),
 					'PROFILE_FIELD_EXPLAIN'	=> $this->user->lang($ident_ary['data']['lang_explain']),
 
+					'S_PROFILE_CONTACT'						=> $ident_ary['data']['field_is_contact'],
 					'S_PROFILE_' . strtoupper($ident)		=> true,
 				);
 			}
-- 
cgit v1.2.1


From c650078904e41c9dd468b329131ace2fcbd8d1f9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 4 Mar 2014 08:47:47 +0100
Subject: [ticket/12187] Split generate_profile_fields_template() into 2
 methods

Removing the mode switch that wraps the content of the method

PHPBB3-12187
---
 phpBB/phpbb/profilefields/manager.php | 192 +++++++++++++++++-----------------
 1 file changed, 96 insertions(+), 96 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 874d0a21e0..8b4a3917f2 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -278,125 +278,125 @@ class manager
 	}
 
 	/**
-	* Assign fields to template, used for viewprofile, viewtopic and memberlist (if load setting is enabled)
-	* This is directly connected to the user -> mode == grab is to grab the user specific fields, mode == show is for assigning the row to the template
+	* Grab the user specific profile fields data
+	*
+	* @param	int|array	$user_ids	Single user id or an array of ids
+	* @return array		Users profile fields data
 	*/
-	public function generate_profile_fields_template($mode, $user_id = 0, $profile_row = false)
+	public function grab_profile_fields_data($user_ids = 0)
 	{
-		if ($mode == 'grab')
+		if (!is_array($user_ids))
 		{
-			if (!is_array($user_id))
-			{
-				$user_id = array($user_id);
-			}
+			$user_ids = array($user_ids);
+		}
 
-			if (!sizeof($this->profile_cache))
-			{
-				$this->build_cache();
-			}
+		if (!sizeof($this->profile_cache))
+		{
+			$this->build_cache();
+		}
 
-			if (!sizeof($user_id))
-			{
-				return array();
-			}
+		if (!sizeof($user_ids))
+		{
+			return array();
+		}
 
-			$sql = 'SELECT *
-				FROM ' . $this->fields_data_table . '
-				WHERE ' . $this->db->sql_in_set('user_id', array_map('intval', $user_id));
-			$result = $this->db->sql_query($sql);
+		$sql = 'SELECT *
+			FROM ' . $this->fields_data_table . '
+			WHERE ' . $this->db->sql_in_set('user_id', array_map('intval', $user_ids));
+		$result = $this->db->sql_query($sql);
 
-			$field_data = array();
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				$field_data[$row['user_id']] = $row;
-			}
-			$this->db->sql_freeresult($result);
+		$field_data = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$field_data[$row['user_id']] = $row;
+		}
+		$this->db->sql_freeresult($result);
 
-			$user_fields = array();
+		$user_fields = array();
 
-			$user_ids = $user_id;
+		// Go through the fields in correct order
+		foreach (array_keys($this->profile_cache) as $used_ident)
+		{
+			foreach ($field_data as $user_id => $row)
+			{
+				$user_fields[$user_id][$used_ident]['value'] = $row['pf_' . $used_ident];
+				$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
+			}
 
-			// Go through the fields in correct order
-			foreach (array_keys($this->profile_cache) as $used_ident)
+			foreach ($user_ids as $user_id)
 			{
-				foreach ($field_data as $user_id => $row)
+				if (!isset($user_fields[$user_id][$used_ident]) && $this->profile_cache[$used_ident]['field_show_novalue'])
 				{
-					$user_fields[$user_id][$used_ident]['value'] = $row['pf_' . $used_ident];
+					$user_fields[$user_id][$used_ident]['value'] = '';
 					$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
 				}
-
-				foreach ($user_ids as $user_id)
-				{
-					if (!isset($user_fields[$user_id][$used_ident]) && $this->profile_cache[$used_ident]['field_show_novalue'])
-					{
-						$user_fields[$user_id][$used_ident]['value'] = '';
-						$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
-					}
-				}
 			}
-
-			return $user_fields;
 		}
-		else if ($mode == 'show')
-		{
-			// $profile_row == $user_fields[$row['user_id']];
-			$tpl_fields = array();
-			$tpl_fields['row'] = $tpl_fields['blockrow'] = array();
 
-			foreach ($profile_row as $ident => $ident_ary)
-			{
-				$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
-				$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
+		return $user_fields;
+	}
 
-				if ($value === null)
-				{
-					continue;
-				}
+	/**
+	 * Assign the user's profile fields data to the template
+	 *
+	 * @param array	$profile_row Array with users profile field data
+	 * @return array
+	 */
+	public function generate_profile_fields_template_data($profile_row)
+	{
+		// $profile_row == $user_fields[$row['user_id']];
+		$tpl_fields = array();
+		$tpl_fields['row'] = $tpl_fields['blockrow'] = array();
 
-				$field_desc = $this->user->lang($ident_ary['data']['field_contact_desc']);
-				if (strpos($field_desc, '%s') !== false)
-				{
-					$field_desc = sprintf($field_desc, $value);
-				}
-				$contact_url = '';
-				if (strpos($ident_ary['data']['field_contact_url'], '%s') !== false)
-				{
-					$contact_url = sprintf($ident_ary['data']['field_contact_url'], $value);
-				}
+		foreach ($profile_row as $ident => $ident_ary)
+		{
+			$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
+			$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
 
-				$tpl_fields['row'] += array(
-					'PROFILE_' . strtoupper($ident) . '_IDENT'	=> $ident,
-					'PROFILE_' . strtoupper($ident) . '_VALUE'	=> $value,
-					'PROFILE_' . strtoupper($ident) . '_CONTACT'=> $contact_url,
-					'PROFILE_' . strtoupper($ident) . '_DESC'	=> $field_desc,
-					'PROFILE_' . strtoupper($ident) . '_TYPE'	=> $ident_ary['data']['field_type'],
-					'PROFILE_' . strtoupper($ident) . '_NAME'	=> $this->user->lang($ident_ary['data']['lang_name']),
-					'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $this->user->lang($ident_ary['data']['lang_explain']),
-
-					'S_PROFILE_' . strtoupper($ident) . '_CONTACT'	=> $ident_ary['data']['field_is_contact'],
-					'S_PROFILE_' . strtoupper($ident)			=> true,
-				);
-
-				$tpl_fields['blockrow'][] = array(
-					'PROFILE_FIELD_IDENT'	=> $ident,
-					'PROFILE_FIELD_VALUE'	=> $value,
-					'PROFILE_FIELD_CONTACT'	=> $contact_url,
-					'PROFILE_FIELD_DESC'	=> $field_desc,
-					'PROFILE_FIELD_TYPE'	=> $ident_ary['data']['field_type'],
-					'PROFILE_FIELD_NAME'	=> $this->user->lang($ident_ary['data']['lang_name']),
-					'PROFILE_FIELD_EXPLAIN'	=> $this->user->lang($ident_ary['data']['lang_explain']),
-
-					'S_PROFILE_CONTACT'						=> $ident_ary['data']['field_is_contact'],
-					'S_PROFILE_' . strtoupper($ident)		=> true,
-				);
+			if ($value === null)
+			{
+				continue;
 			}
 
-			return $tpl_fields;
-		}
-		else
-		{
-			trigger_error('Wrong mode for custom profile', E_USER_ERROR);
+			$field_desc = $this->user->lang($ident_ary['data']['field_contact_desc']);
+			if (strpos($field_desc, '%s') !== false)
+			{
+				$field_desc = sprintf($field_desc, $value);
+			}
+			$contact_url = '';
+			if (strpos($ident_ary['data']['field_contact_url'], '%s') !== false)
+			{
+				$contact_url = sprintf($ident_ary['data']['field_contact_url'], $value);
+			}
+
+			$tpl_fields['row'] += array(
+				'PROFILE_' . strtoupper($ident) . '_IDENT'	=> $ident,
+				'PROFILE_' . strtoupper($ident) . '_VALUE'	=> $value,
+				'PROFILE_' . strtoupper($ident) . '_CONTACT'=> $contact_url,
+				'PROFILE_' . strtoupper($ident) . '_DESC'	=> $field_desc,
+				'PROFILE_' . strtoupper($ident) . '_TYPE'	=> $ident_ary['data']['field_type'],
+				'PROFILE_' . strtoupper($ident) . '_NAME'	=> $this->user->lang($ident_ary['data']['lang_name']),
+				'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $this->user->lang($ident_ary['data']['lang_explain']),
+
+				'S_PROFILE_' . strtoupper($ident) . '_CONTACT'	=> $ident_ary['data']['field_is_contact'],
+				'S_PROFILE_' . strtoupper($ident)			=> true,
+			);
+
+			$tpl_fields['blockrow'][] = array(
+				'PROFILE_FIELD_IDENT'	=> $ident,
+				'PROFILE_FIELD_VALUE'	=> $value,
+				'PROFILE_FIELD_CONTACT'	=> $contact_url,
+				'PROFILE_FIELD_DESC'	=> $field_desc,
+				'PROFILE_FIELD_TYPE'	=> $ident_ary['data']['field_type'],
+				'PROFILE_FIELD_NAME'	=> $this->user->lang($ident_ary['data']['lang_name']),
+				'PROFILE_FIELD_EXPLAIN'	=> $this->user->lang($ident_ary['data']['lang_explain']),
+
+				'S_PROFILE_CONTACT'						=> $ident_ary['data']['field_is_contact'],
+				'S_PROFILE_' . strtoupper($ident)		=> true,
+			);
 		}
+
+		return $tpl_fields;
 	}
 
 	/**
-- 
cgit v1.2.1


From 03ef39c1f18584b331b5ddbd59e94848b8d3cd17 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 4 Mar 2014 09:10:57 +0100
Subject: [ticket/12187] Do not make clickable when using as contact field

PHPBB3-12187
---
 phpBB/phpbb/profilefields/manager.php | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 8b4a3917f2..a4626bc5de 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -337,12 +337,14 @@ class manager
 	}
 
 	/**
-	 * Assign the user's profile fields data to the template
-	 *
-	 * @param array	$profile_row Array with users profile field data
-	 * @return array
-	 */
-	public function generate_profile_fields_template_data($profile_row)
+	* Assign the user's profile fields data to the template
+	*
+	* @param array	$profile_row		Array with users profile field data
+	* @param bool	$use_contact_fields	Should we display contact fields as such?
+	*			This requires special treatments (links should not be parsed in the values, and more)
+	* @return array
+	*/
+	public function generate_profile_fields_template_data($profile_row, $use_contact_fields = true)
 	{
 		// $profile_row == $user_fields[$row['user_id']];
 		$tpl_fields = array();
@@ -358,15 +360,20 @@ class manager
 				continue;
 			}
 
-			$field_desc = $this->user->lang($ident_ary['data']['field_contact_desc']);
-			if (strpos($field_desc, '%s') !== false)
-			{
-				$field_desc = sprintf($field_desc, $value);
-			}
-			$contact_url = '';
-			if (strpos($ident_ary['data']['field_contact_url'], '%s') !== false)
+			$field_desc = $contact_url = '';
+			if ($use_contact_fields)
 			{
-				$contact_url = sprintf($ident_ary['data']['field_contact_url'], $value);
+				$value = $profile_field->get_profile_contact_value($ident_ary['value'], $ident_ary['data']);
+				$field_desc = $this->user->lang($ident_ary['data']['field_contact_desc']);
+				if (strpos($field_desc, '%s') !== false)
+				{
+					$field_desc = sprintf($field_desc, $value);
+				}
+				$contact_url = '';
+				if (strpos($ident_ary['data']['field_contact_url'], '%s') !== false)
+				{
+					$contact_url = sprintf($ident_ary['data']['field_contact_url'], $value);
+				}
 			}
 
 			$tpl_fields['row'] += array(
-- 
cgit v1.2.1


From 86c4d24a8ac14c4339806871ab326aedec4965e9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 30 Mar 2014 15:44:58 +0200
Subject: [ticket/12331] Fix SQL error when inserting a new entry to profile
 field data

There was a "Field 'pf_phpbb_interests' doesn't have a default value" error,
because we didn't specify values for the disabled fields.
We can not disable the sql_return_on_error() thou, because it otherwise we run
into "Duplicate entry '2' for key 'PRIMARY'" errors when the user submits the
form again but didn't change any values.

PHPBB3-12331
---
 phpBB/phpbb/profilefields/manager.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index a4626bc5de..f4baec7a6c 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -231,6 +231,7 @@ class manager
 
 		if (!$this->db->sql_affectedrows())
 		{
+			$cp_data = $this->build_insert_sql_array($cp_data);
 			$cp_data['user_id'] = (int) $user_id;
 
 			$this->db->sql_return_on_error(true);
-- 
cgit v1.2.1


From 11a9104b8a50cbc62cba0c242dee554b5209a327 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 17 Mar 2014 13:29:35 +0100
Subject: [ticket/12282] Use interface for type hinting

PHPBB3-12282
---
 phpBB/phpbb/profilefields/manager.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index a4626bc5de..eebdbd07ae 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -23,7 +23,7 @@ class manager
 
 	/**
 	* Database object
-	* @var \phpbb\db\driver\driver
+	* @var \phpbb\db\driver\driver_interface
 	*/
 	protected $db;
 
@@ -63,7 +63,7 @@ class manager
 	* Construct
 	*
 	* @param	\phpbb\auth\auth			$auth		Auth object
-	* @param	\phpbb\db\driver\driver		$db			Database object
+	* @param	\phpbb\db\driver\driver_interface	$db			Database object
 	* @param	\phpbb\request\request		$request	Request object
 	* @param	\phpbb\template\template	$template	Template object
 	* @param	\phpbb\di\service_collection $type_collection
@@ -72,7 +72,7 @@ class manager
 	* @param	string				$fields_language_table
 	* @param	string				$fields_data_table
 	*/
-	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver $db, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
+	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
 	{
 		$this->auth = $auth;
 		$this->db = $db;
-- 
cgit v1.2.1


From b3b0e5ccf2503e7bba72ee922dda175337d1b4e9 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Mon, 31 Mar 2014 14:06:58 +0200
Subject: [ticket/12335] Add Events to phpbb\profilefields\manager

PHPBB3-12335
---
 phpBB/phpbb/profilefields/manager.php | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 37449c67c4..7d50fd9f24 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -27,6 +27,12 @@ class manager
 	*/
 	protected $db;
 
+	/**
+	* Event dispatcher object
+	* @var \phpbb\event\dispatcher
+	*/
+	protected $dispatcher;
+
 	/**
 	* Request object
 	* @var \phpbb\request\request
@@ -64,6 +70,7 @@ class manager
 	*
 	* @param	\phpbb\auth\auth			$auth		Auth object
 	* @param	\phpbb\db\driver\driver_interface	$db			Database object
+	* @param	\phpbb\event\dispatcher		$dispatcher	Event dispatcher object
 	* @param	\phpbb\request\request		$request	Request object
 	* @param	\phpbb\template\template	$template	Template object
 	* @param	\phpbb\di\service_collection $type_collection
@@ -72,10 +79,11 @@ class manager
 	* @param	string				$fields_language_table
 	* @param	string				$fields_data_table
 	*/
-	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
+	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\event\dispatcher $dispatcher, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
 	{
 		$this->auth = $auth;
 		$this->db = $db;
+		$this->dispatcher = $dispatcher;
 		$this->request = $request;
 		$this->template = $template;
 		$this->type_collection = $type_collection;
@@ -313,6 +321,17 @@ class manager
 		}
 		$this->db->sql_freeresult($result);
 
+		/**
+		* Event to modify profile fields data retrieved from the database
+		*
+		* @event core.grab_profile_fields_data
+		* @var	int|array	$user_ids	Single user id or an array of ids 
+		* @var	array	$field_data		Array with profile fields data
+		* @since 3.1-B3
+		*/
+		$vars = array('user_ids', 'field_data');
+		extract($this->dispatcher->trigger_event('core.grab_profile_fields_data', compact($vars)));
+
 		$user_fields = array();
 
 		// Go through the fields in correct order
@@ -404,6 +423,17 @@ class manager
 			);
 		}
 
+		/**
+		* Event to modify template data of the generated profile fields
+		*
+		* @event core.generate_profile_fields_template_data
+		* @var	array	profile_row		Array with users profile field data 
+		* @var	array	tpl_fields		Array with template data fields
+		* @since 3.1-B3
+		*/
+		$vars = array('profile_row', 'tpl_fields');
+		extract($this->dispatcher->trigger_event('core.generate_profile_fields_template_data', compact($vars)));
+
 		return $tpl_fields;
 	}
 
-- 
cgit v1.2.1


From 1fd1803a3bfffd15e0bc85097cd84c3f2d9ec163 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Mon, 7 Apr 2014 08:05:50 +0200
Subject: [ticket/12335] Fix phpBB version number

PHPBB3-12335
---
 phpBB/phpbb/profilefields/manager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 7d50fd9f24..7c0397a563 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -327,7 +327,7 @@ class manager
 		* @event core.grab_profile_fields_data
 		* @var	int|array	$user_ids	Single user id or an array of ids 
 		* @var	array	$field_data		Array with profile fields data
-		* @since 3.1-B3
+		* @since 3.1.0-b3
 		*/
 		$vars = array('user_ids', 'field_data');
 		extract($this->dispatcher->trigger_event('core.grab_profile_fields_data', compact($vars)));
@@ -429,7 +429,7 @@ class manager
 		* @event core.generate_profile_fields_template_data
 		* @var	array	profile_row		Array with users profile field data 
 		* @var	array	tpl_fields		Array with template data fields
-		* @since 3.1-B3
+		* @since 3.1.0-b3
 		*/
 		$vars = array('profile_row', 'tpl_fields');
 		extract($this->dispatcher->trigger_event('core.generate_profile_fields_template_data', compact($vars)));
-- 
cgit v1.2.1


From 2343d9f8d42337353d32a69fddcc1a51e0a49f5a Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Mon, 14 Apr 2014 20:50:51 +0200
Subject: [ticket/12335] Documentation fix and added use_contact_fields

PHPBB3-12335
---
 phpBB/phpbb/profilefields/manager.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 7c0397a563..a7b8f55e34 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -325,7 +325,7 @@ class manager
 		* Event to modify profile fields data retrieved from the database
 		*
 		* @event core.grab_profile_fields_data
-		* @var	int|array	$user_ids	Single user id or an array of ids 
+		* @var	array	$user_ids		Single user id or an array of ids 
 		* @var	array	$field_data		Array with profile fields data
 		* @since 3.1.0-b3
 		*/
@@ -429,9 +429,10 @@ class manager
 		* @event core.generate_profile_fields_template_data
 		* @var	array	profile_row		Array with users profile field data 
 		* @var	array	tpl_fields		Array with template data fields
+		* @var	bool	use_contact_fields	Should we display contact fields as such?
 		* @since 3.1.0-b3
 		*/
-		$vars = array('profile_row', 'tpl_fields');
+		$vars = array('profile_row', 'tpl_fields', 'use_contact_fields');
 		extract($this->dispatcher->trigger_event('core.generate_profile_fields_template_data', compact($vars)));
 
 		return $tpl_fields;
-- 
cgit v1.2.1


From 42dfd1aa3c8fda95efd0dac03652a163752575d4 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Mon, 14 Apr 2014 21:15:30 +0200
Subject: [ticket/12335] Added generate_profile_fields _ before

PHPBB3-12335
---
 phpBB/phpbb/profilefields/manager.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index a7b8f55e34..5b326fe39c 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -370,6 +370,18 @@ class manager
 		$tpl_fields = array();
 		$tpl_fields['row'] = $tpl_fields['blockrow'] = array();
 
+		/**
+		* Event to modify data of the generated profile fields, before the template assignment loop
+		*
+		* @event core.generate_profile_fields_template_data_before
+		* @var	array	profile_row		Array with users profile field data 
+		* @var	array	tpl_fields		Array with template data fields
+		* @var	bool	use_contact_fields	Should we display contact fields as such?
+		* @since 3.1.0-b3
+		*/
+		$vars = array('profile_row', 'tpl_fields', 'use_contact_fields');
+		extract($this->dispatcher->trigger_event('core.generate_profile_fields_template_data_before', compact($vars)));
+
 		foreach ($profile_row as $ident => $ident_ary)
 		{
 			$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
-- 
cgit v1.2.1


From 5b5b61c6c97d0d4158e6487a47fb5bb584affa34 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Fri, 2 May 2014 17:29:52 +0200
Subject: [ticket/12335] Remove $ from desc

Come on travis, play nice this time

PHPBB3-12335
---
 phpBB/phpbb/profilefields/manager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 5b326fe39c..7d545a5f72 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -325,8 +325,8 @@ class manager
 		* Event to modify profile fields data retrieved from the database
 		*
 		* @event core.grab_profile_fields_data
-		* @var	array	$user_ids		Single user id or an array of ids 
-		* @var	array	$field_data		Array with profile fields data
+		* @var	array	user_ids		Single user id or an array of ids 
+		* @var	array	field_data		Array with profile fields data
 		* @since 3.1.0-b3
 		*/
 		$vars = array('user_ids', 'field_data');
-- 
cgit v1.2.1


From a759704b39fc1c1353f865a633759b1369589b67 Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Tue, 27 May 2014 20:18:06 +0200
Subject: [ticket/12594] Remove @package tags and update file headers

PHPBB3-12594
---
 phpBB/phpbb/profilefields/manager.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 7d545a5f72..490db0419a 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2014 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -11,7 +15,6 @@ namespace phpbb\profilefields;
 
 /**
 * Custom Profile Fields
-* @package phpBB3
 */
 class manager
 {
-- 
cgit v1.2.1


From 08e2c07f0b7991d89a562e1a78da9462d830e134 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Mon, 31 Mar 2014 13:04:25 +0200
Subject: [ticket/12334] Add PROFILE_FIELD_VALUEID template var

PHPBB3-12334
---
 phpBB/phpbb/profilefields/manager.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 490db0419a..f075e38ded 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -412,13 +412,14 @@ class manager
 			}
 
 			$tpl_fields['row'] += array(
-				'PROFILE_' . strtoupper($ident) . '_IDENT'	=> $ident,
-				'PROFILE_' . strtoupper($ident) . '_VALUE'	=> $value,
-				'PROFILE_' . strtoupper($ident) . '_CONTACT'=> $contact_url,
-				'PROFILE_' . strtoupper($ident) . '_DESC'	=> $field_desc,
-				'PROFILE_' . strtoupper($ident) . '_TYPE'	=> $ident_ary['data']['field_type'],
-				'PROFILE_' . strtoupper($ident) . '_NAME'	=> $this->user->lang($ident_ary['data']['lang_name']),
-				'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $this->user->lang($ident_ary['data']['lang_explain']),
+				'PROFILE_' . strtoupper($ident) . '_IDENT'		=> $ident,
+				'PROFILE_' . strtoupper($ident) . '_VALUE'		=> $value,
+				'PROFILE_' . strtoupper($ident) . '_VALUEID'	=> $ident_ary['value'],
+				'PROFILE_' . strtoupper($ident) . '_CONTACT'	=> $contact_url,
+				'PROFILE_' . strtoupper($ident) . '_DESC'		=> $field_desc,
+				'PROFILE_' . strtoupper($ident) . '_TYPE'		=> $ident_ary['data']['field_type'],
+				'PROFILE_' . strtoupper($ident) . '_NAME'		=> $this->user->lang($ident_ary['data']['lang_name']),
+				'PROFILE_' . strtoupper($ident) . '_EXPLAIN'	=> $this->user->lang($ident_ary['data']['lang_explain']),
 
 				'S_PROFILE_' . strtoupper($ident) . '_CONTACT'	=> $ident_ary['data']['field_is_contact'],
 				'S_PROFILE_' . strtoupper($ident)			=> true,
@@ -427,6 +428,7 @@ class manager
 			$tpl_fields['blockrow'][] = array(
 				'PROFILE_FIELD_IDENT'	=> $ident,
 				'PROFILE_FIELD_VALUE'	=> $value,
+				'PROFILE_FIELD_VALUEID'	=> $ident_ary['value'],
 				'PROFILE_FIELD_CONTACT'	=> $contact_url,
 				'PROFILE_FIELD_DESC'	=> $field_desc,
 				'PROFILE_FIELD_TYPE'	=> $ident_ary['data']['field_type'],
-- 
cgit v1.2.1


From 4169fd65f07f67f99e64e7ab962d09c1e10f14dc Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Sat, 5 Apr 2014 22:32:42 +0200
Subject: [ticket/12334] Added field_novalue fall-back as requested

PHPBB3-12334
---
 phpBB/phpbb/profilefields/manager.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index f075e38ded..7602abf9aa 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -389,6 +389,7 @@ class manager
 		{
 			$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
 			$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
+			$valueid = (!$ident_ary['value'] && !$ident_ary['data']['field_show_novalue']) ? $ident_ary['data']['field_novalue'] : $ident_ary['value'];
 
 			if ($value === null)
 			{
@@ -414,7 +415,7 @@ class manager
 			$tpl_fields['row'] += array(
 				'PROFILE_' . strtoupper($ident) . '_IDENT'		=> $ident,
 				'PROFILE_' . strtoupper($ident) . '_VALUE'		=> $value,
-				'PROFILE_' . strtoupper($ident) . '_VALUEID'	=> $ident_ary['value'],
+				'PROFILE_' . strtoupper($ident) . '_VALUEID'	=> $valueid,
 				'PROFILE_' . strtoupper($ident) . '_CONTACT'	=> $contact_url,
 				'PROFILE_' . strtoupper($ident) . '_DESC'		=> $field_desc,
 				'PROFILE_' . strtoupper($ident) . '_TYPE'		=> $ident_ary['data']['field_type'],
@@ -428,7 +429,7 @@ class manager
 			$tpl_fields['blockrow'][] = array(
 				'PROFILE_FIELD_IDENT'	=> $ident,
 				'PROFILE_FIELD_VALUE'	=> $value,
-				'PROFILE_FIELD_VALUEID'	=> $ident_ary['value'],
+				'PROFILE_FIELD_VALUEID'	=> $valueid,
 				'PROFILE_FIELD_CONTACT'	=> $contact_url,
 				'PROFILE_FIELD_DESC'	=> $field_desc,
 				'PROFILE_FIELD_TYPE'	=> $ident_ary['data']['field_type'],
-- 
cgit v1.2.1


From 507eca319d2bff9779d662a36b845017b7464e68 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Tue, 29 Apr 2014 16:16:19 +0200
Subject: [ticket/12334] Implemented get_profile_valueid method

PHPBB3-12334
---
 phpBB/phpbb/profilefields/manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 7602abf9aa..a2b931ce27 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -389,7 +389,7 @@ class manager
 		{
 			$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
 			$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
-			$valueid = (!$ident_ary['value'] && !$ident_ary['data']['field_show_novalue']) ? $ident_ary['data']['field_novalue'] : $ident_ary['value'];
+			$valueid = $profile_field->get_profile_valueid($ident_ary['value'], $ident_ary['data']);
 
 			if ($value === null)
 			{
-- 
cgit v1.2.1


From 2b451a174bc3cf253dacb3bfb313e9ff3f227de6 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 30 Apr 2014 10:08:21 +0200
Subject: [ticket/12334] Changed from valueid to value_raw

PHPBB3-12334
---
 phpBB/phpbb/profilefields/manager.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index a2b931ce27..26c11d9e22 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -389,7 +389,7 @@ class manager
 		{
 			$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
 			$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
-			$valueid = $profile_field->get_profile_valueid($ident_ary['value'], $ident_ary['data']);
+			$value_raw = $profile_field->get_profile_value_raw($ident_ary['value'], $ident_ary['data']);
 
 			if ($value === null)
 			{
@@ -415,7 +415,7 @@ class manager
 			$tpl_fields['row'] += array(
 				'PROFILE_' . strtoupper($ident) . '_IDENT'		=> $ident,
 				'PROFILE_' . strtoupper($ident) . '_VALUE'		=> $value,
-				'PROFILE_' . strtoupper($ident) . '_VALUEID'	=> $valueid,
+				'PROFILE_' . strtoupper($ident) . '_VALUE_RAW'	=> $value_raw,
 				'PROFILE_' . strtoupper($ident) . '_CONTACT'	=> $contact_url,
 				'PROFILE_' . strtoupper($ident) . '_DESC'		=> $field_desc,
 				'PROFILE_' . strtoupper($ident) . '_TYPE'		=> $ident_ary['data']['field_type'],
@@ -427,14 +427,14 @@ class manager
 			);
 
 			$tpl_fields['blockrow'][] = array(
-				'PROFILE_FIELD_IDENT'	=> $ident,
-				'PROFILE_FIELD_VALUE'	=> $value,
-				'PROFILE_FIELD_VALUEID'	=> $valueid,
-				'PROFILE_FIELD_CONTACT'	=> $contact_url,
-				'PROFILE_FIELD_DESC'	=> $field_desc,
-				'PROFILE_FIELD_TYPE'	=> $ident_ary['data']['field_type'],
-				'PROFILE_FIELD_NAME'	=> $this->user->lang($ident_ary['data']['lang_name']),
-				'PROFILE_FIELD_EXPLAIN'	=> $this->user->lang($ident_ary['data']['lang_explain']),
+				'PROFILE_FIELD_IDENT'		=> $ident,
+				'PROFILE_FIELD_VALUE'		=> $value,
+				'PROFILE_FIELD_VALUE_RAW'	=> $value_raw,
+				'PROFILE_FIELD_CONTACT'		=> $contact_url,
+				'PROFILE_FIELD_DESC'		=> $field_desc,
+				'PROFILE_FIELD_TYPE'		=> $ident_ary['data']['field_type'],
+				'PROFILE_FIELD_NAME'		=> $this->user->lang($ident_ary['data']['lang_name']),
+				'PROFILE_FIELD_EXPLAIN'		=> $this->user->lang($ident_ary['data']['lang_explain']),
 
 				'S_PROFILE_CONTACT'						=> $ident_ary['data']['field_is_contact'],
 				'S_PROFILE_' . strtoupper($ident)		=> true,
-- 
cgit v1.2.1


From eb13b4ae28223700034ae7482ab27a6d2cdbccd1 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sat, 28 Jun 2014 13:19:55 +0200
Subject: [ticket/12782] Use an interface for the phpbb event_dispatcher

PHPBB3-12782
---
 phpBB/phpbb/profilefields/manager.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 490db0419a..f9a6d56dd1 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -32,7 +32,7 @@ class manager
 
 	/**
 	* Event dispatcher object
-	* @var \phpbb\event\dispatcher
+	* @var \phpbb\event\dispatcher_interface
 	*/
 	protected $dispatcher;
 
@@ -73,7 +73,7 @@ class manager
 	*
 	* @param	\phpbb\auth\auth			$auth		Auth object
 	* @param	\phpbb\db\driver\driver_interface	$db			Database object
-	* @param	\phpbb\event\dispatcher		$dispatcher	Event dispatcher object
+	* @param	\phpbb\event\dispatcher_interface		$dispatcher	Event dispatcher object
 	* @param	\phpbb\request\request		$request	Request object
 	* @param	\phpbb\template\template	$template	Template object
 	* @param	\phpbb\di\service_collection $type_collection
@@ -82,7 +82,7 @@ class manager
 	* @param	string				$fields_language_table
 	* @param	string				$fields_data_table
 	*/
-	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\event\dispatcher $dispatcher, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
+	public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\di\service_collection $type_collection, \phpbb\user $user, $fields_table, $fields_language_table, $fields_data_table)
 	{
 		$this->auth = $auth;
 		$this->db = $db;
-- 
cgit v1.2.1


From 690de2113433e0330ca53f928f6b923ea36d41c1 Mon Sep 17 00:00:00 2001
From: Stanislav Atanasov <lucifer@anavaro.com>
Date: Thu, 10 Jul 2014 07:44:09 +0300
Subject: [ticket/12791] String profile fields do not use links ...

smilies and line breaks in memberlist

The value is overwritten with the contact value
Added aditional check if the field is a contact so we don't overwrite it.

PHPBB3-12791
---
 phpBB/phpbb/profilefields/manager.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index f3b1676799..c79e13c958 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -390,6 +390,7 @@ class manager
 			$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
 			$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
 			$value_raw = $profile_field->get_profile_value_raw($ident_ary['value'], $ident_ary['data']);
+			$is_contact = $ident_ary['data']['field_is_contact'];
 
 			if ($value === null)
 			{
@@ -397,7 +398,7 @@ class manager
 			}
 
 			$field_desc = $contact_url = '';
-			if ($use_contact_fields)
+			if ($use_contact_fields && $is_contact)
 			{
 				$value = $profile_field->get_profile_contact_value($ident_ary['value'], $ident_ary['data']);
 				$field_desc = $this->user->lang($ident_ary['data']['field_contact_desc']);
-- 
cgit v1.2.1


From 27f15c0d5b661c15eeaf98928128b7b176186954 Mon Sep 17 00:00:00 2001
From: Stanislav Atanasov <lucifer@anavaro.com>
Date: Thu, 10 Jul 2014 11:43:52 +0300
Subject: [ticket/12791] Changed the if check

Removed unneeded variable

PHPBB3-12791
---
 phpBB/phpbb/profilefields/manager.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index c79e13c958..98802d2209 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -390,7 +390,6 @@ class manager
 			$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
 			$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
 			$value_raw = $profile_field->get_profile_value_raw($ident_ary['value'], $ident_ary['data']);
-			$is_contact = $ident_ary['data']['field_is_contact'];
 
 			if ($value === null)
 			{
@@ -398,7 +397,7 @@ class manager
 			}
 
 			$field_desc = $contact_url = '';
-			if ($use_contact_fields && $is_contact)
+			if ($use_contact_fields && $ident_ary['data']['field_is_contact'])
 			{
 				$value = $profile_field->get_profile_contact_value($ident_ary['value'], $ident_ary['data']);
 				$field_desc = $this->user->lang($ident_ary['data']['field_contact_desc']);
-- 
cgit v1.2.1


From fcd2a2f186641f0c11abc40e196e6d916c87646c Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Wed, 10 Sep 2014 18:37:16 +0200
Subject: [ticket/12734] Remove unnecessary error supressing

PHPBB3-12734
---
 phpBB/phpbb/profilefields/manager.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 98802d2209..4ad3214ae4 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -245,12 +245,8 @@ class manager
 			$cp_data = $this->build_insert_sql_array($cp_data);
 			$cp_data['user_id'] = (int) $user_id;
 
-			$this->db->sql_return_on_error(true);
-
 			$sql = 'INSERT INTO ' . $this->fields_data_table . ' ' . $this->db->sql_build_array('INSERT', $cp_data);
 			$this->db->sql_query($sql);
-
-			$this->db->sql_return_on_error(false);
 		}
 	}
 
@@ -328,7 +324,7 @@ class manager
 		* Event to modify profile fields data retrieved from the database
 		*
 		* @event core.grab_profile_fields_data
-		* @var	array	user_ids		Single user id or an array of ids 
+		* @var	array	user_ids		Single user id or an array of ids
 		* @var	array	field_data		Array with profile fields data
 		* @since 3.1.0-b3
 		*/
@@ -377,7 +373,7 @@ class manager
 		* Event to modify data of the generated profile fields, before the template assignment loop
 		*
 		* @event core.generate_profile_fields_template_data_before
-		* @var	array	profile_row		Array with users profile field data 
+		* @var	array	profile_row		Array with users profile field data
 		* @var	array	tpl_fields		Array with template data fields
 		* @var	bool	use_contact_fields	Should we display contact fields as such?
 		* @since 3.1.0-b3
@@ -445,7 +441,7 @@ class manager
 		* Event to modify template data of the generated profile fields
 		*
 		* @event core.generate_profile_fields_template_data
-		* @var	array	profile_row		Array with users profile field data 
+		* @var	array	profile_row		Array with users profile field data
 		* @var	array	tpl_fields		Array with template data fields
 		* @var	bool	use_contact_fields	Should we display contact fields as such?
 		* @since 3.1.0-b3
-- 
cgit v1.2.1


From cf0170d5e38117cf256d45a6c0164ea76b3887bc Mon Sep 17 00:00:00 2001
From: javiexin <javiexin@gmail.com>
Date: Sat, 18 Jul 2015 18:29:25 +0200
Subject: [ticket/14037] Allows adapting memberlist profile fields headline

Adds an event to allow modifying the profile fields headline in line
with modifications to profile fields data.

PHPBB3-14037
---
 phpBB/phpbb/profilefields/manager.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 4ad3214ae4..822b81e0ad 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -276,12 +276,30 @@ class manager
 			$profile_field = $this->type_collection[$field_data['field_type']];
 
 			$tpl_fields[] = array(
+				'PROFILE_FIELD_IDENT'	=> $field_ident,
 				'PROFILE_FIELD_TYPE'	=> $field_data['field_type'],
 				'PROFILE_FIELD_NAME'	=> $profile_field->get_field_name($field_data['lang_name']),
 				'PROFILE_FIELD_EXPLAIN'	=> $this->user->lang($field_data['lang_explain']),
 			);
 		}
 
+		$profile_cache = $this->profile_cache;
+		/**
+		* Event to modify template headlines of the generated profile fields
+		*
+		* @event core.generate_profile_fields_template_headlines
+		* @var	string	restrict_option	Restrict the published fields to a certain profile field option
+		* @var	array	tpl_fields		Array with template data fields
+		* @var	array	profile_cache	A copy of the profile cache to make additional checks
+		* @since 3.1.6-RC1
+		*/
+		$vars = array(
+			'restrict_option',
+			'tpl_fields',
+			'profile_cache',
+		);
+		extract($this->dispatcher->trigger_event('core.generate_profile_fields_template_headlines', compact($vars)));
+
 		return $tpl_fields;
 	}
 
-- 
cgit v1.2.1


From 897b9f333bf2ee05d8c4e371d2b324d255fbfd5e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 20 Aug 2015 10:14:07 +0200
Subject: [ticket/14037] Minor coding style improvements to event

PHPBB3-14037
---
 phpBB/phpbb/profilefields/manager.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/phpbb/profilefields/manager.php')

diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php
index 822b81e0ad..ea4b24af56 100644
--- a/phpBB/phpbb/profilefields/manager.php
+++ b/phpBB/phpbb/profilefields/manager.php
@@ -284,6 +284,7 @@ class manager
 		}
 
 		$profile_cache = $this->profile_cache;
+
 		/**
 		* Event to modify template headlines of the generated profile fields
 		*
@@ -299,6 +300,7 @@ class manager
 			'profile_cache',
 		);
 		extract($this->dispatcher->trigger_event('core.generate_profile_fields_template_headlines', compact($vars)));
+		unset($profile_cache);
 
 		return $tpl_fields;
 	}
-- 
cgit v1.2.1