10 files changed, 182 insertions, 124 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index b0b9fdbd15..958a6456c2 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -20,14 +20,37 @@ if (!defined('IN_PHPBB'))
 */
 class acp_attachments
 {
-	var $u_action;
-	var $new_config;
+	/** @var \phpbb\db\driver\driver */
+	protected $db;
+
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var ContainerBuilder */
+	protected $phpbb_container;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	public $id;
+	public $u_action;
+	protected $new_config;
 
 	function main($id, $mode)
 	{
 		global $db, $user, $auth, $template, $cache, $phpbb_container;
 		global $config, $phpbb_admin_path, $phpbb_root_path, $phpEx;
 
+		$this->id = $id;
+		$this->db = $db;
+		$this->config = $config;
+		$this->template = $template;
+		$this->user = $user;
+		$this->phpbb_container = $phpbb_container;
+
 		$user->add_lang(array('posting', 'viewtopic', 'acp/attachments'));
 
 		$error = $notify = array();
@@ -1082,9 +1105,26 @@ class acp_attachments
 					}
 				}
 
+				if ($action == 'stats')
+				{
+					$this->handle_stats_resync();
+				}
+
+				$stats_error = $this->check_stats_accuracy();
+
+				if ($stats_error)
+				{
+					$error[] = $stats_error;
+
+					// Show option to resync stats
+					$this->template->assign_vars(array(
+						'S_ACTION_OPTIONS'	=>	$auth->acl_get('a_board'),
+					));
+				}
+
 				$template->assign_vars(array(
-					'S_MANAGE'		=> true)
-				);
+					'S_MANAGE'		=> true,
+				));
 
 				$start		= request_var('start', 0);
 
@@ -1107,66 +1147,11 @@ class acp_attachments
 
 				$attachments_per_page = (int) $config['topics_per_page'];
 
-				// Handle files stats resync
-				$action = request_var('action', '');
-				$resync_files_stats = false;
-				if ($action && $action = 'stats')
-				{
-					if (!confirm_box(true))
-					{
-						confirm_box(false, $user->lang['RESYNC_FILES_STATS_CONFIRM'], build_hidden_fields(array(
-							'i'			=> $id,
-							'mode'		=> $mode,
-							'action'	=> $action,
-						)));
-					}
-					else
-					{
-						$resync_files_stats = true;
-						add_log('admin', 'LOG_RESYNC_FILES_STATS');
-					}
-				}
-
-				// Check if files stats are accurate
-				$sql = 'SELECT COUNT(attach_id) as num_files
-					FROM ' . ATTACHMENTS_TABLE . '
-					WHERE is_orphan = 0';
-				$result = $db->sql_query($sql, 600);
-				$num_files_real = (int) $db->sql_fetchfield('num_files');
-				if ($resync_files_stats === true)
-				{
-					set_config('num_files', $num_files_real, true);
-				}
-				$db->sql_freeresult($result);
-
-				$sql = 'SELECT SUM(filesize) as upload_dir_size
-					FROM ' . ATTACHMENTS_TABLE . '
-					WHERE is_orphan = 0';
-				$result = $db->sql_query($sql, 600);
-				$total_size_real = (float) $db->sql_fetchfield('upload_dir_size');
-				if ($resync_files_stats === true)
-				{
-					set_config('upload_dir_size', $total_size_real, true);
-				}
-				$db->sql_freeresult($result);
-
-				// Get current files stats
-				$num_files = (int) $config['num_files'];
-				$total_size = (float) $config['upload_dir_size'];
-
-				// Issue warning message if files stats are inaccurate
-				if (($num_files != $num_files_real) || ($total_size != $total_size_real))
-				{
-					$error[] = $user->lang('FILES_STATS_WRONG', (int) $num_files_real, get_formatted_filesize($total_size_real));
-
-					$template->assign_vars(array(
-						'S_ACTION_OPTIONS'	=> ($auth->acl_get('a_board')) ? true : false,
-						'U_ACTION'			=> $this->u_action,)
-					);
-				}
+				$stats = $this->get_attachment_stats($limit_filetime);
+				$num_files = $stats['num_files'];
+				$total_size = $stats['upload_dir_size'];
 
 				// Make sure $start is set to the last page if it exceeds the amount
-
 				$pagination = $phpbb_container->get('pagination');
 				$start = $pagination->validate_start($start, $attachments_per_page, $num_files);
 
@@ -1283,6 +1268,89 @@ class acp_attachments
 	}
 
 	/**
+	* Get attachment file count and size of upload directory
+	*
+	* @param $limit string	Additional limit for WHERE clause to filter stats by.
+	* @return array Returns array with stats: num_files and upload_dir_size
+	*/
+	public function get_attachment_stats($limit = '')
+	{
+		$sql = 'SELECT COUNT(a.attach_id) AS num_files, SUM(a.filesize) AS upload_dir_size
+			FROM ' . ATTACHMENTS_TABLE . " a
+			WHERE a.is_orphan = 0
+				$limit";
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		return array(
+			'num_files'			=> (int) $row['num_files'],
+			'upload_dir_size'	=> (float) $row['upload_dir_size'],
+		);
+	}
+
+	/**
+	* Set config attachment stat values
+	*
+	* @param $stats array	Array of config key => value pairs to set.	
+	* @return null
+	*/
+	public function set_attachment_stats($stats)
+	{
+		foreach ($stats as $key => $value)
+		{
+			$this->config->set($key, $value, true);
+		}
+	}
+
+	/**
+	* Check accuracy of attachment statistics.
+	*
+	* @param $resync bool	Resync stats if they're incorrect.	
+	* @return bool|string	Returns false if stats are correct or error message
+	*	otherwise.
+	*/
+	public function check_stats_accuracy()
+	{
+		// Get fresh stats.
+		$stats = $this->get_attachment_stats();
+
+		// Get current files stats
+		$num_files = (int) $this->config['num_files'];
+		$total_size = (float) $this->config['upload_dir_size'];	
+
+		if (($num_files != $stats['num_files']) || ($total_size != $stats['upload_dir_size']))
+		{
+			return $this->user->lang('FILES_STATS_WRONG', (int) $stats['num_files'], get_formatted_filesize($stats['upload_dir_size']));
+		}
+		return false;
+	}
+
+	/**
+	* Handle stats resync.
+	*
+	* @return null
+	*/
+	public function handle_stats_resync()
+	{
+		if (!confirm_box(true))
+		{
+			confirm_box(false, $this->user->lang['RESYNC_FILES_STATS_CONFIRM'], build_hidden_fields(array(
+				'i'			=> $this->id,
+				'mode'		=> 'manage',
+				'action'	=> 'stats',
+			)));
+		}
+		else
+		{
+			$this->set_attachment_stats($this->get_attachment_stats());
+			$log = $this->phpbb_container->get('log');
+			$log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_RESYNC_FILES_STATS');
+		}
+
+	}
+
+	/**
 	* Build Select for category items
 	*/
 	function category_select($select_name, $group_id = false, $key = '')
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 3a5298fb58..4d316d84e4 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -386,6 +386,9 @@ class acp_profile
 						'field_show_on_pm'	=> 0,
 						'field_show_on_vt'	=> 0,
 						'field_show_on_ml'	=> 0,
+						'field_is_contact'	=> 0,
+						'field_contact_desc'=> '',
+						'field_contact_url'	=> '',
 						'lang_name'			=> utf8_normalize_nfc(request_var('field_ident', '', true)),
 						'lang_explain'		=> '',
 						'lang_default_value'=> '')
@@ -396,7 +399,7 @@ class acp_profile
 
 				// $exclude contains the data we gather in each step
 				$exclude = array(
-					1	=> array('field_ident', 'lang_name', 'lang_explain', 'field_option_none', 'field_show_on_reg', 'field_show_on_pm', 'field_show_on_vt', 'field_show_on_ml', 'field_required', 'field_show_novalue', 'field_hide', 'field_show_profile', 'field_no_view'),
+					1	=> array('field_ident', 'lang_name', 'lang_explain', 'field_option_none', 'field_show_on_reg', 'field_show_on_pm', 'field_show_on_vt', 'field_show_on_ml', 'field_required', 'field_show_novalue', 'field_hide', 'field_show_profile', 'field_no_view', 'field_is_contact', 'field_contact_desc', 'field_contact_url'),
 					2	=> array('field_length', 'field_maxlen', 'field_minlen', 'field_validation', 'field_novalue', 'field_default_value'),
 					3	=> array('l_lang_name', 'l_lang_explain', 'l_lang_default_value', 'l_lang_options')
 				);
@@ -411,21 +414,24 @@ class acp_profile
 					'field_show_on_ml',
 					'field_show_profile',
 					'field_hide',
+					'field_is_contact',
 				);
 
 				$options = $profile_field->prepare_options_form($exclude, $visibility_ary);
 
 				$cp->vars['field_ident']		= ($action == 'create' && $step == 1) ? utf8_clean_string(request_var('field_ident', $field_row['field_ident'], true)) : request_var('field_ident', $field_row['field_ident']);
-				$cp->vars['lang_name']			= utf8_normalize_nfc(request_var('lang_name', $field_row['lang_name'], true));
-				$cp->vars['lang_explain']		= utf8_normalize_nfc(request_var('lang_explain', $field_row['lang_explain'], true));
-				$cp->vars['lang_default_value']	= utf8_normalize_nfc(request_var('lang_default_value', $field_row['lang_default_value'], true));
+				$cp->vars['lang_name']			= $request->variable('lang_name', $field_row['lang_name'], true);
+				$cp->vars['lang_explain']		= $request->variable('lang_explain', $field_row['lang_explain'], true);
+				$cp->vars['lang_default_value']	= $request->variable('lang_default_value', $field_row['lang_default_value'], true);
+				$cp->vars['field_contact_desc']	= $request->variable('field_contact_desc', $field_row['field_contact_desc'], true);
+				$cp->vars['field_contact_url']	= $request->variable('field_contact_url', $field_row['field_contact_url'], true);
 
 				foreach ($visibility_ary as $val)
 				{
-					$cp->vars[$val] = ($submit || $save) ? request_var($val, 0) : $field_row[$val];
+					$cp->vars[$val] = ($submit || $save) ? $request->variable($val, 0) : $field_row[$val];
 				}
 
-				$cp->vars['field_no_view'] = request_var('field_no_view', (int) $field_row['field_no_view']);
+				$cp->vars['field_no_view'] = $request->variable('field_no_view', (int) $field_row['field_no_view']);
 
 				// If the user has submitted a form with options (i.e. dropdown field)
 				if ($options)
@@ -626,6 +632,9 @@ class acp_profile
 							'S_FIELD_HIDE'		=> ($cp->vars['field_hide']) ? true : false,
 							'S_SHOW_PROFILE'	=> ($cp->vars['field_show_profile']) ? true : false,
 							'S_FIELD_NO_VIEW'	=> ($cp->vars['field_no_view']) ? true : false,
+							'S_FIELD_CONTACT'	=> $cp->vars['field_is_contact'],
+							'FIELD_CONTACT_DESC'=> $cp->vars['field_contact_desc'],
+							'FIELD_CONTACT_URL'	=> $cp->vars['field_contact_url'],
 
 							'L_LANG_SPECIFIC'	=> sprintf($user->lang['LANG_SPECIFIC_OPTIONS'], $config['default_lang']),
 							'FIELD_TYPE'		=> $profile_field->get_name(),
@@ -886,7 +895,10 @@ class acp_profile
 			'field_show_on_ml'		=> $cp->vars['field_show_on_ml'],
 			'field_hide'			=> $cp->vars['field_hide'],
 			'field_show_profile'	=> $cp->vars['field_show_profile'],
-			'field_no_view'			=> $cp->vars['field_no_view']
+			'field_no_view'			=> $cp->vars['field_no_view'],
+			'field_is_contact'		=> $cp->vars['field_is_contact'],
+			'field_contact_desc'	=> $cp->vars['field_contact_desc'],
+			'field_contact_url'		=> $cp->vars['field_contact_url'],
 		);
 
 		if ($action == 'create')
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
index 5d9080b55b..0f9ca9bab3 100644
--- a/phpBB/includes/acp/acp_prune.php
+++ b/phpBB/includes/acp/acp_prune.php
@@ -388,7 +388,6 @@ class acp_prune
 		{
 			$username = request_var('username', '', true);
 			$email = request_var('email', '');
-			$website = request_var('website', '');
 
 			$active_select = request_var('active_select', 'lt');
 			$count_select = request_var('count_select', 'eq');
@@ -438,7 +437,6 @@ class acp_prune
 			$where_sql = '';
 			$where_sql .= ($username) ? ' AND username_clean ' . $db->sql_like_expression(str_replace('*', $db->any_char, utf8_clean_string($username))) : '';
 			$where_sql .= ($email) ? ' AND user_email ' . $db->sql_like_expression(str_replace('*', $db->any_char, $email)) . ' ' : '';
-			$where_sql .= ($website) ? ' AND user_website ' . $db->sql_like_expression(str_replace('*', $db->any_char, $website)) . ' ' : '';
 			$where_sql .= $joined_sql;
 			$where_sql .= ($count) ? " AND user_posts " . $key_match[$count_select] . ' ' . (int) $count . ' ' : '';
 
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 87582dcedb..e5c82d0ca2 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1360,12 +1360,9 @@ class acp_users
 				$user_row['iso_lang_id'] = $row['lang_id'];
 
 				$data = array(
-					'icq'			=> request_var('icq', $user_row['user_icq']),
 					'aim'			=> request_var('aim', $user_row['user_aim']),
-					'msn'			=> request_var('msn', $user_row['user_msnm']),
 					'yim'			=> request_var('yim', $user_row['user_yim']),
 					'jabber'		=> utf8_normalize_nfc(request_var('jabber', $user_row['user_jabber'], true)),
-					'website'		=> request_var('website', $user_row['user_website']),
 					'bday_day'		=> 0,
 					'bday_month'	=> 0,
 					'bday_year'		=> 0,
@@ -1385,18 +1382,11 @@ class acp_users
 				if ($submit)
 				{
 					$error = validate_data($data, array(
-						'icq'			=> array(
-							array('string', true, 3, 15),
-							array('match', true, '#^[0-9]+$#i')),
 						'aim'			=> array('string', true, 3, 255),
-						'msn'			=> array('string', true, 5, 255),
 						'jabber'		=> array(
 							array('string', true, 5, 255),
 							array('jabber')),
 						'yim'			=> array('string', true, 5, 255),
-						'website'		=> array(
-							array('string', true, 12, 255),
-							array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
 						'bday_day'		=> array('num', true, 1, 31),
 						'bday_month'	=> array('num', true, 1, 12),
 						'bday_year'		=> array('num', true, 1901, gmdate('Y', time())),
@@ -1418,12 +1408,9 @@ class acp_users
 					if (!sizeof($error))
 					{
 						$sql_ary = array(
-							'user_icq'		=> $data['icq'],
 							'user_aim'		=> $data['aim'],
-							'user_msnm'		=> $data['msn'],
 							'user_yim'		=> $data['yim'],
 							'user_jabber'	=> $data['jabber'],
-							'user_website'	=> $data['website'],
 							'user_birthday'	=> $data['user_birthday'],
 						);
 
@@ -1467,12 +1454,9 @@ class acp_users
 				unset($now);
 
 				$template->assign_vars(array(
-					'ICQ'			=> $data['icq'],
 					'YIM'			=> $data['yim'],
 					'AIM'			=> $data['aim'],
-					'MSN'			=> $data['msn'],
 					'JABBER'		=> $data['jabber'],
-					'WEBSITE'		=> $data['website'],
 
 					'S_BIRTHDAY_DAY_OPTIONS'	=> $s_birthday_day_options,
 					'S_BIRTHDAY_MONTH_OPTIONS'	=> $s_birthday_month_options,
diff --git a/phpBB/includes/db/schema_data.php b/phpBB/includes/db/schema_data.php
index 9d7153f6b6..04a4ce0d9c 100644
--- a/phpBB/includes/db/schema_data.php
+++ b/phpBB/includes/db/schema_data.php
@@ -777,6 +777,9 @@ $schema_data['phpbb_profile_fields'] = array(
 		'field_no_view'			=> array('BOOL', 0),
 		'field_active'			=> array('BOOL', 0),
 		'field_order'			=> array('UINT', 0),
+		'field_is_contact'		=> array('BOOL', 0),
+		'field_contact_desc'	=> array('VCHAR', ''),
+		'field_contact_url'		=> array('VCHAR', ''),
 	),
 	'PRIMARY_KEY'	=> 'field_id',
 	'KEYS'			=> array(
@@ -791,6 +794,9 @@ $schema_data['phpbb_profile_fields_data'] = array(
 		'pf_phpbb_location'		=> array('VCHAR', ''),
 		'pf_phpbb_interests'	=> array('TEXT_UNI', ''),
 		'pf_phpbb_occupation'	=> array('TEXT_UNI', ''),
+		'pf_phpbb_icq'			=> array('VCHAR', ''),
+		'pf_phpbb_wlm'			=> array('VCHAR', ''),
+		'pf_phpbb_website'		=> array('VCHAR', ''),
 	),
 	'PRIMARY_KEY'	=> 'user_id',
 );
@@ -1119,6 +1125,8 @@ $schema_data['phpbb_users'] = array(
 		'user_password'				=> array('VCHAR_UNI', ''),
 		'user_passchg'				=> array('TIMESTAMP', 0),
 		'user_pass_convert'			=> array('BOOL', 0),
+		'user_actkey'				=> array('VCHAR:32', ''),
+		'user_newpasswd'			=> array('VCHAR_UNI', ''),
 		'user_email'				=> array('VCHAR_UNI:100', ''),
 		'user_email_hash'			=> array('BINT', 0),
 		'user_birthday'				=> array('VCHAR:10', ''),
@@ -1167,14 +1175,9 @@ $schema_data['phpbb_users'] = array(
 		'user_sig'					=> array('MTEXT_UNI', ''),
 		'user_sig_bbcode_uid'		=> array('VCHAR:8', ''),
 		'user_sig_bbcode_bitfield'	=> array('VCHAR:255', ''),
-		'user_icq'					=> array('VCHAR:15', ''),
 		'user_aim'					=> array('VCHAR_UNI', ''),
 		'user_yim'					=> array('VCHAR_UNI', ''),
-		'user_msnm'					=> array('VCHAR_UNI', ''),
 		'user_jabber'				=> array('VCHAR_UNI', ''),
-		'user_website'				=> array('VCHAR_UNI:200', ''),
-		'user_actkey'				=> array('VCHAR:32', ''),
-		'user_newpasswd'			=> array('VCHAR_UNI:40', ''),
 		'user_form_salt'			=> array('VCHAR_UNI:32', ''),
 		'user_new'					=> array('BOOL', 1),
 		'user_reminded'				=> array('TINT:4', 0),
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php
index e7a1d2bff5..c895f7b54b 100644
--- a/phpBB/includes/functions_download.php
+++ b/phpBB/includes/functions_download.php
@@ -625,17 +625,29 @@ function phpbb_increment_downloads($db, $ids)
 */
 function phpbb_download_handle_forum_auth($db, $auth, $topic_id)
 {
-	$sql = 'SELECT t.forum_id, f.forum_name, f.forum_password, f.parent_id
-		FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
-		WHERE t.topic_id = " . (int) $topic_id . "
-			AND t.forum_id = f.forum_id";
+	$sql_array = array(
+		'SELECT'	=> 't.topic_visibility, t.forum_id, f.forum_name, f.forum_password, f.parent_id',
+		'FROM'		=> array(
+			TOPICS_TABLE => 't',
+			FORUMS_TABLE => 'f',
+		),
+		'WHERE'	=> 't.topic_id = ' . (int) $topic_id . '
+			AND t.forum_id = f.forum_id',
+	);
+
+	$sql = $db->sql_build_query('SELECT', $sql_array);
 	$result = $db->sql_query($sql);
 	$row = $db->sql_fetchrow($result);
 	$db->sql_freeresult($result);
 
-	if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']))
+	if ($row && $row['topic_visibility'] != ITEM_APPROVED && !$auth->acl_get('m_approve', $row['forum_id']))
 	{
-		if ($row && $row['forum_password'])
+		send_status_line(404, 'Not Found');
+		trigger_error('ERROR_NO_ATTACHMENT');
+	}
+	else if ($row && $auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']))
+	{
+		if ($row['forum_password'])
 		{
 			// Do something else ... ?
 			login_forum_box($row);
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index a2a79e032f..17d67b4a23 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1561,7 +1561,7 @@ function get_folder_status($folder_id, $folder)
 		'percent'		=> ($user->data['message_limit']) ? (($user->data['message_limit'] > 0) ? round(($folder['num_messages'] / $user->data['message_limit']) * 100) : 100) : 0,
 	);
 
-	$return['message']	= $user->lang('FOLDER_STATUS_MSG', (int) $return['max'], $return['cur'], $return['percent']);
+	$return['message']	= $user->lang('FOLDER_STATUS_MSG', $user->lang('MESSAGES_COUNT', (int) $return['max']), $return['cur'], $return['percent']);
 
 	return $return;
 }
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php
index bf7334b307..26ce6ed28f 100644
--- a/phpBB/includes/ucp/ucp_pm_options.php
+++ b/phpBB/includes/ucp/ucp_pm_options.php
@@ -230,7 +230,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 					// Something went wrong, only partially moved?
 					if ($num_moved != $folder_row['pm_count'])
 					{
-						trigger_error($user->lang('MOVE_PM_ERROR', (int) $folder_row['pm_count'], $num_moved));
+						trigger_error($user->lang('MOVE_PM_ERROR', $user->lang('MESSAGES_COUNT', (int) $folder_row['pm_count']), $num_moved));
 					}
 				break;
 
@@ -421,7 +421,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 	
 	$folder[PRIVMSGS_INBOX] = array(
 		'folder_name'		=> $user->lang['PM_INBOX'],
-		'message_status'	=> $user->lang('FOLDER_MESSAGE_STATUS', (int) $user->data['message_limit'], $num_messages),
+		'message_status'	=> $user->lang('FOLDER_MESSAGE_STATUS', $user->lang('MESSAGES_COUNT', (int) $user->data['message_limit']), $num_messages),
 	);
 
 	$sql = 'SELECT folder_id, folder_name, pm_count
@@ -435,7 +435,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 		$num_user_folder++;
 		$folder[$row['folder_id']] = array(
 			'folder_name'		=> $row['folder_name'],
-			'message_status'	=> $user->lang('FOLDER_MESSAGE_STATUS', (int) $user->data['message_limit'], $row['pm_count']),
+			'message_status'	=> $user->lang('FOLDER_MESSAGE_STATUS', $user->lang('MESSAGES_COUNT', (int) $user->data['message_limit']), (int) $row['pm_count']),
 		);
 	}
 	$db->sql_freeresult($result);
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index f9e8e3155e..594415ffc0 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -63,7 +63,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	{
 		$cp = $phpbb_container->get('profilefields.manager');
 
-		$profile_fields = $cp->generate_profile_fields_template('grab', $author_id);
+		$profile_fields = $cp->grab_profile_fields_data($author_id);
 	}
 
 	// Assign TO/BCC Addresses to template
@@ -173,7 +173,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 
 		if (isset($profile_fields[$author_id]))
 		{
-			$cp_row = $cp->generate_profile_fields_template('show', false, $profile_fields[$author_id]);
+			$cp_row = $cp->generate_profile_fields_template_data($profile_fields[$author_id]);
 		}
 	}
 
@@ -209,11 +209,8 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		'MESSAGE_ID'		=> $message_row['msg_id'],
 
 		'U_PM'			=> ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;u=' . $author_id) : '',
-		'U_WWW'			=> (!empty($user_info['user_website'])) ? $user_info['user_website'] : '',
-		'U_ICQ'			=> ($user_info['user_icq']) ? 'http://www.icq.com/people/' . urlencode($user_info['user_icq']) . '/' : '',
 		'U_AIM'			=> ($user_info['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $author_id) : '',
 		'U_YIM'			=> ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($user_info['user_yim']) . '&amp;.src=pg' : '',
-		'U_MSN'			=> ($user_info['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $author_id) : '',
 		'U_JABBER'		=> ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $author_id) : '',
 
 		'U_DELETE'			=> ($auth->acl_get('u_pm_delete')) ? "$url&amp;mode=compose&amp;action=delete&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',
@@ -274,7 +271,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	// Display not already displayed Attachments for this post, we already parsed them. ;)
 	if (isset($attachments) && sizeof($attachments))
 	{
-		$methods = phpbb_gen_download_links('post_msg_id', $msg_id, $phpbb_root_path, $phpEx);
+		$methods = phpbb_gen_download_links('msg_id', $msg_id, $phpbb_root_path, $phpEx);
 		foreach ($methods as $method)
 		{
 			$template->assign_block_vars('dl_method', $method);
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 8def48b1b4..9821ad8485 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -264,12 +264,9 @@ class ucp_profile
 				$cp_data = $cp_error = array();
 
 				$data = array(
-					'icq'			=> request_var('icq', $user->data['user_icq']),
 					'aim'			=> request_var('aim', $user->data['user_aim']),
-					'msn'			=> request_var('msn', $user->data['user_msnm']),
 					'yim'			=> request_var('yim', $user->data['user_yim']),
 					'jabber'		=> utf8_normalize_nfc(request_var('jabber', $user->data['user_jabber'], true)),
-					'website'		=> request_var('website', $user->data['user_website']),
 				);
 
 				if ($config['allow_birthdays'])
@@ -292,18 +289,11 @@ class ucp_profile
 				if ($submit)
 				{
 					$validate_array = array(
-						'icq'			=> array(
-							array('string', true, 3, 15),
-							array('match', true, '#^[0-9]+$#i')),
 						'aim'			=> array('string', true, 3, 255),
-						'msn'			=> array('string', true, 5, 255),
 						'jabber'		=> array(
 							array('string', true, 5, 255),
 							array('jabber')),
 						'yim'			=> array('string', true, 5, 255),
-						'website'		=> array(
-							array('string', true, 12, 255),
-							array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
 					);
 
 					if ($config['allow_birthdays'])
@@ -343,12 +333,9 @@ class ucp_profile
 						}
 
 						$sql_ary = array(
-							'user_icq'		=> $data['icq'],
 							'user_aim'		=> $data['aim'],
-							'user_msnm'		=> $data['msn'],
 							'user_yim'		=> $data['yim'],
 							'user_jabber'	=> $data['jabber'],
-							'user_website'	=> $data['website'],
 							'user_notify_type'	=> $data['notify'],
 						);
 
@@ -411,12 +398,9 @@ class ucp_profile
 				$template->assign_vars(array(
 					'ERROR'		=> (sizeof($error)) ? implode('<br />', $error) : '',
 
-					'ICQ'		=> $data['icq'],
 					'YIM'		=> $data['yim'],
 					'AIM'		=> $data['aim'],
-					'MSN'		=> $data['msn'],
 					'JABBER'	=> $data['jabber'],
-					'WEBSITE'	=> $data['website'],
 				));
 
 				// Get additional profile fields and assign them to the template block var 'profile_fields'