16 files changed, 583 insertions, 628 deletions
diff --git a/phpBB/modules/ucp/ucp_activate.php b/phpBB/modules/ucp/ucp_activate.php
index 7fd265ecf4..967deb6740 100644
--- a/phpBB/modules/ucp/ucp_activate.php
+++ b/phpBB/modules/ucp/ucp_activate.php
@@ -27,8 +27,6 @@ class ucp_activate
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template;
-
 		$user_id = request_var('u', 0);
 		$key = request_var('k', '');
 
@@ -96,9 +94,9 @@ class ucp_activate
 			$messenger->to($user_row['user_email'], $user_row['username']);
 
 			$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-			$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-			$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-			$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+			$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
+			$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
+			$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
 
 			$messenger->assign_vars(array(
 				'USERNAME'	=> htmlspecialchars_decode($user_row['username']))
@@ -121,7 +119,7 @@ class ucp_activate
 		}
 
 		meta_refresh(3, append_sid('index'));
-		trigger_error($user->lang[$message]);
+		trigger_error(phpbb::$user->lang[$message]);
 	}
 }
 
diff --git a/phpBB/modules/ucp/ucp_attachments.php b/phpBB/modules/ucp/ucp_attachments.php
index 0ccc6afba8..97d0e630f9 100644
--- a/phpBB/modules/ucp/ucp_attachments.php
+++ b/phpBB/modules/ucp/ucp_attachments.php
@@ -27,8 +27,6 @@ class ucp_attachments
 
 	function main($id, $mode)
 	{
-		global $template, $user, $db;
-
 		$start		= request_var('start', 0);
 		$sort_key	= request_var('sk', 'a');
 		$sort_dir	= request_var('sd', 'a');
@@ -42,7 +40,7 @@ class ucp_attachments
 			// Validate $delete_ids...
 			$sql = 'SELECT attach_id
 				FROM ' . ATTACHMENTS_TABLE . '
-				WHERE poster_id = ' . $user->data['user_id'] . '
+				WHERE poster_id = ' . phpbb::$user->data['user_id'] . '
 					AND is_orphan = 0
 					AND ' . $db->sql_in_set('attach_id', $delete_ids);
 			$result = $db->sql_query($sql);
@@ -76,7 +74,7 @@ class ucp_attachments
 				delete_attachments('attach', $delete_ids);
 
 				meta_refresh(3, $this->u_action);
-				$message = ((sizeof($delete_ids) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']) . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+				$message = ((sizeof($delete_ids) == 1) ? phpbb::$user->lang['ATTACHMENT_DELETED'] : phpbb::$user->lang['ATTACHMENTS_DELETED']) . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 				trigger_error($message);
 			}
 			else
@@ -86,10 +84,10 @@ class ucp_attachments
 		}
 
 		// Select box eventually
-		$sort_key_text = array('a' => $user->lang['SORT_FILENAME'], 'b' => $user->lang['SORT_COMMENT'], 'c' => $user->lang['SORT_EXTENSION'], 'd' => $user->lang['SORT_SIZE'], 'e' => $user->lang['SORT_DOWNLOADS'], 'f' => $user->lang['SORT_POST_TIME'], 'g' => $user->lang['SORT_TOPIC_TITLE']);
+		$sort_key_text = array('a' => phpbb::$user->lang['SORT_FILENAME'], 'b' => phpbb::$user->lang['SORT_COMMENT'], 'c' => phpbb::$user->lang['SORT_EXTENSION'], 'd' => phpbb::$user->lang['SORT_SIZE'], 'e' => phpbb::$user->lang['SORT_DOWNLOADS'], 'f' => phpbb::$user->lang['SORT_POST_TIME'], 'g' => phpbb::$user->lang['SORT_TOPIC_TITLE']);
 		$sort_key_sql = array('a' => 'a.real_filename', 'b' => 'a.attach_comment', 'c' => 'a.extension', 'd' => 'a.filesize', 'e' => 'a.download_count', 'f' => 'a.filetime', 'g' => 't.topic_title');
 
-		$sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']);
+		$sort_dir_text = array('a' => phpbb::$user->lang['ASCENDING'], 'd' => phpbb::$user->lang['DESCENDING']);
 
 		$s_sort_key = '';
 		foreach ($sort_key_text as $key => $value)
@@ -114,7 +112,7 @@ class ucp_attachments
 
 		$sql = 'SELECT COUNT(attach_id) as num_attachments
 			FROM ' . ATTACHMENTS_TABLE . '
-			WHERE poster_id = ' . $user->data['user_id'] . '
+			WHERE poster_id = ' . phpbb::$user->data['user_id'] . '
 				AND is_orphan = 0';
 		$result = $db->sql_query($sql);
 		$num_attachments = $db->sql_fetchfield('num_attachments');
@@ -124,7 +122,7 @@ class ucp_attachments
 			FROM ' . ATTACHMENTS_TABLE . ' a
 				LEFT JOIN ' . TOPICS_TABLE . ' t ON (a.topic_id = t.topic_id AND a.in_message = 0)
 				LEFT JOIN ' . PRIVMSGS_TABLE . ' p ON (a.post_msg_id = p.msg_id AND a.in_message = 1)
-			WHERE a.poster_id = ' . $user->data['user_id'] . "
+			WHERE a.poster_id = ' . phpbb::$user->data['user_id'] . "
 				AND a.is_orphan = 0
 			ORDER BY $order_by";
 		$result = $db->sql_query_limit($sql, phpbb::$config['topics_per_page'], $start);
@@ -152,7 +150,7 @@ class ucp_attachments
 					'EXTENSION'			=> $row['extension'],
 					'SIZE'				=> get_formatted_filesize($row['filesize']),
 					'DOWNLOAD_COUNT'	=> $row['download_count'],
-					'POST_TIME'			=> $user->format_date($row['filetime']),
+					'POST_TIME'			=> phpbb::$user->format_date($row['filetime']),
 					'TOPIC_TITLE'		=> ($row['in_message']) ? $row['message_title'] : $row['topic_title'],
 
 					'ATTACH_ID'			=> $row['attach_id'],
@@ -176,7 +174,7 @@ class ucp_attachments
 			'PAGINATION'			=> generate_pagination($this->u_action . "&amp;sk=$sort_key&amp;sd=$sort_dir", $num_attachments, phpbb::$config['topics_per_page'], $start),
 			'TOTAL_ATTACHMENTS'		=> $num_attachments,
 
-			'L_TITLE'				=> $user->lang['UCP_ATTACHMENTS'],
+			'L_TITLE'				=> phpbb::$user->lang['UCP_ATTACHMENTS'],
 
 			'U_SORT_FILENAME'		=> $this->u_action . "&amp;sk=a&amp;sd=" . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a'),
 			'U_SORT_FILE_COMMENT'	=> $this->u_action . "&amp;sk=b&amp;sd=" . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a'),
diff --git a/phpBB/modules/ucp/ucp_confirm.php b/phpBB/modules/ucp/ucp_confirm.php
index d8e4a06b60..321d07ad14 100644
--- a/phpBB/modules/ucp/ucp_confirm.php
+++ b/phpBB/modules/ucp/ucp_confirm.php
@@ -35,7 +35,6 @@ class ucp_confirm
 
 	function main($id, $mode)
 	{
-		global $db, $user;
 		include(PHPBB_ROOT_PATH . 'includes/captcha/captcha_factory.' . PHP_EXT);
 		$captcha = phpbb_captcha_factory::get_instance(phpbb::$config['captcha_plugin']);
 		$captcha->init(request_var('type', 0));
diff --git a/phpBB/modules/ucp/ucp_groups.php b/phpBB/modules/ucp/ucp_groups.php
index c605fe00c1..3935ac86c2 100644
--- a/phpBB/modules/ucp/ucp_groups.php
+++ b/phpBB/modules/ucp/ucp_groups.php
@@ -26,11 +26,9 @@ class ucp_groups
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template;
+		phpbb::$user->add_lang('groups');
 
-		$user->add_lang('groups');
-
-		$return_page = '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '">', '</a>');
+		$return_page = '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '">', '</a>');
 
 		$mark_ary	= request_var('mark', array(0));
 		$submit		= phpbb_request::variable('submit', false, false, phpbb_request::POST);
@@ -54,14 +52,14 @@ class ucp_groups
 					}
 
 					$sql = 'SELECT group_id, group_name, group_type
-						FROM ' . GROUPS_TABLE . "
-						WHERE group_id IN ($group_id, {$user->data['group_id']})";
+						FROM ' . GROUPS_TABLE . '
+						WHERE group_id IN (' . $group_id . ', ' . phpbb::$user->data['group_id'] . ')';
 					$result = $db->sql_query($sql);
 
 					$group_row = array();
 					while ($row = $db->sql_fetchrow($result))
 					{
-						$row['group_name'] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'];
+						$row['group_name'] = ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'];
 						$group_row[$row['group_id']] = $row;
 					}
 					$db->sql_freeresult($result);
@@ -75,30 +73,30 @@ class ucp_groups
 					{
 						case 'change_default':
 							// User already having this group set as default?
-							if ($group_id == $user->data['group_id'])
+							if ($group_id == phpbb::$user->data['group_id'])
 							{
-								trigger_error($user->lang['ALREADY_DEFAULT_GROUP'] . $return_page);
+								trigger_error(phpbb::$user->lang['ALREADY_DEFAULT_GROUP'] . $return_page);
 							}
 
 							if (!$auth->acl_get('u_chggrp'))
 							{
-								trigger_error($user->lang['NOT_AUTHORISED'] . $return_page);
+								trigger_error(phpbb::$user->lang['NOT_AUTHORISED'] . $return_page);
 							}
 
 							// User needs to be member of the group in order to make it default
-							if (!group_memberships($group_id, $user->data['user_id'], true))
+							if (!group_memberships($group_id, phpbb::$user->data['user_id'], true))
 							{
-								trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
+								trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
 							}
 
 							if (confirm_box(true))
 							{
-								group_user_attributes('default', $group_id, $user->data['user_id']);
+								group_user_attributes('default', $group_id, phpbb::$user->data['user_id']);
 
-								add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_CHANGE', sprintf($user->lang['USER_GROUP_CHANGE'], $group_row[$user->data['group_id']]['group_name'], $group_row[$group_id]['group_name']));
+								add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_GROUP_CHANGE', sprintf(phpbb::$user->lang['USER_GROUP_CHANGE'], $group_row[phpbb::$user->data['group_id']]['group_name'], $group_row[$group_id]['group_name']));
 
 								meta_refresh(3, $this->u_action);
-								trigger_error($user->lang['CHANGED_DEFAULT_GROUP'] . $return_page);
+								trigger_error(phpbb::$user->lang['CHANGED_DEFAULT_GROUP'] . $return_page);
 							}
 							else
 							{
@@ -107,7 +105,7 @@ class ucp_groups
 									'change_default'=> true
 								);
 
-								confirm_box(false, sprintf($user->lang['GROUP_CHANGE_DEFAULT'], $group_row[$group_id]['group_name']), build_hidden_fields($s_hidden_fields));
+								confirm_box(false, sprintf(phpbb::$user->lang['GROUP_CHANGE_DEFAULT'], $group_row[$group_id]['group_name']), build_hidden_fields($s_hidden_fields));
 							}
 
 						break;
@@ -115,14 +113,14 @@ class ucp_groups
 						case 'resign':
 
 							// User tries to resign from default group but is not allowed to change it?
-							if ($group_id == $user->data['group_id'] && !$auth->acl_get('u_chggrp'))
+							if ($group_id == phpbb::$user->data['group_id'] && !$auth->acl_get('u_chggrp'))
 							{
-								trigger_error($user->lang['NOT_RESIGN_FROM_DEFAULT_GROUP'] . $return_page);
+								trigger_error(phpbb::$user->lang['NOT_RESIGN_FROM_DEFAULT_GROUP'] . $return_page);
 							}
 
-							if (!($row = group_memberships($group_id, $user->data['user_id'])))
+							if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
 							{
-								trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
+								trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
 							}
 							list(, $row) = each($row);
 
@@ -135,17 +133,17 @@ class ucp_groups
 
 							if ($group_type != GROUP_OPEN && $group_type != GROUP_FREE)
 							{
-								trigger_error($user->lang['CANNOT_RESIGN_GROUP'] . $return_page);
+								trigger_error(phpbb::$user->lang['CANNOT_RESIGN_GROUP'] . $return_page);
 							}
 
 							if (confirm_box(true))
 							{
-								group_user_del($group_id, $user->data['user_id']);
+								group_user_del($group_id, phpbb::$user->data['user_id']);
 
-								add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_RESIGN', $group_row[$group_id]['group_name']);
+								add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_GROUP_RESIGN', $group_row[$group_id]['group_name']);
 
 								meta_refresh(3, $this->u_action);
-								trigger_error($user->lang[($row['user_pending']) ? 'GROUP_RESIGNED_PENDING' : 'GROUP_RESIGNED_MEMBERSHIP'] . $return_page);
+								trigger_error(phpbb::$user->lang[($row['user_pending']) ? 'GROUP_RESIGNED_PENDING' : 'GROUP_RESIGNED_MEMBERSHIP'] . $return_page);
 							}
 							else
 							{
@@ -166,7 +164,7 @@ class ucp_groups
 								FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u
 								WHERE ug.user_id = u.user_id
 									AND ug.group_id = ' . $group_id . '
-									AND ug.user_id = ' . $user->data['user_id'];
+									AND ug.user_id = ' . phpbb::$user->data['user_id'];
 							$result = $db->sql_query($sql);
 							$row = $db->sql_fetchrow($result);
 							$db->sql_freeresult($result);
@@ -175,29 +173,29 @@ class ucp_groups
 							{
 								if ($row['user_pending'])
 								{
-									trigger_error($user->lang['ALREADY_IN_GROUP_PENDING'] . $return_page);
+									trigger_error(phpbb::$user->lang['ALREADY_IN_GROUP_PENDING'] . $return_page);
 								}
 
-								trigger_error($user->lang['ALREADY_IN_GROUP'] . $return_page);
+								trigger_error(phpbb::$user->lang['ALREADY_IN_GROUP'] . $return_page);
 							}
 
 							// Check permission to join (open group or request)
 							if ($group_row[$group_id]['group_type'] != GROUP_OPEN && $group_row[$group_id]['group_type'] != GROUP_FREE)
 							{
-								trigger_error($user->lang['CANNOT_JOIN_GROUP'] . $return_page);
+								trigger_error(phpbb::$user->lang['CANNOT_JOIN_GROUP'] . $return_page);
 							}
 
 							if (confirm_box(true))
 							{
 								if ($group_row[$group_id]['group_type'] == GROUP_FREE)
 								{
-									group_user_add($group_id, $user->data['user_id']);
+									group_user_add($group_id, phpbb::$user->data['user_id']);
 
 									$email_template = 'group_added';
 								}
 								else
 								{
-									group_user_add($group_id, $user->data['user_id'], false, false, false, 0, 1);
+									group_user_add($group_id, phpbb::$user->data['user_id'], false, false, false, 0, 1);
 
 									$email_template = 'group_request';
 								}
@@ -208,7 +206,7 @@ class ucp_groups
 								$sql = 'SELECT u.username, u.username_clean, u.user_email, u.user_notify_type, u.user_jabber, u.user_lang
 									FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u
 									WHERE ug.user_id = u.user_id
-										AND ' . (($group_row[$group_id]['group_type'] == GROUP_FREE) ? "ug.user_id = {$user->data['user_id']}" : 'ug.group_leader = 1') . "
+										AND ' . (($group_row[$group_id]['group_type'] == GROUP_FREE) ? 'ug.user_id = ' . phpbb::$user->data['user_id'] : 'ug.group_leader = 1') . "
 										AND ug.group_id = $group_id";
 								$result = $db->sql_query($sql);
 
@@ -222,7 +220,7 @@ class ucp_groups
 									$messenger->assign_vars(array(
 										'USERNAME'			=> htmlspecialchars_decode($row['username']),
 										'GROUP_NAME'		=> htmlspecialchars_decode($group_row[$group_id]['group_name']),
-										'REQUEST_USERNAME'	=> $user->data['username'],
+										'REQUEST_USERNAME'	=> phpbb::$user->data['username'],
 
 										'U_PENDING'		=> generate_board_url() . '/ucp.' . PHP_EXT . "?i=groups&mode=manage&action=list&g=$group_id",
 										'U_GROUP'		=> generate_board_url() . '/memberlist.' . PHP_EXT . "?mode=group&g=$group_id")
@@ -234,10 +232,10 @@ class ucp_groups
 
 								$messenger->save_queue();
 
-								add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_JOIN' . (($group_row[$group_id]['group_type'] == GROUP_FREE) ? '' : '_PENDING'), $group_row[$group_id]['group_name']);
+								add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_GROUP_JOIN' . (($group_row[$group_id]['group_type'] == GROUP_FREE) ? '' : '_PENDING'), $group_row[$group_id]['group_name']);
 
 								meta_refresh(3, $this->u_action);
-								trigger_error($user->lang[($group_row[$group_id]['group_type'] == GROUP_FREE) ? 'GROUP_JOINED' : 'GROUP_JOINED_PENDING'] . $return_page);
+								trigger_error(phpbb::$user->lang[($group_row[$group_id]['group_type'] == GROUP_FREE) ? 'GROUP_JOINED' : 'GROUP_JOINED_PENDING'] . $return_page);
 							}
 							else
 							{
@@ -254,25 +252,25 @@ class ucp_groups
 
 						case 'demote':
 
-							if (!($row = group_memberships($group_id, $user->data['user_id'])))
+							if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
 							{
-								trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
+								trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
 							}
 							list(, $row) = each($row);
 
 							if (!$row['group_leader'])
 							{
-								trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
+								trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
 							}
 
 							if (confirm_box(true))
 							{
-								group_user_attributes('demote', $group_id, $user->data['user_id']);
+								group_user_attributes('demote', $group_id, phpbb::$user->data['user_id']);
 
-								add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_DEMOTE', $group_row[$group_id]['group_name']);
+								add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_GROUP_DEMOTE', $group_row[$group_id]['group_name']);
 
 								meta_refresh(3, $this->u_action);
-								trigger_error($user->lang['USER_GROUP_DEMOTED'] . $return_page);
+								trigger_error(phpbb::$user->lang['USER_GROUP_DEMOTED'] . $return_page);
 							}
 							else
 							{
@@ -291,7 +289,7 @@ class ucp_groups
 
 				$sql = 'SELECT g.*, ug.group_leader, ug.user_pending
 					FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
-					WHERE ug.user_id = ' . $user->data['user_id'] . '
+					WHERE ug.user_id = ' . phpbb::$user->data['user_id'] . '
 						AND g.group_id = ug.group_id
 					ORDER BY g.group_type DESC, g.group_name';
 				$result = $db->sql_query($sql);
@@ -327,15 +325,15 @@ class ucp_groups
 
 					$template->assign_block_vars($block, array(
 						'GROUP_ID'		=> $row['group_id'],
-						'GROUP_NAME'	=> ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'],
-						'GROUP_DESC'	=> ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : $user->lang['GROUP_IS_SPECIAL'],
+						'GROUP_NAME'	=> ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'],
+						'GROUP_DESC'	=> ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : phpbb::$user->lang['GROUP_IS_SPECIAL'],
 						'GROUP_SPECIAL'	=> ($row['group_type'] <> GROUP_SPECIAL) ? false : true,
-						'GROUP_STATUS'	=> $user->lang['GROUP_IS_' . $group_status],
+						'GROUP_STATUS'	=> phpbb::$user->lang['GROUP_IS_' . $group_status],
 						'GROUP_COLOUR'	=> $row['group_colour'],
 
 						'U_VIEW_GROUP'	=> append_sid('memberlist', 'mode=group&amp;g=' . $row['group_id']),
 
-						'S_GROUP_DEFAULT'	=> ($row['group_id'] == $user->data['group_id']) ? true : false)
+						'S_GROUP_DEFAULT'	=> ($row['group_id'] == phpbb::$user->data['group_id']) ? true : false)
 					);
 
 					$group_id_ary[] = $row['group_id'];
@@ -379,11 +377,11 @@ class ucp_groups
 
 					$template->assign_block_vars('nonmember', array(
 						'GROUP_ID'		=> $row['group_id'],
-						'GROUP_NAME'	=> ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'],
-						'GROUP_DESC'	=> ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : $user->lang['GROUP_IS_SPECIAL'],
+						'GROUP_NAME'	=> ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'],
+						'GROUP_DESC'	=> ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : phpbb::$user->lang['GROUP_IS_SPECIAL'],
 						'GROUP_SPECIAL'	=> ($row['group_type'] <> GROUP_SPECIAL) ? false : true,
 						'GROUP_CLOSED'	=> ($row['group_type'] <> GROUP_CLOSED || $auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? false : true,
-						'GROUP_STATUS'	=> $user->lang['GROUP_IS_' . $group_status],
+						'GROUP_STATUS'	=> phpbb::$user->lang['GROUP_IS_' . $group_status],
 						'S_CAN_JOIN'	=> ($row['group_type'] == GROUP_OPEN || $row['group_type'] == GROUP_FREE) ? true : false,
 						'GROUP_COLOUR'	=> $row['group_colour'],
 
@@ -425,13 +423,13 @@ class ucp_groups
 
 					if (!$group_row)
 					{
-						trigger_error($user->lang['NO_GROUP'] . $return_page);
+						trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
 					}
 
 					// Check if the user is allowed to manage this group if set to founder only.
 					if (!phpbb::$user->is_founder && $group_row['group_founder_manage'])
 					{
-						trigger_error($user->lang['NOT_ALLOWED_MANAGE_GROUP'] . $return_page, E_USER_WARNING);
+						trigger_error(phpbb::$user->lang['NOT_ALLOWED_MANAGE_GROUP'] . $return_page, E_USER_WARNING);
 					}
 
 					$group_name = $group_row['group_name'];
@@ -440,7 +438,7 @@ class ucp_groups
 					$avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : '<img src="' . PHPBB_ROOT_PATH . phpbb::$base_config['admin_folder'] . '/images/no_avatar.gif" alt="" />';
 
 					$template->assign_vars(array(
-						'GROUP_NAME'			=> ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name,
+						'GROUP_NAME'			=> ($group_type == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_name] : $group_name,
 						'GROUP_INTERNAL_NAME'	=> $group_name,
 						'GROUP_COLOUR'			=> (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '',
 						'GROUP_DESC_DISP'		=> generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']),
@@ -459,22 +457,22 @@ class ucp_groups
 
 						if (!$group_id)
 						{
-							trigger_error($user->lang['NO_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
 						}
 
-						if (!($row = group_memberships($group_id, $user->data['user_id'])))
+						if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
 						{
-							trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
 						}
 						list(, $row) = each($row);
 
 						if (!$row['group_leader'])
 						{
-							trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
 						}
 
 						$file_uploads = (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false;
-						$user->add_lang(array('acp/groups', 'acp/common'));
+						phpbb::$user->add_lang(array('acp/groups', 'acp/common'));
 
 						$data = $submit_ary = array();
 
@@ -559,7 +557,7 @@ class ucp_groups
 								{
 									if ($data['width'] > phpbb::$config['avatar_max_width'] || $data['height'] > phpbb::$config['avatar_max_height'])
 									{
-										$error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], $data['width'], $data['height']);
+										$error[] = sprintf(phpbb::$user->lang['AVATAR_WRONG_SIZE'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], $data['width'], $data['height']);
 									}
 								}
 
@@ -569,7 +567,7 @@ class ucp_groups
 									{
 										if ($data['width'] < phpbb::$config['avatar_min_width'] || $data['height'] < phpbb::$config['avatar_min_height'])
 										{
-											$error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], $data['width'], $data['height']);
+											$error[] = sprintf(phpbb::$user->lang['AVATAR_WRONG_SIZE'], phpbb::$config['avatar_min_width'], phpbb::$config['avatar_min_height'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], $data['width'], $data['height']);
 										}
 									}
 								}
@@ -591,7 +589,7 @@ class ucp_groups
 
 							if (!check_form_key('ucp_groups'))
 							{
-								$error[] = $user->lang['FORM_INVALID'];
+								$error[] = phpbb::$user->lang['FORM_INVALID'];
 							}
 
 							if (!sizeof($error))
@@ -615,7 +613,7 @@ class ucp_groups
 									phpbb::$acm->destroy_sql(GROUPS_TABLE);
 
 									$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
-									trigger_error($user->lang[$message] . $return_page);
+									trigger_error(phpbb::$user->lang[$message] . $return_page);
 								}
 							}
 
@@ -655,7 +653,7 @@ class ucp_groups
 							ORDER BY rank_title';
 						$result = $db->sql_query($sql);
 
-						$rank_options = '<option value="0"' . ((!$group_rank) ? ' selected="selected"' : '') . '>' . $user->lang['USER_DEFAULT'] . '</option>';
+						$rank_options = '<option value="0"' . ((!$group_rank) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['USER_DEFAULT'] . '</option>';
 						while ($row = $db->sql_fetchrow($result))
 						{
 							$selected = ($group_rank && $row['rank_id'] == $group_rank) ? ' selected="selected"' : '';
@@ -714,7 +712,7 @@ class ucp_groups
 
 							'U_SWATCH'			=> append_sid(phpbb::$base_config['admin_folder'] . '/swatch', 'form=ucp&amp;name=group_colour'),
 							'S_UCP_ACTION'		=> $this->u_action . "&amp;action=$action&amp;g=$group_id",
-							'L_AVATAR_EXPLAIN'	=> sprintf($user->lang['AVATAR_EXPLAIN'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], phpbb::$config['avatar_filesize'] / 1024),
+							'L_AVATAR_EXPLAIN'	=> sprintf(phpbb::$user->lang['AVATAR_EXPLAIN'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], phpbb::$config['avatar_filesize'] / 1024),
 						));
 
 					break;
@@ -723,21 +721,21 @@ class ucp_groups
 
 						if (!$group_id)
 						{
-							trigger_error($user->lang['NO_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
 						}
 
-						if (!($row = group_memberships($group_id, $user->data['user_id'])))
+						if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
 						{
-							trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
 						}
 						list(, $row) = each($row);
 
 						if (!$row['group_leader'])
 						{
-							trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
 						}
 
-						$user->add_lang(array('acp/groups', 'acp/common'));
+						phpbb::$user->add_lang(array('acp/groups', 'acp/common'));
 						$start = request_var('start', 0);
 
 						// Grab the leaders - always, on every page...
@@ -757,7 +755,7 @@ class ucp_groups
 								'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
 								'U_USER_VIEW'		=> get_username_string('profile', $row['user_id'], $row['username']),
 								'S_GROUP_DEFAULT'	=> ($row['group_id'] == $group_id) ? true : false,
-								'JOINED'			=> ($row['user_regdate']) ? $user->format_date($row['user_regdate']) : ' - ',
+								'JOINED'			=> ($row['user_regdate']) ? phpbb::$user->format_date($row['user_regdate']) : ' - ',
 								'USER_POSTS'		=> $row['user_posts'],
 								'USER_ID'			=> $row['user_id'])
 							);
@@ -812,7 +810,7 @@ class ucp_groups
 								'USERNAME_FULL'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
 								'U_USER_VIEW'		=> get_username_string('profile', $row['user_id'], $row['username']),
 								'S_GROUP_DEFAULT'	=> ($row['group_id'] == $group_id) ? true : false,
-								'JOINED'			=> ($row['user_regdate']) ? $user->format_date($row['user_regdate']) : ' - ',
+								'JOINED'			=> ($row['user_regdate']) ? phpbb::$user->format_date($row['user_regdate']) : ' - ',
 								'USER_POSTS'		=> $row['user_posts'],
 								'USER_ID'			=> $row['user_id'])
 							);
@@ -824,7 +822,7 @@ class ucp_groups
 
 						foreach ($options as $option => $lang)
 						{
-							$s_action_options .= '<option value="' . $option . '">' . $user->lang['GROUP_' . $lang] . '</option>';
+							$s_action_options .= '<option value="' . $option . '">' . phpbb::$user->lang['GROUP_' . $lang] . '</option>';
 						}
 
 						$template->assign_vars(array(
@@ -843,26 +841,26 @@ class ucp_groups
 
 						if (!$group_id)
 						{
-							trigger_error($user->lang['NO_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
 						}
 
-						if (!($row = group_memberships($group_id, $user->data['user_id'])))
+						if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
 						{
-							trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
 						}
 						list(, $row) = each($row);
 
 						if (!$row['group_leader'])
 						{
-							trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
 						}
 
-						$user->add_lang('acp/groups');
+						phpbb::$user->add_lang('acp/groups');
 
 						// Approve, demote or promote
 						group_user_attributes('approve', $group_id, $mark_ary, false, false);
 
-						trigger_error($user->lang['USERS_APPROVED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
+						trigger_error(phpbb::$user->lang['USERS_APPROVED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
 
 					break;
 
@@ -870,21 +868,21 @@ class ucp_groups
 
 						if (!$group_id)
 						{
-							trigger_error($user->lang['NO_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
 						}
 
-						if (!($row = group_memberships($group_id, $user->data['user_id'])))
+						if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
 						{
-							trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
 						}
 						list(, $row) = each($row);
 
 						if (!$row['group_leader'])
 						{
-							trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
 						}
 
-						$group_row['group_name'] = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
+						$group_row['group_name'] = ($group_row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
 
 						if (confirm_box(true))
 						{
@@ -926,15 +924,15 @@ class ucp_groups
 								group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row);
 							}
 
-							$user->add_lang('acp/groups');
+							phpbb::$user->add_lang('acp/groups');
 
-							trigger_error($user->lang['GROUP_DEFS_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
+							trigger_error(phpbb::$user->lang['GROUP_DEFS_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
 						}
 						else
 						{
-							$user->add_lang('acp/common');
+							phpbb::$user->add_lang('acp/common');
 
-							confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+							confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
 								'mark'		=> $mark_ary,
 								'g'			=> $group_id,
 								'i'			=> $id,
@@ -947,40 +945,40 @@ class ucp_groups
 
 					case 'deleteusers':
 
-						$user->add_lang(array('acp/groups', 'acp/common'));
+						phpbb::$user->add_lang(array('acp/groups', 'acp/common'));
 
-						if (!($row = group_memberships($group_id, $user->data['user_id'])))
+						if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
 						{
-							trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
 						}
 						list(, $row) = each($row);
 
 						if (!$row['group_leader'])
 						{
-							trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
 						}
 
-						$group_row['group_name'] = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
+						$group_row['group_name'] = ($group_row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
 
 						if (confirm_box(true))
 						{
 							if (!$group_id)
 							{
-								trigger_error($user->lang['NO_GROUP'] . $return_page);
+								trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
 							}
 
 							$error = group_user_del($group_id, $mark_ary, false, $group_row['group_name']);
 
 							if ($error)
 							{
-								trigger_error($user->lang[$error] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
+								trigger_error(phpbb::$user->lang[$error] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
 							}
 
-							trigger_error($user->lang['GROUP_USERS_REMOVE'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
+							trigger_error(phpbb::$user->lang['GROUP_USERS_REMOVE'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
 						}
 						else
 						{
-							confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+							confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
 								'mark'		=> $mark_ary,
 								'g'			=> $group_id,
 								'i'			=> $id,
@@ -993,33 +991,33 @@ class ucp_groups
 
 					case 'addusers':
 
-						$user->add_lang(array('acp/groups', 'acp/common'));
+						phpbb::$user->add_lang(array('acp/groups', 'acp/common'));
 
 						$names = utf8_normalize_nfc(request_var('usernames', '', true));
 
 						if (!$group_id)
 						{
-							trigger_error($user->lang['NO_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NO_GROUP'] . $return_page);
 						}
 
 						if (!$names)
 						{
-							trigger_error($user->lang['NO_USERS'] . $return_page);
+							trigger_error(phpbb::$user->lang['NO_USERS'] . $return_page);
 						}
 
-						if (!($row = group_memberships($group_id, $user->data['user_id'])))
+						if (!($row = group_memberships($group_id, phpbb::$user->data['user_id'])))
 						{
-							trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NOT_MEMBER_OF_GROUP'] . $return_page);
 						}
 						list(, $row) = each($row);
 
 						if (!$row['group_leader'])
 						{
-							trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
+							trigger_error(phpbb::$user->lang['NOT_LEADER_OF_GROUP'] . $return_page);
 						}
 
 						$name_ary = array_unique(explode("\n", $names));
-						$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
+						$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
 
 						$default = request_var('default', 0);
 
@@ -1028,10 +1026,10 @@ class ucp_groups
 							// Add user/s to group
 							if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, 0, 0, $group_row))
 							{
-								trigger_error($user->lang[$error] . $return_page);
+								trigger_error(phpbb::$user->lang[$error] . $return_page);
 							}
 
-							trigger_error($user->lang['GROUP_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
+							trigger_error(phpbb::$user->lang['GROUP_USERS_ADDED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
 						}
 						else
 						{
@@ -1043,19 +1041,19 @@ class ucp_groups
 								'mode'		=> $mode,
 								'action'	=> $action
 							);
-							confirm_box(false, sprintf($user->lang['GROUP_CONFIRM_ADD_USER' . ((sizeof($name_ary) == 1) ? '' : 'S')], implode(', ', $name_ary)), build_hidden_fields($s_hidden_fields));
+							confirm_box(false, sprintf(phpbb::$user->lang['GROUP_CONFIRM_ADD_USER' . ((sizeof($name_ary) == 1) ? '' : 'S')], implode(', ', $name_ary)), build_hidden_fields($s_hidden_fields));
 						}
 
-						trigger_error($user->lang['NO_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
+						trigger_error(phpbb::$user->lang['NO_USERS_ADDED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
 
 					break;
 
 					default:
-						$user->add_lang('acp/common');
+						phpbb::$user->add_lang('acp/common');
 
 						$sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_desc, g.group_desc_uid, g.group_desc_bitfield, g.group_desc_options, g.group_type, ug.group_leader
 							FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
-							WHERE ug.user_id = ' . $user->data['user_id'] . '
+							WHERE ug.user_id = ' . phpbb::$user->data['user_id'] . '
 								AND g.group_id = ug.group_id
 								AND ug.group_leader = 1
 							ORDER BY g.group_type DESC, g.group_name';
@@ -1064,7 +1062,7 @@ class ucp_groups
 						while ($value = $db->sql_fetchrow($result))
 						{
 							$template->assign_block_vars('leader', array(
-								'GROUP_NAME'	=> ($value['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $value['group_name']] : $value['group_name'],
+								'GROUP_NAME'	=> ($value['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $value['group_name']] : $value['group_name'],
 								'GROUP_DESC'	=> generate_text_for_display($value['group_desc'], $value['group_desc_uid'], $value['group_desc_bitfield'], $value['group_desc_options']),
 								'GROUP_TYPE'	=> $value['group_type'],
 								'GROUP_ID'		=> $value['group_id'],
diff --git a/phpBB/modules/ucp/ucp_main.php b/phpBB/modules/ucp/ucp_main.php
index 24fc74d8cb..ab0996f87d 100644
--- a/phpBB/modules/ucp/ucp_main.php
+++ b/phpBB/modules/ucp/ucp_main.php
@@ -33,13 +33,11 @@ class ucp_main
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template;
-
 		switch ($mode)
 		{
 			case 'front':
 
-				$user->add_lang('memberlist');
+				phpbb::$user->add_lang('memberlist');
 
 				$sql_from = TOPICS_TABLE . ' t ';
 				$sql_select = '';
@@ -47,18 +45,18 @@ class ucp_main
 				if (phpbb::$config['load_db_track'])
 				{
 					$sql_from .= ' LEFT JOIN ' . TOPICS_POSTED_TABLE . ' tp ON (tp.topic_id = t.topic_id
-						AND tp.user_id = ' . $user->data['user_id'] . ')';
+						AND tp.user_id = ' . phpbb::$user->data['user_id'] . ')';
 					$sql_select .= ', tp.topic_posted';
 				}
 
 				if (phpbb::$config['load_db_lastread'])
 				{
 					$sql_from .= ' LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id
-						AND tt.user_id = ' . $user->data['user_id'] . ')';
+						AND tt.user_id = ' . phpbb::$user->data['user_id'] . ')';
 					$sql_select .= ', tt.mark_time';
 				}
 
-				$topic_type = $user->lang['VIEW_TOPIC_GLOBAL'];
+				$topic_type = phpbb::$user->lang['VIEW_TOPIC_GLOBAL'];
 				$folder = 'global_read';
 				$folder_new = 'global_unread';
 
@@ -138,19 +136,19 @@ class ucp_main
 						'TOPIC_AUTHOR'				=> get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
 						'TOPIC_AUTHOR_COLOUR'		=> get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
 						'TOPIC_AUTHOR_FULL'			=> get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
-						'FIRST_POST_TIME'			=> $user->format_date($row['topic_time']),
+						'FIRST_POST_TIME'			=> phpbb::$user->format_date($row['topic_time']),
 						'LAST_POST_SUBJECT'			=> censor_text($row['topic_last_post_subject']),
-						'LAST_POST_TIME'			=> $user->format_date($row['topic_last_post_time']),
-						'LAST_VIEW_TIME'			=> $user->format_date($row['topic_last_view_time']),
+						'LAST_POST_TIME'			=> phpbb::$user->format_date($row['topic_last_post_time']),
+						'LAST_VIEW_TIME'			=> phpbb::$user->format_date($row['topic_last_view_time']),
 						'LAST_POST_AUTHOR'			=> get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
 						'LAST_POST_AUTHOR_COLOUR'	=> get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
 						'LAST_POST_AUTHOR_FULL'		=> get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
 						'TOPIC_TITLE'				=> censor_text($row['topic_title']),
 						'TOPIC_TYPE'				=> $topic_type,
 
-						'TOPIC_FOLDER_IMG'		=> $user->img($folder_img, $folder_alt),
-						'TOPIC_FOLDER_IMG_SRC'	=> $user->img($folder_img, $folder_alt, 'src'),
-						'ATTACH_ICON_IMG'		=> ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', '') : '',
+						'TOPIC_FOLDER_IMG'		=> phpbb::$user->img($folder_img, $folder_alt),
+						'TOPIC_FOLDER_IMG_SRC'	=> phpbb::$user->img($folder_img, $folder_alt, 'src'),
+						'ATTACH_ICON_IMG'		=> ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? phpbb::$user->img('icon_topic_attach', '') : '',
 
 						'S_USER_POSTED'		=> (!empty($row['topic_posted']) && $row['topic_posted']) ? true : false,
 						'S_UNREAD'			=> $unread_topic,
@@ -169,29 +167,29 @@ class ucp_main
 					{
 						include_once(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
 					}
-					display_user_activity($user->data);
+					display_user_activity(phpbb::$user->data);
 				}
 
 				// Do the relevant calculations
-				$memberdays = max(1, round((time() - $user->data['user_regdate']) / 86400));
-				$posts_per_day = $user->data['user_posts'] / $memberdays;
-				$percentage = (phpbb::$config['num_posts']) ? min(100, ($user->data['user_posts'] / phpbb::$config['num_posts']) * 100) : 0;
+				$memberdays = max(1, round((time() - phpbb::$user->data['user_regdate']) / 86400));
+				$posts_per_day = phpbb::$user->data['user_posts'] / $memberdays;
+				$percentage = (phpbb::$config['num_posts']) ? min(100, (phpbb::$user->data['user_posts'] / phpbb::$config['num_posts']) * 100) : 0;
 
 				$template->assign_vars(array(
-					'USER_COLOR'		=> (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '',
-					'JOINED'			=> $user->format_date($user->data['user_regdate']),
-					'VISITED'			=> (empty($last_visit)) ? ' - ' : $user->format_date($last_visit),
-					'WARNINGS'			=> ($user->data['user_warnings']) ? $user->data['user_warnings'] : 0,
-					'POSTS'				=> ($user->data['user_posts']) ? $user->data['user_posts'] : 0,
-					'POSTS_DAY'			=> sprintf($user->lang['POST_DAY'], $posts_per_day),
-					'POSTS_PCT'			=> sprintf($user->lang['POST_PCT'], $percentage),
+					'USER_COLOR'		=> (!empty(phpbb::$user->data['user_colour'])) ? phpbb::$user->data['user_colour'] : '',
+					'JOINED'			=> phpbb::$user->format_date(phpbb::$user->data['user_regdate']),
+					'VISITED'			=> (empty($last_visit)) ? ' - ' : phpbb::$user->format_date($last_visit),
+					'WARNINGS'			=> (phpbb::$user->data['user_warnings']) ? phpbb::$user->data['user_warnings'] : 0,
+					'POSTS'				=> (phpbb::$user->data['user_posts']) ? phpbb::$user->data['user_posts'] : 0,
+					'POSTS_DAY'			=> sprintf(phpbb::$user->lang['POST_DAY'], $posts_per_day),
+					'POSTS_PCT'			=> sprintf(phpbb::$user->lang['POST_PCT'], $percentage),
 
 					'OCCUPATION'	=> (!empty($row['user_occ'])) ? $row['user_occ'] : '',
 					'INTERESTS'		=> (!empty($row['user_interests'])) ? $row['user_interests'] : '',
 
 //					'S_GROUP_OPTIONS'	=> $group_options,
 
-					'U_SEARCH_USER'		=> ($auth->acl_get('u_search')) ? append_sid('search', 'author_id=' . $user->data['user_id'] . '&amp;sr=posts') : '',
+					'U_SEARCH_USER'		=> ($auth->acl_get('u_search')) ? append_sid('search', 'author_id=' . phpbb::$user->data['user_id'] . '&amp;sr=posts') : '',
 				));
 
 			break;
@@ -200,7 +198,7 @@ class ucp_main
 
 				include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
 
-				$user->add_lang('viewforum');
+				phpbb::$user->add_lang('viewforum');
 
 				add_form_key('ucp_front_subscribed');
 
@@ -221,7 +219,7 @@ class ucp_main
 							{
 								$sql = 'DELETE FROM ' . FORUMS_WATCH_TABLE . '
 									WHERE ' . $db->sql_in_set('forum_id', $forums) . '
-										AND user_id = ' . $user->data['user_id'];
+										AND user_id = ' . phpbb::$user->data['user_id'];
 								$db->sql_query($sql);
 
 								$l_unwatch .= '_FORUMS';
@@ -231,23 +229,23 @@ class ucp_main
 							{
 								$sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . '
 									WHERE ' . $db->sql_in_set('topic_id', $topics) . '
-										AND user_id = ' . $user->data['user_id'];
+										AND user_id = ' . phpbb::$user->data['user_id'];
 								$db->sql_query($sql);
 
 								$l_unwatch .= '_TOPICS';
 							}
-							$msg = $user->lang['UNWATCHED' . $l_unwatch];
+							$msg = phpbb::$user->lang['UNWATCHED' . $l_unwatch];
 						}
 						else
 						{
-							$msg = $user->lang['NO_WATCHED_SELECTED'];
+							$msg = phpbb::$user->lang['NO_WATCHED_SELECTED'];
 						}
 					}
 					else
 					{
-						$msg = $user->lang['FORM_INVALID'];
+						$msg = phpbb::$user->lang['FORM_INVALID'];
 					}
-					$message = $msg . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . append_sid('ucp', "i=$id&amp;mode=subscribed") . '">', '</a>');
+					$message = $msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . append_sid('ucp', "i=$id&amp;mode=subscribed") . '">', '</a>');
 					meta_refresh(3, append_sid('ucp', "i=$id&amp;mode=subscribed"));
 					trigger_error($message);
 				}
@@ -267,7 +265,7 @@ class ucp_main
 							FORUMS_TABLE		=> 'f'
 						),
 
-						'WHERE'		=> 'fw.user_id = ' . $user->data['user_id'] . '
+						'WHERE'		=> 'fw.user_id = ' . phpbb::$user->data['user_id'] . '
 							AND f.forum_id = fw.forum_id
 							AND ' . $db->sql_in_set('f.forum_id', $forbidden_forums, true, true),
 
@@ -279,7 +277,7 @@ class ucp_main
 						$sql_array['LEFT_JOIN'] = array(
 							array(
 								'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
-								'ON'	=> 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id'
+								'ON'	=> 'ft.user_id = ' . phpbb::$user->data['user_id'] . ' AND ft.forum_id = f.forum_id'
 							)
 						);
 
@@ -300,11 +298,11 @@ class ucp_main
 
 						if (phpbb::$config['load_db_lastread'])
 						{
-							$forum_check = (!empty($row['mark_time'])) ? $row['mark_time'] : $user->data['user_lastmark'];
+							$forum_check = (!empty($row['mark_time'])) ? $row['mark_time'] : phpbb::$user->data['user_lastmark'];
 						}
 						else
 						{
-							$forum_check = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + phpbb::$config['board_startdate']) : $user->data['user_lastmark'];
+							$forum_check = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + phpbb::$config['board_startdate']) : phpbb::$user->data['user_lastmark'];
 						}
 
 						$unread_forum = ($row['forum_last_post_time'] > $forum_check) ? true : false;
@@ -324,7 +322,7 @@ class ucp_main
 						// Create last post link information, if appropriate
 						if ($row['forum_last_post_id'])
 						{
-							$last_post_time = $user->format_date($row['forum_last_post_time']);
+							$last_post_time = phpbb::$user->format_date($row['forum_last_post_time']);
 							$last_post_url = append_sid('viewtopic', "f=$forum_id&amp;p=" . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id'];
 						}
 						else
@@ -334,9 +332,9 @@ class ucp_main
 
 						$template->assign_block_vars('forumrow', array(
 							'FORUM_ID'				=> $forum_id,
-							'FORUM_FOLDER_IMG'		=> $user->img($folder_image, $folder_alt),
-							'FORUM_FOLDER_IMG_SRC'	=> $user->img($folder_image, $folder_alt, 'src'),
-							'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . PHPBB_ROOT_PATH . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '" />' : '',
+							'FORUM_FOLDER_IMG'		=> phpbb::$user->img($folder_image, $folder_alt),
+							'FORUM_FOLDER_IMG_SRC'	=> phpbb::$user->img($folder_image, $folder_alt, 'src'),
+							'FORUM_IMAGE'			=> ($row['forum_image']) ? '<img src="' . PHPBB_ROOT_PATH . $row['forum_image'] . '" alt="' . phpbb::$user->lang[$folder_alt] . '" />' : '',
 							'FORUM_IMAGE_SRC'		=> ($row['forum_image']) ? PHPBB_ROOT_PATH . $row['forum_image'] : '',
 							'FORUM_NAME'			=> $row['forum_name'],
 							'FORUM_DESC'			=> generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
@@ -385,7 +383,7 @@ class ucp_main
 
 				include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
 
-				$user->add_lang('viewforum');
+				phpbb::$user->add_lang('viewforum');
 
 				if (phpbb_request::is_set_post('unbookmark'))
 				{
@@ -406,12 +404,12 @@ class ucp_main
 					if (confirm_box(true))
 					{
 						$sql = 'DELETE FROM ' . BOOKMARKS_TABLE . '
-							WHERE user_id = ' . $user->data['user_id'] . '
+							WHERE user_id = ' . phpbb::$user->data['user_id'] . '
 								AND ' . $db->sql_in_set('topic_id', $topics);
 						$db->sql_query($sql);
 
 						meta_refresh(3, $url);
-						$message = $user->lang['BOOKMARKS_REMOVED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $url . '">', '</a>');
+						$message = phpbb::$user->lang['BOOKMARKS_REMOVED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $url . '">', '</a>');
 						trigger_error($message);
 					}
 					else
@@ -431,7 +429,7 @@ class ucp_main
 				$pm_drafts = ($this->p_master->p_name == 'pm') ? true : false;
 				$template->assign_var('S_SHOW_DRAFTS', true);
 
-				$user->add_lang('posting');
+				phpbb::$user->add_lang('posting');
 
 				$edit		= phpbb_request::is_set('edit');
 				$draft_id	= phpbb_request::variable('edit', 0);
@@ -452,17 +450,17 @@ class ucp_main
 						{
 							$sql = 'DELETE FROM ' . DRAFTS_TABLE . '
 								WHERE ' . $db->sql_in_set('draft_id', $drafts) . '
-									AND user_id = ' . $user->data['user_id'];
+									AND user_id = ' . phpbb::$user->data['user_id'];
 							$db->sql_query($sql);
 						}
-						$msg = $user->lang['DRAFTS_DELETED'];
+						$msg = phpbb::$user->lang['DRAFTS_DELETED'];
 						unset($drafts);
 					}
 					else
 					{
-						$msg = $user->lang['FORM_INVALID'];
+						$msg = phpbb::$user->lang['FORM_INVALID'];
 					}
-					$message = $msg . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+					$message = $msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 					meta_refresh(3, $this->u_action);
 					trigger_error($message);
 				}
@@ -483,22 +481,22 @@ class ucp_main
 							$sql = 'UPDATE ' . DRAFTS_TABLE . '
 								SET ' . $db->sql_build_array('UPDATE', $draft_row) . "
 								WHERE draft_id = $draft_id
-									AND user_id = " . $user->data['user_id'];
+									AND user_id = " . phpbb::$user->data['user_id'];
 							$db->sql_query($sql);
 
-							$message = $user->lang['DRAFT_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = phpbb::$user->lang['DRAFT_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 
 							meta_refresh(3, $this->u_action);
 							trigger_error($message);
 						}
 						else
 						{
-							$template->assign_var('ERROR', ($draft_message == '') ? $user->lang['EMPTY_DRAFT'] : (($draft_subject == '') ? $user->lang['EMPTY_DRAFT_TITLE'] : ''));
+							$template->assign_var('ERROR', ($draft_message == '') ? phpbb::$user->lang['EMPTY_DRAFT'] : (($draft_subject == '') ? phpbb::$user->lang['EMPTY_DRAFT_TITLE'] : ''));
 						}
 					}
 					else
 					{
-						$template->assign_var('ERROR', $user->lang['FORM_INVALID']);
+						$template->assign_var('ERROR', phpbb::$user->lang['FORM_INVALID']);
 					}
 				}
 
@@ -506,7 +504,7 @@ class ucp_main
 				{
 					$sql = 'SELECT d.*, f.forum_name
 						FROM ' . DRAFTS_TABLE . ' d, ' . FORUMS_TABLE . ' f
-						WHERE d.user_id = ' . $user->data['user_id'] . ' ' .
+						WHERE d.user_id = ' . phpbb::$user->data['user_id'] . ' ' .
 							(($edit) ? "AND d.draft_id = $draft_id" : '') . '
 							AND f.forum_id = d.forum_id
 						ORDER BY d.save_time DESC';
@@ -514,7 +512,7 @@ class ucp_main
 				else
 				{
 					$sql = 'SELECT * FROM ' . DRAFTS_TABLE . '
-						WHERE user_id = ' . $user->data['user_id'] . ' ' .
+						WHERE user_id = ' . phpbb::$user->data['user_id'] . ' ' .
 							(($edit) ? "AND draft_id = $draft_id" : '') . '
 							AND forum_id = 0
 							AND topic_id = 0
@@ -580,7 +578,7 @@ class ucp_main
 					}
 
 					$template_row = array(
-						'DATE'			=> $user->format_date($draft['save_time']),
+						'DATE'			=> phpbb::$user->format_date($draft['save_time']),
 						'DRAFT_MESSAGE'	=> ($submit) ? $draft_message : $draft['draft_message'],
 						'DRAFT_SUBJECT'	=> ($submit) ? $draft_subject : $draft['draft_subject'],
 						'TITLE'			=> $title,
@@ -613,14 +611,14 @@ class ucp_main
 
 
 		$template->assign_vars(array(
-			'L_TITLE'			=> $user->lang['UCP_MAIN_' . strtoupper($mode)],
+			'L_TITLE'			=> phpbb::$user->lang['UCP_MAIN_' . strtoupper($mode)],
 
 			'S_DISPLAY_MARK_ALL'	=> ($mode == 'watched' || ($mode == 'drafts' && !phpbb_request::is_set('edit', phpbb_request::GET))) ? true : false,
 			'S_HIDDEN_FIELDS'		=> (isset($s_hidden_fields)) ? $s_hidden_fields : '',
 			'S_UCP_ACTION'			=> $this->u_action,
 
-			'LAST_POST_IMG'			=> $user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
-			'NEWEST_POST_IMG'		=> $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
+			'LAST_POST_IMG'			=> phpbb::$user->img('icon_topic_latest', 'VIEW_LATEST_POST'),
+			'NEWEST_POST_IMG'		=> phpbb::$user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
 		));
 
 		// Set desired template
@@ -633,8 +631,6 @@ class ucp_main
 	*/
 	function assign_topiclist($mode = 'subscribed', $forbidden_forum_ary = array())
 	{
-		global $user, $db, $template, $auth;
-
 		$table = ($mode == 'subscribed') ? TOPICS_WATCH_TABLE : BOOKMARKS_TABLE;
 		$start = request_var('start', 0);
 
@@ -647,7 +643,7 @@ class ucp_main
 			),
 
 			'WHERE'		=>	'i.topic_id = t.topic_id
-				AND i.user_id = ' . $user->data['user_id'] . '
+				AND i.user_id = ' . phpbb::$user->data['user_id'] . '
 				AND ' . $db->sql_in_set('t.forum_id', $forbidden_forum_ary, true, true),
 		);
 		$sql = $db->sql_build_query('SELECT', $sql_array);
@@ -660,7 +656,7 @@ class ucp_main
 			$template->assign_vars(array(
 				'PAGINATION'	=> generate_pagination($this->u_action, $topics_count, phpbb::$config['topics_per_page'], $start),
 				'PAGE_NUMBER'	=> on_page($topics_count, phpbb::$config['topics_per_page'], $start),
-				'TOTAL_TOPICS'	=> ($topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $topics_count))
+				'TOTAL_TOPICS'	=> ($topics_count == 1) ? phpbb::$user->lang['VIEW_FORUM_TOPIC'] : sprintf(phpbb::$user->lang['VIEW_FORUM_TOPICS'], $topics_count))
 			);
 		}
 
@@ -674,7 +670,7 @@ class ucp_main
 					TOPICS_TABLE		=> 't'
 				),
 
-				'WHERE'		=> 'tw.user_id = ' . $user->data['user_id'] . '
+				'WHERE'		=> 'tw.user_id = ' . phpbb::$user->data['user_id'] . '
 					AND t.topic_id = tw.topic_id
 					AND ' . $db->sql_in_set('t.forum_id', $forbidden_forum_ary, true, true),
 
@@ -693,7 +689,7 @@ class ucp_main
 					BOOKMARKS_TABLE		=> 'b',
 				),
 
-				'WHERE'		=> 'b.user_id = ' . $user->data['user_id'] . '
+				'WHERE'		=> 'b.user_id = ' . phpbb::$user->data['user_id'] . '
 					AND ' . $db->sql_in_set('f.forum_id', $forbidden_forum_ary, true, true),
 
 				'ORDER_BY'	=> 't.topic_last_post_time DESC'
@@ -707,14 +703,14 @@ class ucp_main
 
 		if (phpbb::$config['load_db_lastread'])
 		{
-			$sql_array['LEFT_JOIN'][] = array('FROM' => array(FORUMS_TRACK_TABLE => 'ft'), 'ON' => 'ft.forum_id = t.forum_id AND ft.user_id = ' . $user->data['user_id']);
-			$sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_TRACK_TABLE => 'tt'), 'ON' => 'tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id']);
+			$sql_array['LEFT_JOIN'][] = array('FROM' => array(FORUMS_TRACK_TABLE => 'ft'), 'ON' => 'ft.forum_id = t.forum_id AND ft.user_id = ' . phpbb::$user->data['user_id']);
+			$sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_TRACK_TABLE => 'tt'), 'ON' => 'tt.topic_id = t.topic_id AND tt.user_id = ' . phpbb::$user->data['user_id']);
 			$sql_array['SELECT'] .= ', tt.mark_time, ft.mark_time AS forum_mark_time';
 		}
 
 		if (phpbb::$config['load_db_track'])
 		{
-			$sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_POSTED_TABLE => 'tp'), 'ON' => 'tp.topic_id = t.topic_id AND tp.user_id = ' . $user->data['user_id']);
+			$sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_POSTED_TABLE => 'tp'), 'ON' => 'tp.topic_id = t.topic_id AND tp.user_id = ' . phpbb::$user->data['user_id']);
 			$sql_array['SELECT'] .= ', tp.topic_posted';
 		}
 
@@ -782,10 +778,10 @@ class ucp_main
 			$template->assign_block_vars('topicrow', array(
 				'FORUM_ID'					=> $forum_id,
 				'TOPIC_ID'					=> $topic_id,
-				'FIRST_POST_TIME'			=> $user->format_date($row['topic_time']),
+				'FIRST_POST_TIME'			=> phpbb::$user->format_date($row['topic_time']),
 				'LAST_POST_SUBJECT'			=> $row['topic_last_post_subject'],
-				'LAST_POST_TIME'			=> $user->format_date($row['topic_last_post_time']),
-				'LAST_VIEW_TIME'			=> $user->format_date($row['topic_last_view_time']),
+				'LAST_POST_TIME'			=> phpbb::$user->format_date($row['topic_last_post_time']),
+				'LAST_VIEW_TIME'			=> phpbb::$user->format_date($row['topic_last_view_time']),
 
 				'TOPIC_AUTHOR'				=> get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
 				'TOPIC_AUTHOR_COLOUR'		=> get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
@@ -807,12 +803,12 @@ class ucp_main
 				'TOPIC_TYPE'		=> $topic_type,
 				'FORUM_NAME'		=> $row['forum_name'],
 
-				'TOPIC_FOLDER_IMG'		=> $user->img($folder_img, $folder_alt),
-				'TOPIC_FOLDER_IMG_SRC'	=> $user->img($folder_img, $folder_alt, 'src'),
+				'TOPIC_FOLDER_IMG'		=> phpbb::$user->img($folder_img, $folder_alt),
+				'TOPIC_FOLDER_IMG_SRC'	=> phpbb::$user->img($folder_img, $folder_alt, 'src'),
 				'TOPIC_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
 				'TOPIC_ICON_IMG_WIDTH'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
 				'TOPIC_ICON_IMG_HEIGHT'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
-				'ATTACH_ICON_IMG'		=> ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
+				'ATTACH_ICON_IMG'		=> ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? phpbb::$user->img('icon_topic_attach', phpbb::$user->lang['TOTAL_ATTACHMENTS']) : '',
 
 				'S_TOPIC_TYPE'			=> $row['topic_type'],
 				'S_USER_POSTED'			=> (!empty($row['topic_posted'])) ? true : false,
diff --git a/phpBB/modules/ucp/ucp_pm.php b/phpBB/modules/ucp/ucp_pm.php
index 76992be0df..66170d201a 100644
--- a/phpBB/modules/ucp/ucp_pm.php
+++ b/phpBB/modules/ucp/ucp_pm.php
@@ -43,9 +43,7 @@ class ucp_pm
 
 	function main($id, $mode)
 	{
-		global $user, $template, $auth, $db;
-
-		if (!$user->data['is_registered'])
+		if (!phpbb::$user->is_registered)
 		{
 			trigger_error('NO_MESSAGE');
 		}
@@ -56,7 +54,7 @@ class ucp_pm
 			trigger_error('PM_DISABLED');
 		}
 
-		$user->add_lang('posting');
+		phpbb::$user->add_lang('posting');
 		$template->assign_var('S_PRIVMSGS', true);
 
 		// Folder directly specified?
@@ -88,22 +86,22 @@ class ucp_pm
 			case 'popup':
 
 				$l_new_message = '';
-				if ($user->data['is_registered'])
+				if (phpbb::$user->is_registered)
 				{
-					if ($user->data['user_new_privmsg'])
+					if (phpbb::$user->data['user_new_privmsg'])
 					{
-						$l_new_message = ($user->data['user_new_privmsg'] == 1) ? $user->lang['YOU_NEW_PM'] : $user->lang['YOU_NEW_PMS'];
+						$l_new_message = (phpbb::$user->data['user_new_privmsg'] == 1) ? phpbb::$user->lang['YOU_NEW_PM'] : phpbb::$user->lang['YOU_NEW_PMS'];
 					}
 					else
 					{
-						$l_new_message = $user->lang['YOU_NO_NEW_PM'];
+						$l_new_message = phpbb::$user->lang['YOU_NO_NEW_PM'];
 					}
 				}
 
 				$template->assign_vars(array(
 					'MESSAGE'			=> $l_new_message,
-					'S_NOT_LOGGED_IN'	=> ($user->data['user_id'] == ANONYMOUS) ? true : false,
-					'CLICK_TO_VIEW'		=> sprintf($user->lang['CLICK_VIEW_PRIVMSG'], '<a href="' . append_sid('ucp', 'i=pm&amp;folder=inbox') . '" onclick="jump_to_inbox(this.href); return false;">', '</a>'),
+					'S_NOT_LOGGED_IN'	=> phpbb::$user->is_guest,
+					'CLICK_TO_VIEW'		=> sprintf(phpbb::$user->lang['CLICK_VIEW_PRIVMSG'], '<a href="' . append_sid('ucp', 'i=pm&amp;folder=inbox') . '" onclick="jump_to_inbox(this.href); return false;">', '</a>'),
 					'U_INBOX'			=> append_sid('ucp', 'i=pm&amp;folder=inbox'),
 					'UA_INBOX'			=> append_sid('ucp', 'i=pm&folder=inbox', false))
 				);
@@ -115,7 +113,7 @@ class ucp_pm
 			case 'compose':
 				$action = request_var('action', 'post');
 
-				get_folder($user->data['user_id']);
+				get_folder(phpbb::$user->data['user_id']);
 
 				if (!$auth->acl_get('u_sendpm'))
 				{
@@ -130,7 +128,7 @@ class ucp_pm
 
 			case 'options':
 				set_user_message_limit();
-				get_folder($user->data['user_id']);
+				get_folder(phpbb::$user->data['user_id']);
 
 				include(PHPBB_ROOT_PATH . 'includes/ucp/ucp_pm_options.' . PHP_EXT);
 				message_options($id, $mode, $global_privmsgs_rules, $global_rule_conditions);
@@ -140,7 +138,7 @@ class ucp_pm
 
 			case 'drafts':
 
-				get_folder($user->data['user_id']);
+				get_folder(phpbb::$user->data['user_id']);
 				$this->p_name = 'pm';
 
 				// Call another module... please do not try this at home... Hoochie Coochie Man
@@ -214,7 +212,7 @@ class ucp_pm
 					$move_msg_ids	= phpbb_request::variable('marked_msg_id', array(0), false, phpbb_request::POST);
 					$cur_folder_id	= request_var('cur_folder_id', PRIVMSGS_NO_BOX);
 
-					if (move_pm($user->data['user_id'], $user->data['message_limit'], $move_msg_ids, $dest_folder, $cur_folder_id))
+					if (move_pm(phpbb::$user->data['user_id'], phpbb::$user->data['message_limit'], $move_msg_ids, $dest_folder, $cur_folder_id))
 					{
 						// Return to folder view if single message moved
 						if ($action == 'view_message')
@@ -229,14 +227,14 @@ class ucp_pm
 				// Message Mark Options
 				if ($submit_mark)
 				{
-					handle_mark_actions($user->data['user_id'], $mark_option);
+					handle_mark_actions(phpbb::$user->data['user_id'], $mark_option);
 				}
 
 				// If new messages arrived, place them into the appropriate folder
 				$num_not_moved = $num_removed = 0;
 				$release = request_var('release', 0);
 
-				if ($user->data['user_new_privmsg'] && $action == 'view_folder')
+				if (phpbb::$user->data['user_new_privmsg'] && $action == 'view_folder')
 				{
 					$return = place_pm_into_folder($global_privmsgs_rules, $release);
 					$num_not_moved = $return['not_moved'];
@@ -253,7 +251,7 @@ class ucp_pm
 						FROM ' . PRIVMSGS_TO_TABLE . "
 						WHERE msg_id = $msg_id
 							AND folder_id <> " . PRIVMSGS_NO_BOX . '
-							AND user_id = ' . $user->data['user_id'];
+							AND user_id = ' . phpbb::$user->data['user_id'];
 					$result = $db->sql_query($sql);
 					$row = $db->sql_fetchrow($result);
 					$db->sql_freeresult($result);
@@ -278,7 +276,7 @@ class ucp_pm
 							FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . PRIVMSGS_TABLE . " p2
 							WHERE p2.msg_id = $msg_id
 								AND t.folder_id = $folder_id
-								AND t.user_id = " . $user->data['user_id'] . "
+								AND t.user_id = " . phpbb::$user->data['user_id'] . "
 								AND t.msg_id = p.msg_id
 								AND p.message_time $sql_condition p2.message_time
 							ORDER BY p.message_time $sql_ordering";
@@ -299,7 +297,7 @@ class ucp_pm
 
 					$sql = 'SELECT t.*, p.*, u.*
 						FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u
-						WHERE t.user_id = ' . $user->data['user_id'] . "
+						WHERE t.user_id = ' . phpbb::$user->data['user_id'] . "
 							AND p.author_id = u.user_id
 							AND t.folder_id = $folder_id
 							AND t.msg_id = p.msg_id
@@ -314,10 +312,10 @@ class ucp_pm
 					}
 
 					// Update unread status
-					update_unread_status($message_row['pm_unread'], $message_row['msg_id'], $user->data['user_id'], $folder_id);
+					update_unread_status($message_row['pm_unread'], $message_row['msg_id'], phpbb::$user->data['user_id'], $folder_id);
 				}
 
-				$folder = get_folder($user->data['user_id'], $folder_id);
+				$folder = get_folder(phpbb::$user->data['user_id'], $folder_id);
 
 				$s_folder_options = $s_to_folder_options = '';
 				foreach ($folder as $f_id => $folder_ary)
@@ -337,9 +335,9 @@ class ucp_pm
 					'CUR_FOLDER_NAME'		=> $folder_status['folder_name'],
 					'NUM_NOT_MOVED'			=> $num_not_moved,
 					'NUM_REMOVED'			=> $num_removed,
-					'RELEASE_MESSAGE_INFO'	=> sprintf($user->lang['RELEASE_MESSAGES'], '<a href="' . $this->u_action . '&amp;folder=' . $folder_id . '&amp;release=1">', '</a>'),
-					'NOT_MOVED_MESSAGES'	=> ($num_not_moved == 1) ? $user->lang['NOT_MOVED_MESSAGE'] : sprintf($user->lang['NOT_MOVED_MESSAGES'], $num_not_moved),
-					'RULE_REMOVED_MESSAGES'	=> ($num_removed == 1) ? $user->lang['RULE_REMOVED_MESSAGE'] : sprintf($user->lang['RULE_REMOVED_MESSAGES'], $num_removed),
+					'RELEASE_MESSAGE_INFO'	=> sprintf(phpbb::$user->lang['RELEASE_MESSAGES'], '<a href="' . $this->u_action . '&amp;folder=' . $folder_id . '&amp;release=1">', '</a>'),
+					'NOT_MOVED_MESSAGES'	=> ($num_not_moved == 1) ? phpbb::$user->lang['NOT_MOVED_MESSAGE'] : sprintf(phpbb::$user->lang['NOT_MOVED_MESSAGES'], $num_not_moved),
+					'RULE_REMOVED_MESSAGES'	=> ($num_removed == 1) ? phpbb::$user->lang['RULE_REMOVED_MESSAGE'] : sprintf(phpbb::$user->lang['RULE_REMOVED_MESSAGES'], $num_removed),
 
 					'S_FOLDER_OPTIONS'		=> $s_folder_options,
 					'S_TO_FOLDER_OPTIONS'	=> $s_to_folder_options,
@@ -396,7 +394,7 @@ class ucp_pm
 		}
 
 		$template->assign_vars(array(
-			'L_TITLE'			=> $user->lang['UCP_PM_' . strtoupper($mode)],
+			'L_TITLE'			=> phpbb::$user->lang['UCP_PM_' . strtoupper($mode)],
 			'S_UCP_ACTION'		=> $this->u_action . ((isset($action)) ? "&amp;action=$action" : ''))
 		);
 
diff --git a/phpBB/modules/ucp/ucp_pm_compose.php b/phpBB/modules/ucp/ucp_pm_compose.php
index cebb3a11dc..6941973fe6 100644
--- a/phpBB/modules/ucp/ucp_pm_compose.php
+++ b/phpBB/modules/ucp/ucp_pm_compose.php
@@ -22,8 +22,6 @@ if (!defined('IN_PHPBB'))
 */
 function compose_pm($id, $mode, $action)
 {
-	global $template, $db, $auth, $user;
-
 	// Damn php and globals - i know, this is horrible
 	// Needed for handle_message_list_actions()
 	global $refresh, $submit, $preview;
@@ -91,10 +89,10 @@ function compose_pm($id, $mode, $action)
 				$sql .= ' LEFT JOIN ' . USER_GROUP_TABLE . ' ug
 					ON (
 						g.group_id = ug.group_id
-						AND ug.user_id = ' . $user->data['user_id'] . '
+						AND ug.user_id = ' . phpbb::$user->data['user_id'] . '
 						AND ug.user_pending = 0
 					)
-					WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ')';
+					WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . phpbb::$user->data['user_id'] . ')';
 			}
 
 			$sql .= ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? ' WHERE ' : ' AND ';
@@ -106,7 +104,7 @@ function compose_pm($id, $mode, $action)
 			$group_options = '';
 			while ($row = $db->sql_fetchrow($result))
 			{
-				$group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
+				$group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
 			}
 			$db->sql_freeresult($result);
 		}
@@ -158,7 +156,7 @@ function compose_pm($id, $mode, $action)
 			{
 				$sql = 'SELECT t.folder_id, p.*, u.username as quote_username
 					FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u
-					WHERE t.user_id = ' . $user->data['user_id'] . "
+					WHERE t.user_id = ' . phpbb::$user->data['user_id'] . "
 						AND p.author_id = u.user_id
 						AND t.msg_id = p.msg_id
 						AND p.msg_id = $msg_id";
@@ -174,7 +172,7 @@ function compose_pm($id, $mode, $action)
 			// check for outbox (not read) status, we do not allow editing if one user already having the message
 			$sql = 'SELECT p.*, t.folder_id
 				FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p
-				WHERE t.user_id = ' . $user->data['user_id'] . '
+				WHERE t.user_id = ' . phpbb::$user->data['user_id'] . '
 					AND t.folder_id = ' . PRIVMSGS_OUTBOX . "
 					AND t.msg_id = $msg_id
 					AND t.msg_id = p.msg_id";
@@ -193,7 +191,7 @@ function compose_pm($id, $mode, $action)
 
 			$sql = 'SELECT msg_id, pm_unread, pm_new, author_id, folder_id
 				FROM ' . PRIVMSGS_TO_TABLE . '
-				WHERE user_id = ' . $user->data['user_id'] . "
+				WHERE user_id = ' . phpbb::$user->data['user_id'] . "
 					AND msg_id = $msg_id";
 		break;
 
@@ -229,7 +227,7 @@ function compose_pm($id, $mode, $action)
 			{
 				$sql = 'SELECT p.*, t.folder_id
 					FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p
-					WHERE t.user_id = ' . $user->data['user_id'] . "
+					WHERE t.user_id = ' . phpbb::$user->data['user_id'] . "
 						AND t.msg_id = $msg_id
 						AND t.msg_id = p.msg_id";
 				$result = $db->sql_query($sql);
@@ -315,9 +313,9 @@ function compose_pm($id, $mode, $action)
 					$address_list['u'][$post['author_id']] = 'to';
 
 					// Now, make sure the user itself is not listed. ;)
-					if (isset($address_list['u'][$user->data['user_id']]))
+					if (isset($address_list['u'][phpbb::$user->data['user_id']]))
 					{
-						unset($address_list['u'][$user->data['user_id']]);
+						unset($address_list['u'][phpbb::$user->data['user_id']]);
 					}
 				}
 			}
@@ -381,7 +379,7 @@ function compose_pm($id, $mode, $action)
 	$message_parser->message = ($action == 'reply') ? '' : $message_text;
 	unset($message_text);
 
-	$s_action = append_sid('ucp', "i=$id&amp;mode=$mode&amp;action=$action", true, $user->session_id);
+	$s_action = append_sid('ucp', "i=$id&amp;mode=$mode&amp;action=$action", true, phpbb::$user->session_id);
 	$s_action .= ($msg_id) ? "&amp;p=$msg_id" : '';
 
 	// Delete triggered ?
@@ -393,14 +391,14 @@ function compose_pm($id, $mode, $action)
 		// Do we need to confirm ?
 		if (confirm_box(true))
 		{
-			delete_pm($user->data['user_id'], $msg_id, $folder_id);
+			delete_pm(phpbb::$user->data['user_id'], $msg_id, $folder_id);
 
 			// jump to next message in "history"? nope, not for the moment. But able to be included later.
 			$meta_info = append_sid('ucp', "i=pm&amp;folder=$folder_id");
-			$message = $user->lang['MESSAGE_DELETED'];
+			$message = phpbb::$user->lang['MESSAGE_DELETED'];
 
 			meta_refresh(3, $meta_info);
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_FOLDER'], '<a href="' . $meta_info . '">', '</a>');
+			$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_FOLDER'], '<a href="' . $meta_info . '">', '</a>');
 			trigger_error($message);
 		}
 		else
@@ -421,7 +419,7 @@ function compose_pm($id, $mode, $action)
 	// Get maximum number of allowed recipients
 	$sql = 'SELECT MAX(g.group_max_recipients) as max_recipients
 		FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
-		WHERE ug.user_id = ' . $user->data['user_id'] . '
+		WHERE ug.user_id = ' . phpbb::$user->data['user_id'] . '
 			AND ug.user_pending = 0
 			AND ug.group_id = g.group_id';
 	$result = $db->sql_query($sql);
@@ -440,9 +438,9 @@ function compose_pm($id, $mode, $action)
 		$list = (!empty($list['u'])) ? $list['u'] : array();
 		$list[$post['author_id']] = 'to';
 
-		if (isset($list[$user->data['user_id']]))
+		if (isset($list[phpbb::$user->data['user_id']]))
 		{
-			unset($list[$user->data['user_id']]);
+			unset($list[phpbb::$user->data['user_id']]);
 		}
 
 		$max_recipients = ($max_recipients < sizeof($list)) ? sizeof($list) : $max_recipients;
@@ -457,21 +455,21 @@ function compose_pm($id, $mode, $action)
 	if ((!phpbb::$config['allow_mass_pm'] || !$auth->acl_get('u_masspm_group')) && !empty($address_list['g']))
 	{
 		$address_list = array();
-		$error[] = $user->lang['NO_AUTH_GROUP_MESSAGE'];
+		$error[] = phpbb::$user->lang['NO_AUTH_GROUP_MESSAGE'];
 	}
 
 	// Check mass pm to users permission
 	if ((!phpbb::$config['allow_mass_pm'] || !$auth->acl_get('u_masspm')) && num_recipients($address_list) > 1)
 	{
 		$address_list = get_recipients($address_list, 1);
-		$error[] = $user->lang('TOO_MANY_RECIPIENTS', 1);
+		$error[] = phpbb::$user->lang('TOO_MANY_RECIPIENTS', 1);
 	}
 
 	// Check for too many recipients
 	if (!empty($address_list['u']) && $max_recipients && sizeof($address_list['u']) > $max_recipients)
 	{
 		$address_list = get_recipients($address_list, $max_recipients);
-		$error[] = $user->lang('TOO_MANY_RECIPIENTS', $max_recipients);
+		$error[] = phpbb::$user->lang('TOO_MANY_RECIPIENTS', $max_recipients);
 	}
 
 	// Always check if the submitted attachment data is valid and belongs to the user.
@@ -494,9 +492,9 @@ function compose_pm($id, $mode, $action)
 
 	if (!in_array($action, array('quote', 'edit', 'delete', 'forward')))
 	{
-		$enable_sig		= (phpbb::$config['allow_sig'] && phpbb::$config['allow_sig_pm'] && $auth->acl_get('u_sig') && $user->optionget('attachsig'));
-		$enable_smilies	= (phpbb::$config['allow_smilies'] && $auth->acl_get('u_pm_smilies') && $user->optionget('smilies'));
-		$enable_bbcode	= (phpbb::$config['allow_bbcode'] && $auth->acl_get('u_pm_bbcode') && $user->optionget('bbcode'));
+		$enable_sig		= (phpbb::$config['allow_sig'] && phpbb::$config['allow_sig_pm'] && $auth->acl_get('u_sig') && phpbb::$user->optionget('attachsig'));
+		$enable_smilies	= (phpbb::$config['allow_smilies'] && $auth->acl_get('u_pm_smilies') && phpbb::$user->optionget('smilies'));
+		$enable_bbcode	= (phpbb::$config['allow_bbcode'] && $auth->acl_get('u_pm_bbcode') && phpbb::$user->optionget('bbcode'));
 		$enable_urls	= true;
 	}
 
@@ -509,7 +507,7 @@ function compose_pm($id, $mode, $action)
 			FROM ' . DRAFTS_TABLE . '
 			WHERE forum_id = 0
 				AND topic_id = 0
-				AND user_id = ' . $user->data['user_id'] .
+				AND user_id = ' . phpbb::$user->data['user_id'] .
 				(($draft_id) ? " AND draft_id <> $draft_id" : '');
 		$result = $db->sql_query_limit($sql, 1);
 		$row = $db->sql_fetchrow($result);
@@ -536,7 +534,7 @@ function compose_pm($id, $mode, $action)
 	if ($save && $auth->acl_get('u_savedrafts'))
 	{
 		$subject = utf8_normalize_nfc(request_var('subject', '', true));
-		$subject = (!$subject && $action != 'post') ? $user->lang['NEW_MESSAGE'] : $subject;
+		$subject = (!$subject && $action != 'post') ? phpbb::$user->lang['NEW_MESSAGE'] : $subject;
 		$message = utf8_normalize_nfc(request_var('message', '', true));
 
 		if ($subject && $message)
@@ -544,7 +542,7 @@ function compose_pm($id, $mode, $action)
 			if (confirm_box(true))
 			{
 				$sql = 'INSERT INTO ' . DRAFTS_TABLE . ' ' . $db->sql_build_array('INSERT', array(
-					'user_id'		=> $user->data['user_id'],
+					'user_id'		=> phpbb::$user->data['user_id'],
 					'topic_id'		=> 0,
 					'forum_id'		=> 0,
 					'save_time'		=> $current_time,
@@ -557,7 +555,7 @@ function compose_pm($id, $mode, $action)
 				$redirect_url = append_sid('ucp', "i=pm&amp;mode=$mode");
 
 				meta_refresh(3, $redirect_url);
-				$message = $user->lang['DRAFT_SAVED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
+				$message = phpbb::$user->lang['DRAFT_SAVED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
 
 				trigger_error($message);
 			}
@@ -583,12 +581,12 @@ function compose_pm($id, $mode, $action)
 		{
 			if (utf8_clean_string($subject) === '')
 			{
-				$error[] = $user->lang['EMPTY_MESSAGE_SUBJECT'];
+				$error[] = phpbb::$user->lang['EMPTY_MESSAGE_SUBJECT'];
 			}
 
 			if (utf8_clean_string($message) === '')
 			{
-				$error[] = $user->lang['TOO_FEW_CHARS'];
+				$error[] = phpbb::$user->lang['TOO_FEW_CHARS'];
 			}
 		}
 
@@ -603,7 +601,7 @@ function compose_pm($id, $mode, $action)
 			WHERE draft_id = $draft_id
 				AND topic_id = 0
 				AND forum_id = 0
-				AND user_id = " . $user->data['user_id'];
+				AND user_id = " . phpbb::$user->data['user_id'];
 		$result = $db->sql_query_limit($sql, 1);
 
 		if ($row = $db->sql_fetchrow($result))
@@ -630,7 +628,7 @@ function compose_pm($id, $mode, $action)
 	{
 		if (($submit || $preview) && !check_form_key('ucp_pm_compose'))
 		{
-			$error[] = $user->lang['FORM_INVALID'];
+			$error[] = phpbb::$user->lang['FORM_INVALID'];
 		}
 		$subject = utf8_normalize_nfc(request_var('subject', '', true));
 		$message_parser->message = utf8_normalize_nfc(request_var('message', '', true));
@@ -673,13 +671,13 @@ function compose_pm($id, $mode, $action)
 		if ($action != 'edit' && !$preview && !$refresh && phpbb::$config['flood_interval'] && !$auth->acl_get('u_ignoreflood'))
 		{
 			// Flood check
-			$last_post_time = $user->data['user_lastpost_time'];
+			$last_post_time = phpbb::$user->data['user_lastpost_time'];
 
 			if ($last_post_time)
 			{
 				if ($last_post_time && ($current_time - $last_post_time) < intval(phpbb::$config['flood_interval']))
 				{
-					$error[] = $user->lang['FLOOD_ERROR'];
+					$error[] = phpbb::$user->lang['FLOOD_ERROR'];
 				}
 			}
 		}
@@ -689,12 +687,12 @@ function compose_pm($id, $mode, $action)
 		{
 			if (utf8_clean_string($subject) === '')
 			{
-				$error[] = $user->lang['EMPTY_MESSAGE_SUBJECT'];
+				$error[] = phpbb::$user->lang['EMPTY_MESSAGE_SUBJECT'];
 			}
 
 			if (!sizeof($address_list))
 			{
-				$error[] = $user->lang['NO_RECIPIENT'];
+				$error[] = phpbb::$user->lang['NO_RECIPIENT'];
 			}
 		}
 
@@ -703,9 +701,9 @@ function compose_pm($id, $mode, $action)
 		{
 			$pm_data = array(
 				'msg_id'				=> (int) $msg_id,
-				'from_user_id'			=> $user->data['user_id'],
-				'from_user_ip'			=> $user->ip,
-				'from_username'			=> $user->data['username'],
+				'from_user_id'			=> phpbb::$user->data['user_id'],
+				'from_user_ip'			=> phpbb::$user->ip,
+				'from_username'			=> phpbb::$user->data['username'],
 				'reply_from_root_level'	=> (isset($post['root_level'])) ? (int) $post['root_level'] : 0,
 				'reply_from_msg_id'		=> (int) $msg_id,
 				'icon_id'				=> (int) $icon_id,
@@ -728,7 +726,7 @@ function compose_pm($id, $mode, $action)
 			$return_folder_url = append_sid('ucp', 'i=pm&amp;folder=outbox');
 			meta_refresh(3, $return_message_url);
 
-			$message = $user->lang['MESSAGE_STORED'] . '<br /><br />' . sprintf($user->lang['VIEW_PRIVATE_MESSAGE'], '<a href="' . $return_message_url . '">', '</a>') . '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $return_folder_url . '">', '</a>', $user->lang['PM_OUTBOX']);
+			$message = phpbb::$user->lang['MESSAGE_STORED'] . '<br /><br />' . sprintf(phpbb::$user->lang['VIEW_PRIVATE_MESSAGE'], '<a href="' . $return_message_url . '">', '</a>') . '<br /><br />' . sprintf(phpbb::$user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $return_folder_url . '">', '</a>', phpbb::$user->lang['PM_OUTBOX']);
 			trigger_error($message);
 		}
 
@@ -738,12 +736,12 @@ function compose_pm($id, $mode, $action)
 	// Preview
 	if (!sizeof($error) && $preview)
 	{
-		$user->add_lang('viewtopic');
+		phpbb::$user->add_lang('viewtopic');
 		$preview_message = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false);
 
-		$preview_signature = $user->data['user_sig'];
-		$preview_signature_uid = $user->data['user_sig_bbcode_uid'];
-		$preview_signature_bitfield = $user->data['user_sig_bbcode_bitfield'];
+		$preview_signature = phpbb::$user->data['user_sig'];
+		$preview_signature_uid = phpbb::$user->data['user_sig_bbcode_uid'];
+		$preview_signature_bitfield = phpbb::$user->data['user_sig_bbcode_bitfield'];
 
 		// Signature
 		if ($enable_sig && phpbb::$config['allow_sig'] && $preview_signature)
@@ -807,11 +805,11 @@ function compose_pm($id, $mode, $action)
 			$post_id = request_var('p', 0);
 			if (phpbb::$config['allow_post_links'])
 			{
-				$message_link = "[url=" . generate_board_url() . '/viewtopic.' . PHP_EXT . "?p={$post_id}#p{$post_id}]{$user->lang['SUBJECT']}: {$message_subject}[/url]\n\n";
+				$message_link = "[url=" . generate_board_url() . '/viewtopic.' . PHP_EXT . '?p=' . $post_id . '#p' . $post_id . ']' . phpbb::$user->lang['SUBJECT'] . ': ' . $message_subject . "[/url]\n\n";
 			}
 			else
 			{
-				$message_link = $user->lang['SUBJECT'] . ': ' . $message_subject . " (" . generate_board_url() . '/viewtopic.' . PHP_EXT . "?p={$post_id}#p{$post_id})\n\n";
+				$message_link = phpbb::$user->lang['SUBJECT'] . ': ' . $message_subject . " (" . generate_board_url() . '/viewtopic.' . PHP_EXT . "?p={$post_id}#p{$post_id})\n\n";
 			}
 		}
 		else
@@ -840,11 +838,11 @@ function compose_pm($id, $mode, $action)
 		}
 
 		$forward_text = array();
-		$forward_text[] = $user->lang['FWD_ORIGINAL_MESSAGE'];
-		$forward_text[] = sprintf($user->lang['FWD_SUBJECT'], censor_text($message_subject));
-		$forward_text[] = sprintf($user->lang['FWD_DATE'], $user->format_date($message_time));
-		$forward_text[] = sprintf($user->lang['FWD_FROM'], $quote_username_text);
-		$forward_text[] = sprintf($user->lang['FWD_TO'], implode(', ', $fwd_to_field['to']));
+		$forward_text[] = phpbb::$user->lang['FWD_ORIGINAL_MESSAGE'];
+		$forward_text[] = sprintf(phpbb::$user->lang['FWD_SUBJECT'], censor_text($message_subject));
+		$forward_text[] = sprintf(phpbb::$user->lang['FWD_DATE'], phpbb::$user->format_date($message_time));
+		$forward_text[] = sprintf(phpbb::$user->lang['FWD_FROM'], $quote_username_text);
+		$forward_text[] = sprintf(phpbb::$user->lang['FWD_TO'], implode(', ', $fwd_to_field['to']));
 
 		$message_parser->message = implode("\n", $forward_text) . "\n\n[quote=&quot;{$quote_username}&quot;]\n" . censor_text(trim($message_parser->message)) . "\n[/quote]";
 		$message_subject = ((!preg_match('/^Fwd:/', $message_subject)) ? 'Fwd: ' : '') . censor_text($message_subject);
@@ -894,10 +892,10 @@ function compose_pm($id, $mode, $action)
 				$sql .= ' LEFT JOIN ' . USER_GROUP_TABLE . ' ug
 					ON (
 						g.group_id = ug.group_id
-						AND ug.user_id = ' . $user->data['user_id'] . '
+						AND ug.user_id = ' . phpbb::$user->data['user_id'] . '
 						AND ug.user_pending = 0
 					)
-					WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ')';
+					WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . phpbb::$user->data['user_id'] . ')';
 			}
 
 			$sql .= ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? ' WHERE ' : ' AND ';
@@ -919,7 +917,7 @@ function compose_pm($id, $mode, $action)
 				{
 					if ($type == 'g')
 					{
-						$row['name'] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['name']] : $row['name'];
+						$row['name'] = ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['name']] : $row['name'];
 					}
 
 					${$type}[$row['id']] = array('name' => $row['name'], 'colour' => $row['colour']);
@@ -976,35 +974,35 @@ function compose_pm($id, $mode, $action)
 	$s_hidden_address_field = build_address_field($address_list);
 
 
-	$bbcode_checked		= (isset($enable_bbcode)) ? !$enable_bbcode : ((phpbb::$config['allow_bbcode'] && $auth->acl_get('u_pm_bbcode')) ? !$user->optionget('bbcode') : 1);
-	$smilies_checked	= (isset($enable_smilies)) ? !$enable_smilies : ((phpbb::$config['allow_smilies'] && $auth->acl_get('u_pm_smilies')) ? !$user->optionget('smilies') : 1);
+	$bbcode_checked		= (isset($enable_bbcode)) ? !$enable_bbcode : ((phpbb::$config['allow_bbcode'] && $auth->acl_get('u_pm_bbcode')) ? !phpbb::$user->optionget('bbcode') : 1);
+	$smilies_checked	= (isset($enable_smilies)) ? !$enable_smilies : ((phpbb::$config['allow_smilies'] && $auth->acl_get('u_pm_smilies')) ? !phpbb::$user->optionget('smilies') : 1);
 	$urls_checked		= (isset($enable_urls)) ? !$enable_urls : 0;
 	$sig_checked		= $enable_sig;
 
 	switch ($action)
 	{
 		case 'post':
-			$page_title = $user->lang['POST_NEW_PM'];
+			$page_title = phpbb::$user->lang['POST_NEW_PM'];
 		break;
 
 		case 'quote':
-			$page_title = $user->lang['POST_QUOTE_PM'];
+			$page_title = phpbb::$user->lang['POST_QUOTE_PM'];
 		break;
 
 		case 'quotepost':
-			$page_title = $user->lang['POST_PM_POST'];
+			$page_title = phpbb::$user->lang['POST_PM_POST'];
 		break;
 
 		case 'reply':
-			$page_title = $user->lang['POST_REPLY_PM'];
+			$page_title = phpbb::$user->lang['POST_REPLY_PM'];
 		break;
 
 		case 'edit':
-			$page_title = $user->lang['POST_EDIT_PM'];
+			$page_title = phpbb::$user->lang['POST_EDIT_PM'];
 		break;
 
 		case 'forward':
-			$page_title = $user->lang['POST_FORWARD_PM'];
+			$page_title = phpbb::$user->lang['POST_FORWARD_PM'];
 		break;
 
 		default:
@@ -1021,17 +1019,17 @@ function compose_pm($id, $mode, $action)
 	// Start assigning vars for main posting page ...
 	$template->assign_vars(array(
 		'L_POST_A'					=> $page_title,
-		'L_ICON'					=> $user->lang['PM_ICON'],
-		'L_MESSAGE_BODY_EXPLAIN'	=> (intval(phpbb::$config['max_post_chars'])) ? sprintf($user->lang['MESSAGE_BODY_EXPLAIN'], intval(phpbb::$config['max_post_chars'])) : '',
+		'L_ICON'					=> phpbb::$user->lang['PM_ICON'],
+		'L_MESSAGE_BODY_EXPLAIN'	=> (intval(phpbb::$config['max_post_chars'])) ? sprintf(phpbb::$user->lang['MESSAGE_BODY_EXPLAIN'], intval(phpbb::$config['max_post_chars'])) : '',
 
 		'SUBJECT'				=> (isset($message_subject)) ? $message_subject : '',
 		'MESSAGE'				=> $message_text,
-		'BBCODE_STATUS'			=> ($bbcode_status) ? sprintf($user->lang['BBCODE_IS_ON'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>') : sprintf($user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>'),
-		'IMG_STATUS'			=> ($img_status) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
-		'FLASH_STATUS'			=> ($flash_status) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'],
-		'SMILIES_STATUS'		=> ($smilies_status) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
-		'URL_STATUS'			=> ($url_status) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
-		'MINI_POST_IMG'			=> $user->img('icon_post_target', $user->lang['PM']),
+		'BBCODE_STATUS'			=> ($bbcode_status) ? sprintf(phpbb::$user->lang['BBCODE_IS_ON'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>') : sprintf(phpbb::$user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>'),
+		'IMG_STATUS'			=> ($img_status) ? phpbb::$user->lang['IMAGES_ARE_ON'] : phpbb::$user->lang['IMAGES_ARE_OFF'],
+		'FLASH_STATUS'			=> ($flash_status) ? phpbb::$user->lang['FLASH_IS_ON'] : phpbb::$user->lang['FLASH_IS_OFF'],
+		'SMILIES_STATUS'		=> ($smilies_status) ? phpbb::$user->lang['SMILIES_ARE_ON'] : phpbb::$user->lang['SMILIES_ARE_OFF'],
+		'URL_STATUS'			=> ($url_status) ? phpbb::$user->lang['URL_IS_ON'] : phpbb::$user->lang['URL_IS_OFF'],
+		'MINI_POST_IMG'			=> phpbb::$user->img('icon_post_target', phpbb::$user->lang['PM']),
 		'ERROR'					=> (sizeof($error)) ? implode('<br />', $error) : '',
 		'MAX_RECIPIENTS'		=> (phpbb::$config['allow_mass_pm'] && ($auth->acl_get('u_masspm') || $auth->acl_get('u_masspm_group'))) ? $max_recipients : 0,
 
@@ -1076,7 +1074,7 @@ function compose_pm($id, $mode, $action)
 	// Message History
 	if ($action == 'reply' || $action == 'quote' || $action == 'forward')
 	{
-		if (message_history($msg_id, $user->data['user_id'], $post, array(), true))
+		if (message_history($msg_id, phpbb::$user->data['user_id'], $post, array(), true))
 		{
 			$template->assign_var('S_DISPLAY_HISTORY', true);
 		}
@@ -1088,8 +1086,6 @@ function compose_pm($id, $mode, $action)
 */
 function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove_g, $add_to, $add_bcc)
 {
-	global $auth, $db, $user;
-
 	// Delete User [TO/BCC]
 	$remove_user_id = request_var('remove_u', array(0 => false));
 	if ($remove_u && sizeof($remove_user_id))
@@ -1152,7 +1148,7 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
 			// If there are users not existing, we will at least print a notice...
 			if (!sizeof($user_id_ary))
 			{
-				$error[] = $user->lang['PM_NO_USERS'];
+				$error[] = phpbb::$user->lang['PM_NO_USERS'];
 			}
 		}
 
@@ -1195,7 +1191,7 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
 			// print a notice about users not being added who do not want to receive pms
 			if ($removed)
 			{
-				$error[] = $user->lang['PM_USERS_REMOVED_NO_PM'];
+				$error[] = phpbb::$user->lang['PM_USERS_REMOVED_NO_PM'];
 			}
 		}
 	}
diff --git a/phpBB/modules/ucp/ucp_pm_options.php b/phpBB/modules/ucp/ucp_pm_options.php
index 43e1c8713a..87b122de4c 100644
--- a/phpBB/modules/ucp/ucp_pm_options.php
+++ b/phpBB/modules/ucp/ucp_pm_options.php
@@ -21,8 +21,6 @@ if (!defined('IN_PHPBB'))
 */
 function message_options($id, $mode, $global_privmsgs_rules, $global_rule_conditions)
 {
-	global $user, $template, $auth, $db;
-
 	$redirect_url = append_sid('ucp', "i=pm&amp;mode=options");
 
 	add_form_key('ucp_pm_options');
@@ -56,12 +54,12 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 		{
 			$sql = 'UPDATE ' . USERS_TABLE . '
 				SET user_full_folder = ' . $set_folder_id . '
-				WHERE user_id = ' . $user->data['user_id'];
+				WHERE user_id = ' . phpbb::$user->data['user_id'];
 			$db->sql_query($sql);
 
-			$user->data['user_full_folder'] = $set_folder_id;
+			phpbb::$user->data['user_full_folder'] = $set_folder_id;
 
-			$message = $user->lang['FULL_FOLDER_OPTION_CHANGED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
+			$message = phpbb::$user->lang['FULL_FOLDER_OPTION_CHANGED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
 			meta_refresh(3, $redirect_url);
 			trigger_error($message);
 		}
@@ -80,19 +78,19 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 				$sql = 'SELECT folder_name
 					FROM ' . PRIVMSGS_FOLDER_TABLE . "
 					WHERE folder_name = '" . $db->sql_escape($folder_name) . "'
-						AND user_id = " . $user->data['user_id'];
+						AND user_id = " . phpbb::$user->data['user_id'];
 				$result = $db->sql_query_limit($sql, 1);
 				$row = $db->sql_fetchrow($result);
 				$db->sql_freeresult($result);
 
 				if ($row)
 				{
-					trigger_error(sprintf($user->lang['FOLDER_NAME_EXIST'], $folder_name));
+					trigger_error(sprintf(phpbb::$user->lang['FOLDER_NAME_EXIST'], $folder_name));
 				}
 
 				$sql = 'SELECT COUNT(folder_id) as num_folder
 					FROM ' . PRIVMSGS_FOLDER_TABLE . '
-						WHERE user_id = ' . $user->data['user_id'];
+						WHERE user_id = ' . phpbb::$user->data['user_id'];
 				$result = $db->sql_query($sql);
 				$num_folder = (int) $db->sql_fetchfield('num_folder');
 				$db->sql_freeresult($result);
@@ -103,18 +101,18 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 				}
 
 				$sql = 'INSERT INTO ' . PRIVMSGS_FOLDER_TABLE . ' ' . $db->sql_build_array('INSERT', array(
-					'user_id'		=> (int) $user->data['user_id'],
+					'user_id'		=> (int) phpbb::$user->data['user_id'],
 					'folder_name'	=> $folder_name)
 				);
 				$db->sql_query($sql);
-				$msg = $user->lang['FOLDER_ADDED'];
+				$msg = phpbb::$user->lang['FOLDER_ADDED'];
 			}
 		}
 		else
 		{
-			$msg = $user->lang['FORM_INVALID'];
+			$msg = phpbb::$user->lang['FORM_INVALID'];
 		}
-		$message = $msg . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
+		$message = $msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
 		meta_refresh(3, $redirect_url);
 		trigger_error($message);
 	}
@@ -134,8 +132,8 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 
 			// Select custom folder
 			$sql = 'SELECT folder_name, pm_count
-				FROM ' . PRIVMSGS_FOLDER_TABLE . "
-				WHERE user_id = {$user->data['user_id']}
+				FROM ' . PRIVMSGS_FOLDER_TABLE . '
+				WHERE user_id = ' . phpbb::$user->data['user_id'] . "
 					AND folder_id = $rename_folder_id";
 			$result = $db->sql_query_limit($sql, 1);
 			$folder_row = $db->sql_fetchrow($result);
@@ -149,16 +147,16 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 			$sql = 'UPDATE ' . PRIVMSGS_FOLDER_TABLE . "
 				SET folder_name = '" . $db->sql_escape($new_folder_name) . "'
 				WHERE folder_id = $rename_folder_id
-					AND user_id = {$user->data['user_id']}";
+					AND user_id = " . phpbb::$user->data['user_id'];
 			$db->sql_query($sql);
-			$msg = $user->lang['FOLDER_RENAMED'];
+			$msg = phpbb::$user->lang['FOLDER_RENAMED'];
 		}
 		else
 		{
-			$msg = $user->lang['FORM_INVALID'];
+			$msg = phpbb::$user->lang['FORM_INVALID'];
 		}
 
-		$message = $msg . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
+		$message = $msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
 
 		meta_refresh(3, $redirect_url);
 		trigger_error($message);
@@ -181,8 +179,8 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 
 		// Select custom folder
 		$sql = 'SELECT folder_name, pm_count
-			FROM ' . PRIVMSGS_FOLDER_TABLE . "
-			WHERE user_id = {$user->data['user_id']}
+			FROM ' . PRIVMSGS_FOLDER_TABLE . '
+			WHERE user_id = ' . phpbb::$user->data['user_id'] . "
 				AND folder_id = $remove_folder_id";
 		$result = $db->sql_query_limit($sql, 1);
 		$folder_row = $db->sql_fetchrow($result);
@@ -206,7 +204,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 			// Gather message ids
 			$sql = 'SELECT msg_id
 				FROM ' . PRIVMSGS_TO_TABLE . '
-				WHERE user_id = ' . $user->data['user_id'] . "
+				WHERE user_id = ' . phpbb::$user->data['user_id'] . "
 					AND folder_id = $remove_folder_id";
 			$result = $db->sql_query($sql);
 
@@ -222,36 +220,36 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 			{
 				// Move Messages
 				case 1:
-					$num_moved = move_pm($user->data['user_id'], $user->data['message_limit'], $msg_ids, $move_to, $remove_folder_id);
+					$num_moved = move_pm(phpbb::$user->data['user_id'], phpbb::$user->data['message_limit'], $msg_ids, $move_to, $remove_folder_id);
 
 					// Something went wrong, only partially moved?
 					if ($num_moved != $folder_row['pm_count'])
 					{
-						trigger_error(sprintf($user->lang['MOVE_PM_ERROR'], $num_moved, $folder_row['pm_count']));
+						trigger_error(sprintf(phpbb::$user->lang['MOVE_PM_ERROR'], $num_moved, $folder_row['pm_count']));
 					}
 				break;
 
 				// Remove Messages
 				case 2:
-					delete_pm($user->data['user_id'], $msg_ids, $remove_folder_id);
+					delete_pm(phpbb::$user->data['user_id'], $msg_ids, $remove_folder_id);
 				break;
 			}
 
 			// Remove folder
-			$sql = 'DELETE FROM ' . PRIVMSGS_FOLDER_TABLE . "
-				WHERE user_id = {$user->data['user_id']}
+			$sql = 'DELETE FROM ' . PRIVMSGS_FOLDER_TABLE . '
+				WHERE user_id = ' . phpbb::$user->data['user_id'] . "
 					AND folder_id = $remove_folder_id";
 			$db->sql_query($sql);
 
 			// Check full folder option. If the removed folder has been specified as destination switch back to inbox
-			if ($user->data['user_full_folder'] == $remove_folder_id)
+			if (phpbb::$user->data['user_full_folder'] == $remove_folder_id)
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
 					SET user_full_folder = ' . PRIVMSGS_INBOX . '
-					WHERE user_id = ' . $user->data['user_id'];
+					WHERE user_id = ' . phpbb::$user->data['user_id'];
 				$db->sql_query($sql);
 
-				$user->data['user_full_folder'] = PRIVMSGS_INBOX;
+				phpbb::$user->data['user_full_folder'] = PRIVMSGS_INBOX;
 			}
 
 			// Now make sure the folder is not used for rules
@@ -263,10 +261,10 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 			$db->sql_query($sql);
 
 			$meta_info = append_sid('ucp', "i=pm&amp;mode=$mode");
-			$message = $user->lang['FOLDER_REMOVED'];
+			$message = phpbb::$user->lang['FOLDER_REMOVED'];
 
 			meta_refresh(3, $meta_info);
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $meta_info . '">', '</a>');
+			$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $meta_info . '">', '</a>');
 			trigger_error($message);
 		}
 		else
@@ -302,7 +300,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 			}
 
 			$rule_ary = array(
-				'user_id'			=> $user->data['user_id'],
+				'user_id'			=> phpbb::$user->data['user_id'],
 				'rule_check'		=> $check_option,
 				'rule_connection'	=> $rule_option,
 				'rule_string'		=> $rule_string,
@@ -330,16 +328,16 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 			// Update users message rules
 			$sql = 'UPDATE ' . USERS_TABLE . '
 				SET user_message_rules = 1
-				WHERE user_id = ' . $user->data['user_id'];
+				WHERE user_id = ' . phpbb::$user->data['user_id'];
 			$db->sql_query($sql);
 
-			$msg = $user->lang['RULE_ADDED'];
+			$msg = phpbb::$user->lang['RULE_ADDED'];
 		}
 		else
 		{
-			$msg = $user->lang['FORM_INVALID'];
+			$msg = phpbb::$user->lang['FORM_INVALID'];
 		}
-		$message = $msg . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
+		$message = $msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $redirect_url . '">', '</a>');
 		meta_refresh(3, $redirect_url);
 		trigger_error($message);
 	}
@@ -359,17 +357,17 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 		if (confirm_box(true))
 		{
 			$sql = 'DELETE FROM ' . PRIVMSGS_RULES_TABLE . '
-				WHERE user_id = ' . $user->data['user_id'] . "
+				WHERE user_id = ' . phpbb::$user->data['user_id'] . "
 					AND rule_id = $delete_id";
 			$db->sql_query($sql);
 
 			$meta_info = append_sid('ucp', 'i=pm&amp;mode=' . $mode);
-			$message = $user->lang['RULE_DELETED'];
+			$message = phpbb::$user->lang['RULE_DELETED'];
 
 			// Reset user_message_rules if no more assigned
 			$sql = 'SELECT rule_id
 				FROM ' . PRIVMSGS_RULES_TABLE . '
-				WHERE user_id = ' . $user->data['user_id'];
+				WHERE user_id = ' . phpbb::$user->data['user_id'];
 			$result = $db->sql_query_limit($sql, 1);
 			$row = $db->sql_fetchrow($result);
 			$db->sql_freeresult($result);
@@ -379,12 +377,12 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 			{
 				$sql = 'UPDATE ' . USERS_TABLE . '
 					SET user_message_rules = 0
-					WHERE user_id = ' . $user->data['user_id'];
+					WHERE user_id = ' . phpbb::$user->data['user_id'];
 				$db->sql_query($sql);
 			}
 
 			meta_refresh(3, $meta_info);
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $meta_info . '">', '</a>');
+			$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $meta_info . '">', '</a>');
 			trigger_error($message);
 		}
 		else
@@ -397,20 +395,20 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 
 	$sql = 'SELECT COUNT(msg_id) as num_messages
 		FROM ' . PRIVMSGS_TO_TABLE . '
-		WHERE user_id = ' . $user->data['user_id'] . '
+		WHERE user_id = ' . phpbb::$user->data['user_id'] . '
 			AND folder_id = ' . PRIVMSGS_INBOX;
 	$result = $db->sql_query($sql);
 	$num_messages = (int) $db->sql_fetchfield('num_messages');
 	$db->sql_freeresult($result);
 
 	$folder[PRIVMSGS_INBOX] = array(
-		'folder_name'		=> $user->lang['PM_INBOX'],
-		'message_status'	=> sprintf($user->lang['FOLDER_MESSAGE_STATUS'], $num_messages, $user->data['message_limit'])
+		'folder_name'		=> phpbb::$user->lang['PM_INBOX'],
+		'message_status'	=> sprintf(phpbb::$user->lang['FOLDER_MESSAGE_STATUS'], $num_messages, phpbb::$user->data['message_limit'])
 	);
 
 	$sql = 'SELECT folder_id, folder_name, pm_count
 		FROM ' . PRIVMSGS_FOLDER_TABLE . '
-			WHERE user_id = ' . $user->data['user_id'];
+			WHERE user_id = ' . phpbb::$user->data['user_id'];
 	$result = $db->sql_query($sql);
 
 	$num_user_folder = 0;
@@ -419,26 +417,26 @@ 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'	=> sprintf($user->lang['FOLDER_MESSAGE_STATUS'], $row['pm_count'], $user->data['message_limit'])
+			'message_status'	=> sprintf(phpbb::$user->lang['FOLDER_MESSAGE_STATUS'], $row['pm_count'], phpbb::$user->data['message_limit'])
 		);
 	}
 	$db->sql_freeresult($result);
 
 	$s_full_folder_options = $s_to_folder_options = $s_folder_options = '';
 
-	if ($user->data['user_full_folder'] == FULL_FOLDER_NONE)
+	if (phpbb::$user->data['user_full_folder'] == FULL_FOLDER_NONE)
 	{
 		// -3 here to let the correct folder id be selected
 		$to_folder_id = phpbb::$config['full_folder_action'] - 3;
 	}
 	else
 	{
-		$to_folder_id = $user->data['user_full_folder'];
+		$to_folder_id = phpbb::$user->data['user_full_folder'];
 	}
 
 	foreach ($folder as $folder_id => $folder_ary)
 	{
-		$s_full_folder_options .= '<option value="' . $folder_id . '"' . (($user->data['user_full_folder'] == $folder_id) ? ' selected="selected"' : '') . '>' . $folder_ary['folder_name'] . ' (' . $folder_ary['message_status'] . ')</option>';
+		$s_full_folder_options .= '<option value="' . $folder_id . '"' . ((phpbb::$user->data['user_full_folder'] == $folder_id) ? ' selected="selected"' : '') . '>' . $folder_ary['folder_name'] . ' (' . $folder_ary['message_status'] . ')</option>';
 		$s_to_folder_options .= '<option value="' . $folder_id . '"' . (($to_folder_id == $folder_id) ? ' selected="selected"' : '') . '>' . $folder_ary['folder_name'] . ' (' . $folder_ary['message_status'] . ')</option>';
 
 		if ($folder_id != PRIVMSGS_INBOX)
@@ -447,11 +445,11 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 		}
 	}
 
-	$s_delete_checked = ($user->data['user_full_folder'] == FULL_FOLDER_DELETE) ? ' checked="checked"' : '';
-	$s_hold_checked = ($user->data['user_full_folder'] == FULL_FOLDER_HOLD) ? ' checked="checked"' : '';
-	$s_move_checked = ($user->data['user_full_folder'] >= 0) ? ' checked="checked"' : '';
+	$s_delete_checked = (phpbb::$user->data['user_full_folder'] == FULL_FOLDER_DELETE) ? ' checked="checked"' : '';
+	$s_hold_checked = (phpbb::$user->data['user_full_folder'] == FULL_FOLDER_HOLD) ? ' checked="checked"' : '';
+	$s_move_checked = (phpbb::$user->data['user_full_folder'] >= 0) ? ' checked="checked"' : '';
 
-	if ($user->data['user_full_folder'] == FULL_FOLDER_NONE)
+	if (phpbb::$user->data['user_full_folder'] == FULL_FOLDER_NONE)
 	{
 		switch (phpbb::$config['full_folder_action'])
 		{
@@ -475,7 +473,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 		'S_MAX_FOLDER_REACHED'	=> ($num_user_folder >= phpbb::$config['pm_max_boxes']) ? true : false,
 		'S_MAX_FOLDER_ZERO'		=> (phpbb::$config['pm_max_boxes'] == 0) ? true : false,
 
-		'DEFAULT_ACTION'		=> (phpbb::$config['full_folder_action'] == 1) ? $user->lang['DELETE_OLDEST_MESSAGES'] : $user->lang['HOLD_NEW_MESSAGES'],
+		'DEFAULT_ACTION'		=> (phpbb::$config['full_folder_action'] == 1) ? phpbb::$user->lang['DELETE_OLDEST_MESSAGES'] : phpbb::$user->lang['HOLD_NEW_MESSAGES'],
 
 		'U_FIND_USERNAME'		=> append_sid('memberlist', 'mode=searchuser&amp;form=ucp&amp;field=rule_string&amp;select_single=true'),
 	));
@@ -483,7 +481,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 	$rule_lang = $action_lang = $check_lang = array();
 
 	// Build all three language arrays
-	preg_replace('#^((RULE|ACTION|CHECK)_([A-Z0-9_]+))$#e', "\${strtolower('\\2') . '_lang'}[constant('\\1')] = \$user->lang['PM_\\2']['\\3']", array_keys(get_defined_constants()));
+	preg_replace('#^((RULE|ACTION|CHECK)_([A-Z0-9_]+))$#e', "\${strtolower('\\2') . '_lang'}[constant('\\1')] = phpbb::\$user->lang['PM_\\2']['\\3']", array_keys(get_defined_constants()));
 
 	/*
 		Rule Ordering:
@@ -552,7 +550,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 		define_action_option(false, $action_option, $action_lang, $folder);
 	}
 
-	show_defined_rules($user->data['user_id'], $check_lang, $rule_lang, $action_lang, $folder);
+	show_defined_rules(phpbb::$user->data['user_id'], $check_lang, $rule_lang, $action_lang, $folder);
 }
 
 /**
@@ -560,8 +558,6 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 */
 function define_check_option($hardcoded, $check_option, $check_lang)
 {
-	global $template;
-
 	$s_check_options = '';
 	if (!$hardcoded)
 	{
@@ -585,8 +581,6 @@ function define_check_option($hardcoded, $check_option, $check_lang)
 */
 function define_action_option($hardcoded, $action_option, $action_lang, $folder)
 {
-	global $db, $template, $user;
-
 	$l_action = $s_action_options = '';
 	if ($hardcoded)
 	{
@@ -632,8 +626,6 @@ function define_action_option($hardcoded, $action_option, $action_lang, $folder)
 */
 function define_rule_option($hardcoded, $rule_option, $rule_lang, $check_ary)
 {
-	global $template;
-
 	$s_rule_options = '';
 	if (!$hardcoded)
 	{
@@ -657,8 +649,6 @@ function define_rule_option($hardcoded, $rule_option, $rule_lang, $check_ary)
 */
 function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule_conditions)
 {
-	global $db, $template, $auth, $user;
-
 	$template->assign_vars(array(
 		'S_COND_DEFINED'	=> true,
 		'S_COND_SELECT'		=> (!$hardcoded && isset($global_rule_conditions[$rule_option])) ? true : false)
@@ -748,10 +738,10 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
 				$sql .= 'LEFT JOIN ' . USER_GROUP_TABLE . ' ug
 					ON (
 						g.group_id = ug.group_id
-						AND ug.user_id = ' . $user->data['user_id'] . '
+						AND ug.user_id = ' . phpbb::$user->data['user_id'] . '
 						AND ug.user_pending = 0
 					)
-					WHERE (ug.user_id = ' . $user->data['user_id'] . ' OR g.group_type <> ' . GROUP_HIDDEN . ')
+					WHERE (ug.user_id = ' . phpbb::$user->data['user_id'] . ' OR g.group_type <> ' . GROUP_HIDDEN . ')
 					AND';
 			}
 			else
@@ -769,13 +759,13 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
 			{
 				if ($rule_group_id && ($row['group_id'] == $rule_group_id))
 				{
-					$rule_string = (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']);
+					$rule_string = (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']);
 				}
 
 				$s_class	= ($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '';
 				$s_selected	= ($row['group_id'] == $rule_group_id) ? ' selected="selected"' : '';
 
-				$s_group_options .= '<option value="' . $row['group_id'] . '"' . $s_class . $s_selected . '>' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
+				$s_group_options .= '<option value="' . $row['group_id'] . '"' . $s_class . $s_selected . '>' . (($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
 			}
 			$db->sql_freeresult($result);
 
@@ -805,8 +795,6 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
 */
 function show_defined_rules($user_id, $check_lang, $rule_lang, $action_lang, $folder)
 {
-	global $db, $template;
-
 	$sql = 'SELECT *
 		FROM ' . PRIVMSGS_RULES_TABLE . '
 		WHERE user_id = ' . $user_id . '
diff --git a/phpBB/modules/ucp/ucp_pm_viewfolder.php b/phpBB/modules/ucp/ucp_pm_viewfolder.php
index 7c5c2480c2..2f67da5e7f 100644
--- a/phpBB/modules/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/modules/ucp/ucp_pm_viewfolder.php
@@ -22,15 +22,13 @@ if (!defined('IN_PHPBB'))
 */
 function view_folder($id, $mode, $folder_id, $folder)
 {
-	global $user, $template, $auth, $db;
-
 	$submit_export = phpbb_request::is_set_post('submit_export');
 
-	$folder_info = get_pm_from($folder_id, $folder, $user->data['user_id']);
+	$folder_info = get_pm_from($folder_id, $folder, phpbb::$user->data['user_id']);
 
 	if (!$submit_export)
 	{
-		$user->add_lang('viewforum');
+		phpbb::$user->add_lang('viewforum');
 
 		// Grab icons
 		$icons = phpbb_cache::obtain_icons();
@@ -56,9 +54,9 @@ function view_folder($id, $mode, $folder_id, $folder)
 		foreach ($color_rows as $var)
 		{
 			$template->assign_block_vars('pm_colour_info', array(
-				'IMG'	=> $user->img("pm_{$var}", ''),
+				'IMG'	=> phpbb::$user->img("pm_{$var}", ''),
 				'CLASS'	=> "pm_{$var}_colour",
-				'LANG'	=> $user->lang[strtoupper($var) . '_MESSAGE'])
+				'LANG'	=> phpbb::$user->lang[strtoupper($var) . '_MESSAGE'])
 			);
 		}
 
@@ -67,7 +65,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 		$s_mark_options = '';
 		foreach ($mark_options as $mark_option)
 		{
-			$s_mark_options .= '<option value="' . $mark_option . '">' . $user->lang[strtoupper($mark_option)] . '</option>';
+			$s_mark_options .= '<option value="' . $mark_option . '">' . phpbb::$user->lang[strtoupper($mark_option)] . '</option>';
 		}
 
 		// We do the folder moving options here too, for template authors to use...
@@ -82,7 +80,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 				}
 
 				$s_folder_move_options .= '<option' . (($f_id != PRIVMSGS_INBOX) ? ' class="sep"' : '') . ' value="' . $f_id . '">';
-				$s_folder_move_options .= sprintf($user->lang['MOVE_MARKED_TO_FOLDER'], $folder_ary['folder_name']);
+				$s_folder_move_options .= sprintf(phpbb::$user->lang['MOVE_MARKED_TO_FOLDER'], $folder_ary['folder_name']);
 				$s_folder_move_options .= (($folder_ary['unread_messages']) ? ' [' . $folder_ary['unread_messages'] . '] ' : '') . '</option>';
 			}
 		}
@@ -91,7 +89,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 		// Get friends and foes
 		$sql = 'SELECT *
 			FROM ' . ZEBRA_TABLE . '
-			WHERE user_id = ' . $user->data['user_id'];
+			WHERE user_id = ' . phpbb::$user->data['user_id'];
 		$result = $db->sql_query($sql);
 
 		while ($row = $db->sql_fetchrow($result))
@@ -126,7 +124,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 						{
 							foreach (array_keys($address[$message_id][$save]) as $ug_id)
 							{
-								$recipient_list[$save][$ug_id] = array('name' => $user->lang['NA'], 'colour' => '');
+								$recipient_list[$save][$ug_id] = array('name' => phpbb::$user->lang['NA'], 'colour' => '');
 							}
 						}
 					}
@@ -157,7 +155,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 						{
 							if ($ug_type == 'g')
 							{
-								$row['name'] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['name']] : $row['name'];
+								$row['name'] = ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['name']] : $row['name'];
 							}
 
 							$recipient_list[$ug_type][$row['id']] = array('name' => $row['name'], 'colour' => $row['colour']);
@@ -224,16 +222,16 @@ function view_folder($id, $mode, $folder_id, $folder)
 
 					'FOLDER_ID'			=> $folder_id,
 					'MESSAGE_ID'		=> $message_id,
-					'SENT_TIME'			=> $user->format_date($row['message_time']),
+					'SENT_TIME'			=> phpbb::$user->format_date($row['message_time']),
 					'SUBJECT'			=> censor_text($row['message_subject']),
 					'FOLDER'			=> (isset($folder[$row['folder_id']])) ? $folder[$row['folder_id']]['folder_name'] : '',
 					'U_FOLDER'			=> (isset($folder[$row['folder_id']])) ? append_sid('ucp', 'folder=' . $row['folder_id']) : '',
 					'PM_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? '<img src="' . phpbb::$config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] . '" width="' . $icons[$row['icon_id']]['width'] . '" height="' . $icons[$row['icon_id']]['height'] . '" alt="" title="" />' : '',
 					'PM_ICON_URL'		=> (!empty($icons[$row['icon_id']])) ? phpbb::$config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] : '',
-					'FOLDER_IMG'		=> $user->img($folder_img, $folder_alt),
-					'FOLDER_IMG_SRC'	=> $user->img($folder_img, $folder_alt, 'src'),
-					'PM_IMG'			=> ($row_indicator) ? $user->img('pm_' . $row_indicator, '') : '',
-					'ATTACH_ICON_IMG'	=> ($auth->acl_get('u_pm_download') && $row['message_attachment'] && phpbb::$config['allow_pm_attach']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
+					'FOLDER_IMG'		=> phpbb::$user->img($folder_img, $folder_alt),
+					'FOLDER_IMG_SRC'	=> phpbb::$user->img($folder_img, $folder_alt, 'src'),
+					'PM_IMG'			=> ($row_indicator) ? phpbb::$user->img('pm_' . $row_indicator, '') : '',
+					'ATTACH_ICON_IMG'	=> ($auth->acl_get('u_pm_download') && $row['message_attachment'] && phpbb::$config['allow_pm_attach']) ? phpbb::$user->img('icon_topic_attach', 'TOTAL_ATTACHMENTS') : '',
 
 					'S_PM_DELETED'		=> ($row['pm_deleted']) ? true : false,
 					'S_AUTHOR_DELETED'	=> ($row['author_id'] == ANONYMOUS) ? true : false,
@@ -283,7 +281,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 
 				$sql = 'SELECT p.message_text, p.bbcode_uid
 					FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u
-					WHERE t.user_id = ' . $user->data['user_id'] . "
+					WHERE t.user_id = ' . phpbb::$user->data['user_id'] . "
 						AND p.author_id = u.user_id
 						AND t.folder_id = $folder_id
 						AND t.msg_id = p.msg_id
@@ -327,7 +325,7 @@ function view_folder($id, $mode, $folder_id, $folder)
 				$data[] = array(
 					'subject'	=> censor_text($row['message_subject']),
 					'sender'	=> $row['username'],
-					'date'		=> $user->format_date($row['message_time']),
+					'date'		=> phpbb::$user->format_date($row['message_time']),
 					'to'		=> ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? $address[$message_id] : '',
 					'message'	=> $message_row['message_text']
 				);
@@ -438,8 +436,6 @@ function view_folder($id, $mode, $folder_id, $folder)
 */
 function get_pm_from($folder_id, $folder, $user_id)
 {
-	global $user, $db, $template, $auth;
-
 	$start = request_var('start', 0);
 
 	// Additional vars later, pm ordering is mostly different from post ordering. :/
@@ -448,18 +444,18 @@ function get_pm_from($folder_id, $folder, $user_id)
 	$sort_dir	= request_var('sd', 'd');
 
 	// PM ordering options
-	$limit_days = array(0 => $user->lang['ALL_MESSAGES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
+	$limit_days = array(0 => phpbb::$user->lang['ALL_MESSAGES'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
 
 	// No sort by Author for sentbox/outbox (already only author available)
 	// Also, sort by msg_id for the time - private messages are not as prone to errors as posts are.
 	if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX)
 	{
-		$sort_by_text = array('t' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
+		$sort_by_text = array('t' => phpbb::$user->lang['POST_TIME'], 's' => phpbb::$user->lang['SUBJECT']);
 		$sort_by_sql = array('t' => 'p.msg_id', 's' => 'p.message_subject');
 	}
 	else
 	{
-		$sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
+		$sort_by_text = array('a' => phpbb::$user->lang['AUTHOR'], 't' => phpbb::$user->lang['POST_TIME'], 's' => phpbb::$user->lang['SUBJECT']);
 		$sort_by_sql = array('a' => 'u.username_clean', 't' => 'p.msg_id', 's' => 'p.message_subject');
 	}
 
@@ -499,11 +495,11 @@ function get_pm_from($folder_id, $folder, $user_id)
 	$template->assign_vars(array(
 		'PAGINATION'		=> generate_pagination(append_sid('ucp', "i=pm&amp;mode=view&amp;action=view_folder&amp;f=$folder_id&amp;$u_sort_param"), $pm_count, phpbb::$config['topics_per_page'], $start),
 		'PAGE_NUMBER'		=> on_page($pm_count, phpbb::$config['topics_per_page'], $start),
-		'TOTAL_MESSAGES'	=> (($pm_count == 1) ? $user->lang['VIEW_PM_MESSAGE'] : sprintf($user->lang['VIEW_PM_MESSAGES'], $pm_count)),
+		'TOTAL_MESSAGES'	=> (($pm_count == 1) ? phpbb::$user->lang['VIEW_PM_MESSAGE'] : sprintf(phpbb::$user->lang['VIEW_PM_MESSAGES'], $pm_count)),
 
-		'POST_IMG'		=> (!$auth->acl_get('u_sendpm')) ? $user->img('button_topic_locked', 'PM_LOCKED') : $user->img('button_pm_new', 'POST_PM'),
+		'POST_IMG'		=> (!$auth->acl_get('u_sendpm')) ? phpbb::$user->img('button_topic_locked', 'PM_LOCKED') : phpbb::$user->img('button_pm_new', 'POST_PM'),
 
-		'L_NO_MESSAGES'	=> (!$auth->acl_get('u_sendpm')) ? $user->lang['POST_PM_LOCKED'] : $user->lang['NO_MESSAGES'],
+		'L_NO_MESSAGES'	=> (!$auth->acl_get('u_sendpm')) ? phpbb::$user->lang['POST_PM_LOCKED'] : phpbb::$user->lang['NO_MESSAGES'],
 
 		'S_SELECT_SORT_DIR'		=> $s_sort_dir,
 		'S_SELECT_SORT_KEY'		=> $s_sort_key,
diff --git a/phpBB/modules/ucp/ucp_pm_viewmessage.php b/phpBB/modules/ucp/ucp_pm_viewmessage.php
index 793e9078a2..c5f3d6750e 100644
--- a/phpBB/modules/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/modules/ucp/ucp_pm_viewmessage.php
@@ -23,7 +23,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 {
 	global $user, $template, $auth, $db;
 
-	$user->add_lang(array('viewtopic', 'memberlist'));
+	phpbb::$user->add_lang(array('viewtopic', 'memberlist'));
 
 	$msg_id		= (int) $msg_id;
 	$folder_id	= (int) $folder_id;
@@ -33,9 +33,9 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	if ($message_row['pm_deleted'])
 	{
 		$meta_info = append_sid('ucp', "i=pm&amp;folder=$folder_id");
-		$message = $user->lang['NO_AUTH_READ_REMOVED_MESSAGE'];
+		$message = phpbb::$user->lang['NO_AUTH_READ_REMOVED_MESSAGE'];
 
-		$message .= '<br /><br />' . sprintf($user->lang['RETURN_FOLDER'], '<a href="' . $meta_info . '">', '</a>');
+		$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_FOLDER'], '<a href="' . $meta_info . '">', '</a>');
 		trigger_error($message);
 	}
 
@@ -81,8 +81,8 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	// Editing information
 	if ($message_row['message_edit_count'] && phpbb::$config['display_last_edited'])
 	{
-		$l_edit_time_total = ($message_row['message_edit_count'] == 1) ? $user->lang['EDITED_TIME_TOTAL'] : $user->lang['EDITED_TIMES_TOTAL'];
-		$l_edited_by = '<br /><br />' . sprintf($l_edit_time_total, (!$message_row['message_edit_user']) ? $message_row['username'] : $message_row['message_edit_user'], $user->format_date($message_row['message_edit_time'], false, true), $message_row['message_edit_count']);
+		$l_edit_time_total = ($message_row['message_edit_count'] == 1) ? phpbb::$user->lang['EDITED_TIME_TOTAL'] : phpbb::$user->lang['EDITED_TIMES_TOTAL'];
+		$l_edited_by = '<br /><br />' . sprintf($l_edit_time_total, (!$message_row['message_edit_user']) ? $message_row['username'] : $message_row['message_edit_user'], phpbb::$user->format_date($message_row['message_edit_time'], false, true), $message_row['message_edit_count']);
 	}
 	else
 	{
@@ -143,7 +143,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 
 	$user_info['sig'] = '';
 
-	$signature = ($message_row['enable_sig'] && phpbb::$config['allow_sig'] && $auth->acl_get('u_sig') && $user->optionget('viewsigs')) ? $user_info['user_sig'] : '';
+	$signature = ($message_row['enable_sig'] && phpbb::$config['allow_sig'] && $auth->acl_get('u_sig') && phpbb::$user->optionget('viewsigs')) ? $user_info['user_sig'] : '';
 
 	// End signature parsing, only if needed
 	if ($signature)
@@ -176,22 +176,22 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 		'RANK_TITLE'		=> $user_info['rank_title'],
 		'RANK_IMG'			=> $user_info['rank_image'],
 		'AUTHOR_AVATAR'		=> (isset($user_info['avatar'])) ? $user_info['avatar'] : '',
-		'AUTHOR_JOINED'		=> $user->format_date($user_info['user_regdate']),
+		'AUTHOR_JOINED'		=> phpbb::$user->format_date($user_info['user_regdate']),
 		'AUTHOR_POSTS'		=> (!empty($user_info['user_posts'])) ? $user_info['user_posts'] : '',
 		'AUTHOR_FROM'		=> (!empty($user_info['user_from'])) ? $user_info['user_from'] : '',
 
-		'ONLINE_IMG'		=> (!phpbb::$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? $user->img('icon_user_online', $user->lang['ONLINE']) : $user->img('icon_user_offline', $user->lang['OFFLINE'])),
+		'ONLINE_IMG'		=> (!phpbb::$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? phpbb::$user->img('icon_user_online', 'ONLINE') : phpbb::$user->img('icon_user_offline', 'OFFLINE')),
 		'S_ONLINE'			=> (!phpbb::$config['load_onlinetrack']) ? false : ((isset($user_info['online']) && $user_info['online']) ? true : false),
-		'DELETE_IMG'		=> $user->img('icon_post_delete', $user->lang['DELETE_MESSAGE']),
-		'INFO_IMG'			=> $user->img('icon_post_info', $user->lang['VIEW_PM_INFO']),
-		'PROFILE_IMG'		=> $user->img('icon_user_profile', $user->lang['READ_PROFILE']),
-		'EMAIL_IMG'			=> $user->img('icon_contact_email', $user->lang['SEND_EMAIL']),
-		'QUOTE_IMG'			=> $user->img('icon_post_quote', $user->lang['POST_QUOTE_PM']),
-		'REPLY_IMG'			=> $user->img('button_pm_reply', $user->lang['POST_REPLY_PM']),
-		'EDIT_IMG'			=> $user->img('icon_post_edit', $user->lang['POST_EDIT_PM']),
-		'MINI_POST_IMG'		=> $user->img('icon_post_target', $user->lang['PM']),
-
-		'SENT_DATE'			=> $user->format_date($message_row['message_time']),
+		'DELETE_IMG'		=> phpbb::$user->img('icon_post_delete', 'DELETE_MESSAGE'),
+		'INFO_IMG'			=> phpbb::$user->img('icon_post_info', 'VIEW_PM_INFO'),
+		'PROFILE_IMG'		=> phpbb::$user->img('icon_user_profile', 'READ_PROFILE'),
+		'EMAIL_IMG'			=> phpbb::$user->img('icon_contact_email', 'SEND_EMAIL'),
+		'QUOTE_IMG'			=> phpbb::$user->img('icon_post_quote', 'POST_QUOTE_PM'),
+		'REPLY_IMG'			=> phpbb::$user->img('button_pm_reply', 'POST_REPLY_PM'),
+		'EDIT_IMG'			=> phpbb::$user->img('icon_post_edit', 'POST_EDIT_PM'),
+		'MINI_POST_IMG'		=> phpbb::$user->img('icon_post_target', 'PM'),
+
+		'SENT_DATE'			=> phpbb::$user->format_date($message_row['message_time']),
 		'SUBJECT'			=> $message_row['message_subject'],
 		'MESSAGE'			=> $message,
 		'SIGNATURE'			=> ($message_row['enable_sig']) ? $signature : '',
@@ -237,7 +237,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 	if (request_var('view', '') != 'print')
 	{
 		// Message History
-		if (message_history($msg_id, $user->data['user_id'], $message_row, $folder))
+		if (message_history($msg_id, phpbb::$user->data['user_id'], $message_row, $folder))
 		{
 			$template->assign_var('S_DISPLAY_HISTORY', true);
 		}
@@ -293,7 +293,7 @@ function get_user_information($user_id, $user_row)
 		include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
 	}
 
-	$user_row['avatar'] = ($user->optionget('viewavatars')) ? get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']) : '';
+	$user_row['avatar'] = (phpbb::$user->optionget('viewavatars')) ? get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']) : '';
 
 	get_user_rank($user_id, $user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']);
 
diff --git a/phpBB/modules/ucp/ucp_prefs.php b/phpBB/modules/ucp/ucp_prefs.php
index 3c4cb354d7..ea4f6db861 100644
--- a/phpBB/modules/ucp/ucp_prefs.php
+++ b/phpBB/modules/ucp/ucp_prefs.php
@@ -27,8 +27,6 @@ class ucp_prefs
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template;
-
 		$submit = phpbb_request::is_set_post('submit');
 		$error = $data = array();
 		$s_hidden_fields = '';
@@ -38,22 +36,22 @@ class ucp_prefs
 			case 'personal':
 				add_form_key('ucp_prefs_personal');
 				$data = array(
-					'notifymethod'	=> request_var('notifymethod', $user->data['user_notify_type']),
-					'dateformat'	=> request_var('dateformat', $user->data['user_dateformat'], true),
-					'lang'			=> basename(request_var('lang', $user->data['user_lang'])),
-					'style'			=> request_var('style', (int) $user->data['user_style']),
-					'tz'			=> request_var('tz', (float) $user->data['user_timezone']),
-
-					'dst'			=> request_var('dst', (bool) $user->data['user_dst']),
-					'viewemail'		=> request_var('viewemail', (bool) $user->data['user_allow_viewemail']),
-					'massemail'		=> request_var('massemail', (bool) $user->data['user_allow_massemail']),
-					'hideonline'	=> request_var('hideonline', (bool) !$user->data['user_allow_viewonline']),
-					'notifypm'		=> request_var('notifypm', (bool) $user->data['user_notify_pm']),
-					'popuppm'		=> request_var('popuppm', (bool) $user->optionget('popuppm')),
-					'allowpm'		=> request_var('allowpm', (bool) $user->data['user_allow_pm']),
+					'notifymethod'	=> request_var('notifymethod', phpbb::$user->data['user_notify_type']),
+					'dateformat'	=> request_var('dateformat', phpbb::$user->data['user_dateformat'], true),
+					'lang'			=> basename(request_var('lang', phpbb::$user->data['user_lang'])),
+					'style'			=> request_var('style', (int) phpbb::$user->data['user_style']),
+					'tz'			=> request_var('tz', (float) phpbb::$user->data['user_timezone']),
+
+					'dst'			=> request_var('dst', (bool) phpbb::$user->data['user_dst']),
+					'viewemail'		=> request_var('viewemail', (bool) phpbb::$user->data['user_allow_viewemail']),
+					'massemail'		=> request_var('massemail', (bool) phpbb::$user->data['user_allow_massemail']),
+					'hideonline'	=> request_var('hideonline', (bool) !phpbb::$user->data['user_allow_viewonline']),
+					'notifypm'		=> request_var('notifypm', (bool) phpbb::$user->data['user_notify_pm']),
+					'popuppm'		=> request_var('popuppm', (bool) phpbb::$user->optionget('popuppm')),
+					'allowpm'		=> request_var('allowpm', (bool) phpbb::$user->data['user_allow_pm']),
 				);
 
-				if ($data['notifymethod'] == NOTIFY_IM && (!phpbb::$config['jab_enable'] || !$user->data['user_jabber'] || !@extension_loaded('xml')))
+				if ($data['notifymethod'] == NOTIFY_IM && (!phpbb::$config['jab_enable'] || !phpbb::$user->data['user_jabber'] || !@extension_loaded('xml')))
 				{
 					// Jabber isnt enabled, or no jabber field filled in. Update the users table to be sure its correct.
 					$data['notifymethod'] = NOTIFY_BOTH;
@@ -76,16 +74,16 @@ class ucp_prefs
 
 					if (!sizeof($error))
 					{
-						$user->optionset('popuppm', $data['popuppm']);
+						phpbb::$user->optionset('popuppm', $data['popuppm']);
 
 						$sql_ary = array(
 							'user_allow_pm'			=> $data['allowpm'],
 							'user_allow_viewemail'	=> $data['viewemail'],
 							'user_allow_massemail'	=> $data['massemail'],
-							'user_allow_viewonline'	=> ($auth->acl_get('u_hideonline')) ? !$data['hideonline'] : $user->data['user_allow_viewonline'],
+							'user_allow_viewonline'	=> ($auth->acl_get('u_hideonline')) ? !$data['hideonline'] : phpbb::$user->data['user_allow_viewonline'],
 							'user_notify_type'		=> $data['notifymethod'],
 							'user_notify_pm'		=> $data['notifypm'],
-							'user_options'			=> $user->data['user_options'],
+							'user_options'			=> phpbb::$user->data['user_options'],
 
 							'user_dst'				=> $data['dst'],
 							'user_dateformat'		=> $data['dateformat'],
@@ -96,36 +94,36 @@ class ucp_prefs
 
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE user_id = ' . $user->data['user_id'];
+							WHERE user_id = ' . phpbb::$user->data['user_id'];
 						$db->sql_query($sql);
 
 						meta_refresh(3, $this->u_action);
-						$message = $user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = phpbb::$user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}
 
 					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
+					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
 				}
 
 				$dateformat_options = '';
 
-				foreach ($user->lang['dateformats'] as $format => $null)
+				foreach (phpbb::$user->lang['dateformats'] as $format => $null)
 				{
 					$dateformat_options .= '<option value="' . $format . '"' . (($format == $data['dateformat']) ? ' selected="selected"' : '') . '>';
-					$dateformat_options .= $user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? $user->lang['VARIANT_DATE_SEPARATOR'] . $user->format_date(time(), $format, true) : '');
+					$dateformat_options .= phpbb::$user->format_date(time(), $format, false) . ((strpos($format, '|') !== false) ? phpbb::$user->lang['VARIANT_DATE_SEPARATOR'] . phpbb::$user->format_date(time(), $format, true) : '');
 					$dateformat_options .= '</option>';
 				}
 
 				$s_custom = false;
 
 				$dateformat_options .= '<option value="custom"';
-				if (!isset($user->lang['dateformats'][$data['dateformat']]))
+				if (!isset(phpbb::$user->lang['dateformats'][$data['dateformat']]))
 				{
 					$dateformat_options .= ' selected="selected"';
 					$s_custom = true;
 				}
-				$dateformat_options .= '>' . $user->lang['CUSTOM_DATEFORMAT'] . '</option>';
+				$dateformat_options .= '>' . phpbb::$user->lang['CUSTOM_DATEFORMAT'] . '</option>';
 
 				$template->assign_vars(array(
 					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
@@ -152,7 +150,7 @@ class ucp_prefs
 					'S_STYLE_OPTIONS'		=> (phpbb::$config['override_user_style']) ? '' : style_select($data['style']),
 					'S_TZ_OPTIONS'			=> tz_select($data['tz'], true),
 					'S_CAN_HIDE_ONLINE'		=> ($auth->acl_get('u_hideonline')) ? true : false,
-					'S_SELECT_NOTIFY'		=> (phpbb::$config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')) ? true : false)
+					'S_SELECT_NOTIFY'		=> (phpbb::$config['jab_enable'] && phpbb::$user->data['user_jabber'] && @extension_loaded('xml')) ? true : false)
 				);
 
 			break;
@@ -162,20 +160,20 @@ class ucp_prefs
 				add_form_key('ucp_prefs_view');
 
 				$data = array(
-					'topic_sk'		=> request_var('topic_sk', (!empty($user->data['user_topic_sortby_type'])) ? $user->data['user_topic_sortby_type'] : 't'),
-					'topic_sd'		=> request_var('topic_sd', (!empty($user->data['user_topic_sortby_dir'])) ? $user->data['user_topic_sortby_dir'] : 'd'),
-					'topic_st'		=> request_var('topic_st', (!empty($user->data['user_topic_show_days'])) ? $user->data['user_topic_show_days'] : 0),
-
-					'post_sk'		=> request_var('post_sk', (!empty($user->data['user_post_sortby_type'])) ? $user->data['user_post_sortby_type'] : 't'),
-					'post_sd'		=> request_var('post_sd', (!empty($user->data['user_post_sortby_dir'])) ? $user->data['user_post_sortby_dir'] : 'a'),
-					'post_st'		=> request_var('post_st', (!empty($user->data['user_post_show_days'])) ? $user->data['user_post_show_days'] : 0),
-
-					'images'		=> request_var('images', (bool) $user->optionget('viewimg')),
-					'flash'			=> request_var('flash', (bool) $user->optionget('viewflash')),
-					'smilies'		=> request_var('smilies', (bool) $user->optionget('viewsmilies')),
-					'sigs'			=> request_var('sigs', (bool) $user->optionget('viewsigs')),
-					'avatars'		=> request_var('avatars', (bool) $user->optionget('viewavatars')),
-					'wordcensor'	=> request_var('wordcensor', (bool) $user->optionget('viewcensors')),
+					'topic_sk'		=> request_var('topic_sk', (!empty(phpbb::$user->data['user_topic_sortby_type'])) ? phpbb::$user->data['user_topic_sortby_type'] : 't'),
+					'topic_sd'		=> request_var('topic_sd', (!empty(phpbb::$user->data['user_topic_sortby_dir'])) ? phpbb::$user->data['user_topic_sortby_dir'] : 'd'),
+					'topic_st'		=> request_var('topic_st', (!empty(phpbb::$user->data['user_topic_show_days'])) ? phpbb::$user->data['user_topic_show_days'] : 0),
+
+					'post_sk'		=> request_var('post_sk', (!empty(phpbb::$user->data['user_post_sortby_type'])) ? phpbb::$user->data['user_post_sortby_type'] : 't'),
+					'post_sd'		=> request_var('post_sd', (!empty(phpbb::$user->data['user_post_sortby_dir'])) ? phpbb::$user->data['user_post_sortby_dir'] : 'a'),
+					'post_st'		=> request_var('post_st', (!empty(phpbb::$user->data['user_post_show_days'])) ? phpbb::$user->data['user_post_show_days'] : 0),
+
+					'images'		=> request_var('images', (bool) phpbb::$user->optionget('viewimg')),
+					'flash'			=> request_var('flash', (bool) phpbb::$user->optionget('viewflash')),
+					'smilies'		=> request_var('smilies', (bool) phpbb::$user->optionget('viewsmilies')),
+					'sigs'			=> request_var('sigs', (bool) phpbb::$user->optionget('viewsigs')),
+					'avatars'		=> request_var('avatars', (bool) phpbb::$user->optionget('viewavatars')),
+					'wordcensor'	=> request_var('wordcensor', (bool) phpbb::$user->optionget('viewcensors')),
 				);
 
 				if ($submit)
@@ -194,19 +192,19 @@ class ucp_prefs
 
 					if (!sizeof($error))
 					{
-						$user->optionset('viewimg', $data['images']);
-						$user->optionset('viewflash', $data['flash']);
-						$user->optionset('viewsmilies', $data['smilies']);
-						$user->optionset('viewsigs', $data['sigs']);
-						$user->optionset('viewavatars', $data['avatars']);
+						phpbb::$user->optionset('viewimg', $data['images']);
+						phpbb::$user->optionset('viewflash', $data['flash']);
+						phpbb::$user->optionset('viewsmilies', $data['smilies']);
+						phpbb::$user->optionset('viewsigs', $data['sigs']);
+						phpbb::$user->optionset('viewavatars', $data['avatars']);
 
 						if ($auth->acl_get('u_chgcensors'))
 						{
-							$user->optionset('viewcensors', $data['wordcensor']);
+							phpbb::$user->optionset('viewcensors', $data['wordcensor']);
 						}
 
 						$sql_ary = array(
-							'user_options'				=> $user->data['user_options'],
+							'user_options'				=> phpbb::$user->data['user_options'],
 							'user_topic_sortby_type'	=> $data['topic_sk'],
 							'user_post_sortby_type'		=> $data['post_sk'],
 							'user_topic_sortby_dir'		=> $data['topic_sd'],
@@ -218,30 +216,30 @@ class ucp_prefs
 
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE user_id = ' . $user->data['user_id'];
+							WHERE user_id = ' . phpbb::$user->data['user_id'];
 						$db->sql_query($sql);
 
 						meta_refresh(3, $this->u_action);
-						$message = $user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = phpbb::$user->lang['PREFERENCES_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}
 
 					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
+					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
 				}
 
-				$sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']);
+				$sort_dir_text = array('a' => phpbb::$user->lang['ASCENDING'], 'd' => phpbb::$user->lang['DESCENDING']);
 
 				// Topic ordering options
-				$limit_topic_days = array(0 => $user->lang['ALL_TOPICS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
+				$limit_topic_days = array(0 => phpbb::$user->lang['ALL_TOPICS'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
 
-				$sort_by_topic_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']);
+				$sort_by_topic_text = array('a' => phpbb::$user->lang['AUTHOR'], 't' => phpbb::$user->lang['POST_TIME'], 'r' => phpbb::$user->lang['REPLIES'], 's' => phpbb::$user->lang['SUBJECT'], 'v' => phpbb::$user->lang['VIEWS']);
 				$sort_by_topic_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views');
 
 				// Post ordering options
-				$limit_post_days = array(0 => $user->lang['ALL_POSTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
+				$limit_post_days = array(0 => phpbb::$user->lang['ALL_POSTS'], 1 => phpbb::$user->lang['1_DAY'], 7 => phpbb::$user->lang['7_DAYS'], 14 => phpbb::$user->lang['2_WEEKS'], 30 => phpbb::$user->lang['1_MONTH'], 90 => phpbb::$user->lang['3_MONTHS'], 180 => phpbb::$user->lang['6_MONTHS'], 365 => phpbb::$user->lang['1_YEAR']);
 
-				$sort_by_post_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
+				$sort_by_post_text = array('a' => phpbb::$user->lang['AUTHOR'], 't' => phpbb::$user->lang['POST_TIME'], 's' => phpbb::$user->lang['SUBJECT']);
 				$sort_by_post_sql = array('a' => 'u.username_clean', 't' => 'p.post_id', 's' => 'p.post_subject');
 
 				$_options = array('topic', 'post');
@@ -297,10 +295,10 @@ class ucp_prefs
 			case 'post':
 
 				$data = array(
-					'bbcode'	=> request_var('bbcode', $user->optionget('bbcode')),
-					'smilies'	=> request_var('smilies', $user->optionget('smilies')),
-					'sig'		=> request_var('sig', $user->optionget('attachsig')),
-					'notify'	=> request_var('notify', (bool) $user->data['user_notify']),
+					'bbcode'	=> request_var('bbcode', phpbb::$user->optionget('bbcode')),
+					'smilies'	=> request_var('smilies', phpbb::$user->optionget('smilies')),
+					'sig'		=> request_var('sig', phpbb::$user->optionget('attachsig')),
+					'notify'	=> request_var('notify', (bool) phpbb::$user->data['user_notify']),
 				);
 				add_form_key('ucp_prefs_post');
 
@@ -308,28 +306,28 @@ class ucp_prefs
 				{
 					if (check_form_key('ucp_prefs_post'))
 					{
-						$user->optionset('bbcode', $data['bbcode']);
-						$user->optionset('smilies', $data['smilies']);
-						$user->optionset('attachsig', $data['sig']);
+						phpbb::$user->optionset('bbcode', $data['bbcode']);
+						phpbb::$user->optionset('smilies', $data['smilies']);
+						phpbb::$user->optionset('attachsig', $data['sig']);
 
 						$sql_ary = array(
-							'user_options'	=> $user->data['user_options'],
+							'user_options'	=> phpbb::$user->data['user_options'],
 							'user_notify'	=> $data['notify'],
 						);
 
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE user_id = ' . $user->data['user_id'];
+							WHERE user_id = ' . phpbb::$user->data['user_id'];
 						$db->sql_query($sql);
 
-						$msg = $user->lang['PREFERENCES_UPDATED'];
+						$msg = phpbb::$user->lang['PREFERENCES_UPDATED'];
 					}
 					else
 					{
-						$msg = $user->lang['FORM_INVALID'];
+						$msg = phpbb::$user->lang['FORM_INVALID'];
 					}
 					meta_refresh(3, $this->u_action);
-					$message = $msg . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+					$message = $msg . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 					trigger_error($message);
 				}
 
@@ -343,7 +341,7 @@ class ucp_prefs
 		}
 
 		$template->assign_vars(array(
-			'L_TITLE'			=> $user->lang['UCP_PREFS_' . strtoupper($mode)],
+			'L_TITLE'			=> phpbb::$user->lang['UCP_PREFS_' . strtoupper($mode)],
 
 			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
 			'S_UCP_ACTION'		=> $this->u_action)
diff --git a/phpBB/modules/ucp/ucp_profile.php b/phpBB/modules/ucp/ucp_profile.php
index d95c0fa560..298022e70f 100644
--- a/phpBB/modules/ucp/ucp_profile.php
+++ b/phpBB/modules/ucp/ucp_profile.php
@@ -29,9 +29,7 @@ class ucp_profile
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template;
-
-		$user->add_lang('posting');
+		phpbb::$user->add_lang('posting');
 
 		$preview	= phpbb_request::variable('preview', false, false, phpbb_request::POST);
 		$submit		= phpbb_request::variable('submit', false, false, phpbb_request::POST);
@@ -44,8 +42,8 @@ class ucp_profile
 			case 'reg_details':
 
 				$data = array(
-					'username'			=> utf8_normalize_nfc(request_var('username', $user->data['username'], true)),
-					'email'				=> strtolower(request_var('email', $user->data['user_email'])),
+					'username'			=> utf8_normalize_nfc(request_var('username', phpbb::$user->data['username'], true)),
+					'email'				=> strtolower(request_var('email', phpbb::$user->data['user_email'])),
 					'email_confirm'		=> strtolower(request_var('email_confirm', '')),
 					'new_password'		=> request_var('new_password', '', true),
 					'cur_password'		=> request_var('cur_password', '', true),
@@ -83,18 +81,18 @@ class ucp_profile
 						$error[] = 'NEW_PASSWORD_ERROR';
 					}
 
-					if (($data['new_password'] || ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email']) || ($data['username'] != $user->data['username'] && $auth->acl_get('u_chgname') && phpbb::$config['allow_namechange'])) && !phpbb_check_hash($data['cur_password'], $user->data['user_password']))
+					if (($data['new_password'] || ($auth->acl_get('u_chgemail') && $data['email'] != phpbb::$user->data['user_email']) || ($data['username'] != phpbb::$user->data['username'] && $auth->acl_get('u_chgname') && phpbb::$config['allow_namechange'])) && !phpbb_check_hash($data['cur_password'], phpbb::$user->data['user_password']))
 					{
 						$error[] = 'CUR_PASSWORD_ERROR';
 					}
 
 					// Only check the new password against the previous password if there have been no errors
-					if (!sizeof($error) && $auth->acl_get('u_chgpasswd') && $data['new_password'] && phpbb_check_hash($data['new_password'], $user->data['user_password']))
+					if (!sizeof($error) && $auth->acl_get('u_chgpasswd') && $data['new_password'] && phpbb_check_hash($data['new_password'], phpbb::$user->data['user_password']))
 					{
 						$error[] = 'SAME_PASSWORD_ERROR';
 					}
 
-					if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email'] && $data['email_confirm'] != $data['email'])
+					if ($auth->acl_get('u_chgemail') && $data['email'] != phpbb::$user->data['user_email'] && $data['email_confirm'] != $data['email'])
 					{
 						$error[] = 'NEW_EMAIL_ERROR';
 					}
@@ -107,33 +105,33 @@ class ucp_profile
 					if (!sizeof($error))
 					{
 						$sql_ary = array(
-							'username'			=> ($auth->acl_get('u_chgname') && phpbb::$config['allow_namechange']) ? $data['username'] : $user->data['username'],
-							'username_clean'	=> ($auth->acl_get('u_chgname') && phpbb::$config['allow_namechange']) ? utf8_clean_string($data['username']) : $user->data['username_clean'],
-							'user_email'		=> ($auth->acl_get('u_chgemail')) ? $data['email'] : $user->data['user_email'],
-							'user_email_hash'	=> ($auth->acl_get('u_chgemail')) ? hexdec(crc32($data['email']) . strlen($data['email'])) : $user->data['user_email_hash'],
-							'user_password'		=> ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? phpbb_hash($data['new_password']) : $user->data['user_password'],
+							'username'			=> ($auth->acl_get('u_chgname') && phpbb::$config['allow_namechange']) ? $data['username'] : phpbb::$user->data['username'],
+							'username_clean'	=> ($auth->acl_get('u_chgname') && phpbb::$config['allow_namechange']) ? utf8_clean_string($data['username']) : phpbb::$user->data['username_clean'],
+							'user_email'		=> ($auth->acl_get('u_chgemail')) ? $data['email'] : phpbb::$user->data['user_email'],
+							'user_email_hash'	=> ($auth->acl_get('u_chgemail')) ? hexdec(crc32($data['email']) . strlen($data['email'])) : phpbb::$user->data['user_email_hash'],
+							'user_password'		=> ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? phpbb_hash($data['new_password']) : phpbb::$user->data['user_password'],
 							'user_passchg'		=> ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? time() : 0,
 						);
 
-						if ($auth->acl_get('u_chgname') && phpbb::$config['allow_namechange'] && $data['username'] != $user->data['username'])
+						if ($auth->acl_get('u_chgname') && phpbb::$config['allow_namechange'] && $data['username'] != phpbb::$user->data['username'])
 						{
-							add_log('user', $user->data['user_id'], 'LOG_USER_UPDATE_NAME', $user->data['username'], $data['username']);
+							add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_UPDATE_NAME', phpbb::$user->data['username'], $data['username']);
 						}
 
-						if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && !phpbb_check_hash($data['new_password'], $user->data['user_password']))
+						if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && !phpbb_check_hash($data['new_password'], phpbb::$user->data['user_password']))
 						{
-							$user->reset_login_keys();
-							add_log('user', $user->data['user_id'], 'LOG_USER_NEW_PASSWORD', $data['username']);
+							phpbb::$user->reset_login_keys();
+							add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_NEW_PASSWORD', $data['username']);
 						}
 
-						if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email'])
+						if ($auth->acl_get('u_chgemail') && $data['email'] != phpbb::$user->data['user_email'])
 						{
-							add_log('user', $user->data['user_id'], 'LOG_USER_UPDATE_EMAIL', $data['username'], $user->data['user_email'], $data['email']);
+							add_log('user', phpbb::$user->data['user_id'], 'LOG_USER_UPDATE_EMAIL', $data['username'], phpbb::$user->data['user_email'], $data['email']);
 						}
 
 						$message = 'PROFILE_UPDATED';
 
-						if (phpbb::$config['email_enable'] && $data['email'] != $user->data['user_email'] && !phpbb::$user->is_founder && (phpbb::$config['require_activation'] == USER_ACTIVATION_SELF || phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN))
+						if (phpbb::$config['email_enable'] && $data['email'] != phpbb::$user->data['user_email'] && !phpbb::$user->is_founder && (phpbb::$config['require_activation'] == USER_ACTIVATION_SELF || phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN))
 						{
 							$message = (phpbb::$config['require_activation'] == USER_ACTIVATION_SELF) ? 'ACCOUNT_EMAIL_CHANGED' : 'ACCOUNT_EMAIL_CHANGED_ADMIN';
 
@@ -149,18 +147,18 @@ class ucp_profile
 							$messenger = new messenger(false);
 
 							$template_file = (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN) ? 'user_activate_inactive' : 'user_activate';
-							$messenger->template($template_file, $user->data['user_lang']);
+							$messenger->template($template_file, phpbb::$user->data['user_lang']);
 
 							$messenger->to($data['email'], $data['username']);
 
 							$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-							$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-							$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-							$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+							$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
+							$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
+							$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
 
 							$messenger->assign_vars(array(
 								'USERNAME'		=> htmlspecialchars_decode($data['username']),
-								'U_ACTIVATE'	=> "$server_url/ucp." . PHP_EXT . "?mode=activate&u={$user->data['user_id']}&k=$user_actkey")
+								'U_ACTIVATE'	=> "$server_url/ucp." . PHP_EXT . '?mode=activate&u=' . phpbb::$user->data['user_id'] . "&k=$user_actkey")
 							);
 
 							$messenger->send(NOTIFY_EMAIL);
@@ -192,8 +190,8 @@ class ucp_profile
 
 									$messenger->assign_vars(array(
 										'USERNAME'			=> htmlspecialchars_decode($data['username']),
-										'U_USER_DETAILS'	=> "$server_url/memberlist." . PHP_EXT . "?mode=viewprofile&u={$user->data['user_id']}",
-										'U_ACTIVATE'		=> "$server_url/ucp." . PHP_EXT . "?mode=activate&u={$user->data['user_id']}&k=$user_actkey")
+										'U_USER_DETAILS'	=> "$server_url/memberlist." . PHP_EXT . '?mode=viewprofile&u=' . phpbb::$user->data['user_id'],
+										'U_ACTIVATE'		=> "$server_url/ucp." . PHP_EXT . '?mode=activate&u=' . phpbb::$user->data['user_id'] . "&k=$user_actkey")
 									);
 
 									$messenger->send($row['user_notify_type']);
@@ -201,7 +199,7 @@ class ucp_profile
 								$db->sql_freeresult($result);
 							}
 
-							user_active_flip('deactivate', $user->data['user_id'], INACTIVE_PROFILE);
+							user_active_flip('deactivate', phpbb::$user->data['user_id'], INACTIVE_PROFILE);
 
 							// Because we want the profile to be reactivated we set user_newpasswd to empty (else the reactivation will fail)
 							$sql_ary['user_actkey'] = $user_actkey;
@@ -212,36 +210,36 @@ class ucp_profile
 						{
 							$sql = 'UPDATE ' . USERS_TABLE . '
 								SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-								WHERE user_id = ' . $user->data['user_id'];
+								WHERE user_id = ' . phpbb::$user->data['user_id'];
 							$db->sql_query($sql);
 						}
 
 						// Need to update config, forum, topic, posting, messages, etc.
-						if ($data['username'] != $user->data['username'] && $auth->acl_get('u_chgname') && phpbb::$config['allow_namechange'])
+						if ($data['username'] != phpbb::$user->data['username'] && $auth->acl_get('u_chgname') && phpbb::$config['allow_namechange'])
 						{
-							user_update_name($user->data['username'], $data['username']);
+							user_update_name(phpbb::$user->data['username'], $data['username']);
 						}
 
 						// Now, we can remove the user completely (kill the session) - NOT BEFORE!!!
 						if (!empty($sql_ary['user_actkey']))
 						{
 							meta_refresh(5, append_sid('index'));
-							$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
+							$message = phpbb::$user->lang[$message] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
 
 							// Because the user gets deactivated we log him out too, killing his session
-							$user->session_kill();
+							phpbb::$user->session_kill();
 						}
 						else
 						{
 							meta_refresh(3, $this->u_action);
-							$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = phpbb::$user->lang[$message] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 						}
 
 						trigger_error($message);
 					}
 
 					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
+					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
 				}
 
 				$template->assign_vars(array(
@@ -253,10 +251,10 @@ class ucp_profile
 					'NEW_PASSWORD'		=> $data['new_password'],
 					'CUR_PASSWORD'		=> '',
 
-					'L_USERNAME_EXPLAIN'		=> sprintf($user->lang[phpbb::$config['allow_name_chars'] . '_EXPLAIN'], phpbb::$config['min_name_chars'], phpbb::$config['max_name_chars']),
-					'L_CHANGE_PASSWORD_EXPLAIN'	=> sprintf($user->lang[phpbb::$config['pass_complex'] . '_EXPLAIN'], phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
+					'L_USERNAME_EXPLAIN'		=> sprintf(phpbb::$user->lang[phpbb::$config['allow_name_chars'] . '_EXPLAIN'], phpbb::$config['min_name_chars'], phpbb::$config['max_name_chars']),
+					'L_CHANGE_PASSWORD_EXPLAIN'	=> sprintf(phpbb::$user->lang[phpbb::$config['pass_complex'] . '_EXPLAIN'], phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
 
-					'S_FORCE_PASSWORD'	=> ($auth->acl_get('u_chgpasswd') && phpbb::$config['chg_passforce'] && $user->data['user_passchg'] < time() - (phpbb::$config['chg_passforce'] * 86400)) ? true : false,
+					'S_FORCE_PASSWORD'	=> ($auth->acl_get('u_chgpasswd') && phpbb::$config['chg_passforce'] && phpbb::$user->data['user_passchg'] < time() - (phpbb::$config['chg_passforce'] * 86400)) ? true : false,
 					'S_CHANGE_USERNAME' => (phpbb::$config['allow_namechange'] && $auth->acl_get('u_chgname')) ? true : false,
 					'S_CHANGE_EMAIL'	=> ($auth->acl_get('u_chgemail')) ? true : false,
 					'S_CHANGE_PASSWORD'	=> ($auth->acl_get('u_chgpasswd')) ? true : false)
@@ -272,24 +270,24 @@ 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']),
-					'location'		=> utf8_normalize_nfc(request_var('location', $user->data['user_from'], true)),
-					'occupation'	=> utf8_normalize_nfc(request_var('occupation', $user->data['user_occ'], true)),
-					'interests'		=> utf8_normalize_nfc(request_var('interests', $user->data['user_interests'], true)),
+					'icq'			=> request_var('icq', phpbb::$user->data['user_icq']),
+					'aim'			=> request_var('aim', phpbb::$user->data['user_aim']),
+					'msn'			=> request_var('msn', phpbb::$user->data['user_msnm']),
+					'yim'			=> request_var('yim', phpbb::$user->data['user_yim']),
+					'jabber'		=> utf8_normalize_nfc(request_var('jabber', phpbb::$user->data['user_jabber'], true)),
+					'website'		=> request_var('website', phpbb::$user->data['user_website']),
+					'location'		=> utf8_normalize_nfc(request_var('location', phpbb::$user->data['user_from'], true)),
+					'occupation'	=> utf8_normalize_nfc(request_var('occupation', phpbb::$user->data['user_occ'], true)),
+					'interests'		=> utf8_normalize_nfc(request_var('interests', phpbb::$user->data['user_interests'], true)),
 				);
 
 				if (phpbb::$config['allow_birthdays'])
 				{
 					$data['bday_day'] = $data['bday_month'] = $data['bday_year'] = 0;
 
-					if ($user->data['user_birthday'])
+					if (phpbb::$user->data['user_birthday'])
 					{
-						list($data['bday_day'], $data['bday_month'], $data['bday_year']) = explode('-', $user->data['user_birthday']);
+						list($data['bday_day'], $data['bday_month'], $data['bday_year']) = explode('-', phpbb::$user->data['user_birthday']);
 					}
 
 					$data['bday_day'] = request_var('bday_day', $data['bday_day']);
@@ -333,7 +331,7 @@ class ucp_profile
 					$error = validate_data($data, $validate_array);
 
 					// validate custom profile fields
-					$cp->submit_cp_field('profile', $user->get_iso_lang_id(), $cp_data, $cp_error);
+					$cp->submit_cp_field('profile', phpbb::$user->get_iso_lang_id(), $cp_data, $cp_error);
 
 					if (sizeof($cp_error))
 					{
@@ -347,7 +345,7 @@ class ucp_profile
 
 					if (!sizeof($error))
 					{
-						$data['notify'] = $user->data['user_notify_type'];
+						$data['notify'] = phpbb::$user->data['user_notify_type'];
 
 						if (!phpbb::$config['jab_enable'] || !$data['jabber'] || !@extension_loaded('xml'))
 						{
@@ -376,7 +374,7 @@ class ucp_profile
 
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-							WHERE user_id = ' . $user->data['user_id'];
+							WHERE user_id = ' . phpbb::$user->data['user_id'];
 						$db->sql_query($sql);
 
 						// Update Custom Fields
@@ -384,12 +382,12 @@ class ucp_profile
 						{
 							$sql = 'UPDATE ' . PROFILE_FIELDS_DATA_TABLE . '
 								SET ' . $db->sql_build_array('UPDATE', $cp_data) . '
-								WHERE user_id = ' . $user->data['user_id'];
+								WHERE user_id = ' . phpbb::$user->data['user_id'];
 							$db->sql_query($sql);
 
 							if (!$db->sql_affectedrows())
 							{
-								$cp_data['user_id'] = (int) $user->data['user_id'];
+								$cp_data['user_id'] = (int) phpbb::$user->data['user_id'];
 
 								$db->sql_return_on_error(true);
 
@@ -401,12 +399,12 @@ class ucp_profile
 						}
 
 						meta_refresh(3, $this->u_action);
-						$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = phpbb::$user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}
 
 					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
+					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
 				}
 
 				if (phpbb::$config['allow_birthdays'])
@@ -458,9 +456,9 @@ class ucp_profile
 				));
 
 				// Get additional profile fields and assign them to the template block var 'profile_fields'
-				$user->get_profile_fields($user->data['user_id']);
+				phpbb::$user->get_profile_fields(phpbb::$user->data['user_id']);
 
-				$cp->generate_profile_fields('profile', $user->get_iso_lang_id());
+				$cp->generate_profile_fields('profile', phpbb::$user->get_iso_lang_id());
 
 			break;
 
@@ -474,11 +472,11 @@ class ucp_profile
 				include(PHPBB_ROOT_PATH . 'includes/functions_posting.' . PHP_EXT);
 				include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
 
-				$enable_bbcode	= (phpbb::$config['allow_sig_bbcode']) ? ((request_var('disable_bbcode', !$user->optionget('bbcode'))) ? false : true) : false;
-				$enable_smilies	= (phpbb::$config['allow_sig_smilies']) ? ((request_var('disable_smilies', !$user->optionget('smilies'))) ? false : true) : false;
+				$enable_bbcode	= (phpbb::$config['allow_sig_bbcode']) ? ((request_var('disable_bbcode', !phpbb::$user->optionget('bbcode'))) ? false : true) : false;
+				$enable_smilies	= (phpbb::$config['allow_sig_smilies']) ? ((request_var('disable_smilies', !phpbb::$user->optionget('smilies'))) ? false : true) : false;
 				$enable_urls	= (phpbb::$config['allow_sig_links']) ? ((request_var('disable_magic_url', false)) ? false : true) : false;
 
-				$signature		= utf8_normalize_nfc(request_var('signature', (string) $user->data['user_sig'], true));
+				$signature		= utf8_normalize_nfc(request_var('signature', (string) phpbb::$user->data['user_sig'], true));
 
 				add_form_key('ucp_sig');
 
@@ -513,16 +511,16 @@ class ucp_profile
 
 							$sql = 'UPDATE ' . USERS_TABLE . '
 								SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
-								WHERE user_id = ' . $user->data['user_id'];
+								WHERE user_id = ' . phpbb::$user->data['user_id'];
 							$db->sql_query($sql);
 
-							$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = phpbb::$user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 							trigger_error($message);
 						}
 					}
 
 					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
+					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
 				}
 
 				$signature_preview = '';
@@ -533,7 +531,7 @@ class ucp_profile
 					unset($message_parser);
 				}
 
-				decode_message($signature, $user->data['user_sig_bbcode_uid']);
+				decode_message($signature, phpbb::$user->data['user_sig_bbcode_uid']);
 
 				$template->assign_vars(array(
 					'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
@@ -544,13 +542,13 @@ class ucp_profile
 					'S_SMILIES_CHECKED' 	=> (!$enable_smilies) ? ' checked="checked"' : '',
 					'S_MAGIC_URL_CHECKED' 	=> (!$enable_urls) ? ' checked="checked"' : '',
 
-					'BBCODE_STATUS'			=> (phpbb::$config['allow_sig_bbcode']) ? sprintf($user->lang['BBCODE_IS_ON'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>') : sprintf($user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>'),
-					'SMILIES_STATUS'		=> (phpbb::$config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'],
-					'IMG_STATUS'			=> (phpbb::$config['allow_sig_img']) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'],
-					'FLASH_STATUS'			=> (phpbb::$config['allow_sig_flash']) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'],
-					'URL_STATUS'			=> (phpbb::$config['allow_sig_links']) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
+					'BBCODE_STATUS'			=> (phpbb::$config['allow_sig_bbcode']) ? sprintf(phpbb::$user->lang['BBCODE_IS_ON'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>') : sprintf(phpbb::$user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid('faq', 'mode=bbcode') . '">', '</a>'),
+					'SMILIES_STATUS'		=> (phpbb::$config['allow_sig_smilies']) ? phpbb::$user->lang['SMILIES_ARE_ON'] : phpbb::$user->lang['SMILIES_ARE_OFF'],
+					'IMG_STATUS'			=> (phpbb::$config['allow_sig_img']) ? phpbb::$user->lang['IMAGES_ARE_ON'] : phpbb::$user->lang['IMAGES_ARE_OFF'],
+					'FLASH_STATUS'			=> (phpbb::$config['allow_sig_flash']) ? phpbb::$user->lang['FLASH_IS_ON'] : phpbb::$user->lang['FLASH_IS_OFF'],
+					'URL_STATUS'			=> (phpbb::$config['allow_sig_links']) ? phpbb::$user->lang['URL_IS_ON'] : phpbb::$user->lang['URL_IS_OFF'],
 
-					'L_SIGNATURE_EXPLAIN'	=> sprintf($user->lang['SIGNATURE_EXPLAIN'], phpbb::$config['max_sig_chars']),
+					'L_SIGNATURE_EXPLAIN'	=> sprintf(phpbb::$user->lang['SIGNATURE_EXPLAIN'], phpbb::$config['max_sig_chars']),
 
 					'S_BBCODE_ALLOWED'		=> phpbb::$config['allow_sig_bbcode'],
 					'S_SMILIES_ALLOWED'		=> phpbb::$config['allow_sig_smilies'],
@@ -583,7 +581,7 @@ class ucp_profile
 						if (avatar_process_user($error))
 						{
 							meta_refresh(3, $this->u_action);
-							$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+							$message = phpbb::$user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 							trigger_error($message);
 						}
 					}
@@ -592,19 +590,19 @@ class ucp_profile
 						$error[] = 'FORM_INVALID';
 					}
 					// Replace "error" strings with their real, localised form
-					$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
+					$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
 				}
 
 				$template->assign_vars(array(
 					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '',
-					'AVATAR'		=> get_user_avatar($user->data['user_avatar'], $user->data['user_avatar_type'], $user->data['user_avatar_width'], $user->data['user_avatar_height']),
+					'AVATAR'		=> get_user_avatar(phpbb::$user->data['user_avatar'], phpbb::$user->data['user_avatar_type'], phpbb::$user->data['user_avatar_width'], phpbb::$user->data['user_avatar_height']),
 					'AVATAR_SIZE'	=> phpbb::$config['avatar_filesize'],
 
 					'U_GALLERY'		=> append_sid('ucp', 'i=profile&amp;mode=avatar&amp;display_gallery=1'),
 
 					'S_FORM_ENCTYPE'	=> ($can_upload) ? ' enctype="multipart/form-data"' : '',
 
-					'L_AVATAR_EXPLAIN'	=> sprintf($user->lang['AVATAR_EXPLAIN'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], phpbb::$config['avatar_filesize'] / 1024),
+					'L_AVATAR_EXPLAIN'	=> sprintf(phpbb::$user->lang['AVATAR_EXPLAIN'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], phpbb::$config['avatar_filesize'] / 1024),
 				));
 
 				if ($display_gallery && $auth->acl_get('u_chgavatar') && phpbb::$config['allow_avatar_local'])
@@ -616,8 +614,8 @@ class ucp_profile
 					$avatars_enabled = ($can_upload || ($auth->acl_get('u_chgavatar') && (phpbb::$config['allow_avatar_local'] || phpbb::$config['allow_avatar_remote']))) ? true : false;
 
 					$template->assign_vars(array(
-						'AVATAR_WIDTH'	=> request_var('width', $user->data['user_avatar_width']),
-						'AVATAR_HEIGHT'	=> request_var('height', $user->data['user_avatar_height']),
+						'AVATAR_WIDTH'	=> request_var('width', phpbb::$user->data['user_avatar_width']),
+						'AVATAR_HEIGHT'	=> request_var('height', phpbb::$user->data['user_avatar_height']),
 
 						'S_AVATARS_ENABLED'		=> $avatars_enabled,
 						'S_UPLOAD_AVATAR_FILE'	=> $can_upload,
@@ -631,7 +629,7 @@ class ucp_profile
 		}
 
 		$template->assign_vars(array(
-			'L_TITLE'	=> $user->lang['UCP_PROFILE_' . strtoupper($mode)],
+			'L_TITLE'	=> phpbb::$user->lang['UCP_PROFILE_' . strtoupper($mode)],
 
 			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
 			'S_UCP_ACTION'		=> $this->u_action)
diff --git a/phpBB/modules/ucp/ucp_register.php b/phpBB/modules/ucp/ucp_register.php
index 68da529809..9708b24f95 100644
--- a/phpBB/modules/ucp/ucp_register.php
+++ b/phpBB/modules/ucp/ucp_register.php
@@ -27,8 +27,6 @@ class ucp_register
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template;
-
 		//
 		if (phpbb::$config['require_activation'] == USER_ACTIVATION_DISABLE)
 		{
@@ -41,7 +39,7 @@ class ucp_register
 		$agreed			= phpbb_request::variable('agreed', false, false, phpbb_request::POST) ? 1 : 0;
 		$submit			= phpbb_request::is_set_post('submit');
 		$change_lang	= request_var('change_lang', '');
-		$user_lang		= request_var('lang', $user->lang_name);
+		$user_lang		= request_var('lang', phpbb::$user->lang_name);
 
 		if ($agreed)
 		{
@@ -64,7 +62,7 @@ class ucp_register
 		{
 			$use_lang = ($change_lang) ? basename($change_lang) : basename($user_lang);
 
-			if (file_exists($user->lang_path . $use_lang . '/'))
+			if (file_exists(phpbb::$user->lang_path . $use_lang . '/'))
 			{
 				if ($change_lang)
 				{
@@ -74,14 +72,14 @@ class ucp_register
 					$agreed = (phpbb_request::is_set_post('change_lang')) ? 0 : $agreed;
 				}
 
-				$user->lang_name = $lang = $use_lang;
-				$user->lang = array();
-				$user->add_lang(array('common', 'ucp'));
+				phpbb::$user->lang_name = $lang = $use_lang;
+				phpbb::$user->lang = array();
+				phpbb::$user->add_lang(array('common', 'ucp'));
 			}
 			else
 			{
 				$change_lang = '';
-				$user_lang = $user->lang_name;
+				$user_lang = phpbb::$user->lang_name;
 			}
 		}
 
@@ -105,7 +103,7 @@ class ucp_register
 					'username'			=> utf8_normalize_nfc(request_var('username', '', true)),
 					'email'				=> strtolower(request_var('email', '')),
 					'email_confirm'		=> strtolower(request_var('email_confirm', '')),
-					'lang'				=> $user->lang_name,
+					'lang'				=> phpbb::$user->lang_name,
 					'tz'				=> request_var('tz', (float) phpbb::$config['board_timezone']),
 				));
 
@@ -118,12 +116,12 @@ class ucp_register
 			if ($coppa === false && phpbb::$config['coppa_enable'])
 			{
 				$now = getdate();
-				$coppa_birthday = $user->format_date(mktime($now['hours'] + $user->data['user_dst'], $now['minutes'], $now['seconds'], $now['mon'], $now['mday'] - 1, $now['year'] - 13), $user->lang['DATE_FORMAT']);
+				$coppa_birthday = phpbb::$user->format_date(mktime($now['hours'] + phpbb::$user->data['user_dst'], $now['minutes'], $now['seconds'], $now['mon'], $now['mday'] - 1, $now['year'] - 13), phpbb::$user->lang['DATE_FORMAT']);
 				unset($now);
 
 				$template->assign_vars(array(
-					'L_COPPA_NO'		=> sprintf($user->lang['UCP_COPPA_BEFORE'], $coppa_birthday),
-					'L_COPPA_YES'		=> sprintf($user->lang['UCP_COPPA_ON_AFTER'], $coppa_birthday),
+					'L_COPPA_NO'		=> sprintf(phpbb::$user->lang['UCP_COPPA_BEFORE'], $coppa_birthday),
+					'L_COPPA_YES'		=> sprintf(phpbb::$user->lang['UCP_COPPA_ON_AFTER'], $coppa_birthday),
 
 					'U_COPPA_NO'		=> append_sid('ucp', 'mode=register&amp;coppa=0' . $add_lang),
 					'U_COPPA_YES'		=> append_sid('ucp', 'mode=register&amp;coppa=1' . $add_lang),
@@ -136,7 +134,7 @@ class ucp_register
 			else
 			{
 				$template->assign_vars(array(
-					'L_TERMS_OF_USE'	=> sprintf($user->lang['TERMS_OF_USE_CONTENT'], phpbb::$config['sitename'], generate_board_url()),
+					'L_TERMS_OF_USE'	=> sprintf(phpbb::$user->lang['TERMS_OF_USE_CONTENT'], phpbb::$config['sitename'], generate_board_url()),
 
 					'S_SHOW_COPPA'		=> false,
 					'S_REGISTRATION'	=> true,
@@ -159,7 +157,7 @@ class ucp_register
 		{
 			$timezone = ($is_dst) ? $timezone - 1 : $timezone;
 
-			if (!isset($user->lang['tz_zones'][(string) $timezone]))
+			if (!isset(phpbb::$user->lang['tz_zones'][(string) $timezone]))
 			{
 				$timezone = phpbb::$config['board_timezone'];
 			}
@@ -176,7 +174,7 @@ class ucp_register
 			'password_confirm'	=> request_var('password_confirm', '', true),
 			'email'				=> strtolower(request_var('email', '')),
 			'email_confirm'		=> strtolower(request_var('email_confirm', '')),
-			'lang'				=> basename(request_var('lang', $user->lang_name)),
+			'lang'				=> basename(request_var('lang', phpbb::$user->lang_name)),
 			'tz'				=> request_var('tz', (float) $timezone),
 		);
 
@@ -200,10 +198,10 @@ class ucp_register
 			));
 			if (!check_form_key('ucp_register'))
 			{
-				$error[] = $user->lang['FORM_INVALID'];
+				$error[] = phpbb::$user->lang['FORM_INVALID'];
 			}
 			// Replace "error" strings with their real, localised form
-			$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
+			$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
 
 			if (phpbb::$config['enable_confirm'])
 			{
@@ -218,31 +216,31 @@ class ucp_register
 				}
 				if (phpbb::$config['max_reg_attempts'] && $captcha->get_attempt_count() > phpbb::$config['max_reg_attempts'])
 				{
-					$error[] = $user->lang['TOO_MANY_REGISTERS'];
+					$error[] = phpbb::$user->lang['TOO_MANY_REGISTERS'];
 				}
 			}
 			// DNSBL check
 			if (phpbb::$config['check_dnsbl'])
 			{
-				if (($dnsbl = $user->check_dnsbl('register')) !== false)
+				if (($dnsbl = phpbb::$user->check_dnsbl('register')) !== false)
 				{
-					$error[] = sprintf($user->lang['IP_BLACKLISTED'], $user->ip, $dnsbl[1]);
+					$error[] = sprintf(phpbb::$user->lang['IP_BLACKLISTED'], phpbb::$user->ip, $dnsbl[1]);
 				}
 			}
 
 			// validate custom profile fields
-			$cp->submit_cp_field('register', $user->get_iso_lang_id(), $cp_data, $error);
+			$cp->submit_cp_field('register', phpbb::$user->get_iso_lang_id(), $cp_data, $error);
 
 			if (!sizeof($error))
 			{
 				if ($data['new_password'] != $data['password_confirm'])
 				{
-					$error[] = $user->lang['NEW_PASSWORD_ERROR'];
+					$error[] = phpbb::$user->lang['NEW_PASSWORD_ERROR'];
 				}
 
 				if ($data['email'] != $data['email_confirm'])
 				{
-					$error[] = $user->lang['NEW_EMAIL_ERROR'];
+					$error[] = phpbb::$user->lang['NEW_EMAIL_ERROR'];
 				}
 			}
 
@@ -299,7 +297,7 @@ class ucp_register
 					'user_lang'				=> $data['lang'],
 					'user_type'				=> $user_type,
 					'user_actkey'			=> $user_actkey,
-					'user_ip'				=> $user->ip,
+					'user_ip'				=> phpbb::$user->ip,
 					'user_regdate'			=> time(),
 					'user_inactive_reason'	=> $user_inactive_reason,
 					'user_inactive_time'	=> $user_inactive_time,
@@ -316,22 +314,22 @@ class ucp_register
 
 				if ($coppa && phpbb::$config['email_enable'])
 				{
-					$message = $user->lang['ACCOUNT_COPPA'];
+					$message = phpbb::$user->lang['ACCOUNT_COPPA'];
 					$email_template = 'coppa_welcome_inactive';
 				}
 				else if (phpbb::$config['require_activation'] == USER_ACTIVATION_SELF && phpbb::$config['email_enable'])
 				{
-					$message = $user->lang['ACCOUNT_INACTIVE'];
+					$message = phpbb::$user->lang['ACCOUNT_INACTIVE'];
 					$email_template = 'user_welcome_inactive';
 				}
 				else if (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN && phpbb::$config['email_enable'])
 				{
-					$message = $user->lang['ACCOUNT_INACTIVE_ADMIN'];
+					$message = phpbb::$user->lang['ACCOUNT_INACTIVE_ADMIN'];
 					$email_template = 'admin_welcome_inactive';
 				}
 				else
 				{
-					$message = $user->lang['ACCOUNT_ADDED'];
+					$message = phpbb::$user->lang['ACCOUNT_ADDED'];
 					$email_template = 'user_welcome';
 				}
 
@@ -346,12 +344,12 @@ class ucp_register
 					$messenger->to($data['email'], $data['username']);
 
 					$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-					$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-					$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-					$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+					$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
+					$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
+					$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
 
 					$messenger->assign_vars(array(
-						'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], phpbb::$config['sitename'])),
+						'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf(phpbb::$user->lang['WELCOME_SUBJECT'], phpbb::$config['sitename'])),
 						'USERNAME'		=> htmlspecialchars_decode($data['username']),
 						'PASSWORD'		=> htmlspecialchars_decode($data['new_password']),
 						'U_ACTIVATE'	=> "$server_url/ucp." . PHP_EXT . "?mode=activate&u=$user_id&k=$user_actkey")
@@ -405,7 +403,7 @@ class ucp_register
 					}
 				}
 
-				$message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
+				$message = $message . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
 				trigger_error($message);
 			}
 		}
@@ -437,7 +435,7 @@ class ucp_register
 			}
 
 			$template->assign_vars(array(
-				'L_CONFIRM_EXPLAIN'		=> sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars(phpbb::$config['board_contact']) . '">', '</a>'),
+				'L_CONFIRM_EXPLAIN'		=> sprintf(phpbb::$user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars(phpbb::$config['board_contact']) . '">', '</a>'),
 				'S_CAPTCHA'				=> $captcha->get_template(),
 			));
 		}
@@ -447,11 +445,11 @@ class ucp_register
 		switch (phpbb::$config['require_activation'])
 		{
 			case USER_ACTIVATION_SELF:
-				$l_reg_cond = $user->lang['UCP_EMAIL_ACTIVATE'];
+				$l_reg_cond = phpbb::$user->lang['UCP_EMAIL_ACTIVATE'];
 			break;
 
 			case USER_ACTIVATION_ADMIN:
-				$l_reg_cond = $user->lang['UCP_ADMIN_ACTIVATE'];
+				$l_reg_cond = phpbb::$user->lang['UCP_ADMIN_ACTIVATE'];
 			break;
 		}
 
@@ -464,8 +462,8 @@ class ucp_register
 			'EMAIL_CONFIRM'		=> $data['email_confirm'],
 
 			'L_REG_COND'				=> $l_reg_cond,
-			'L_USERNAME_EXPLAIN'		=> sprintf($user->lang[phpbb::$config['allow_name_chars'] . '_EXPLAIN'], phpbb::$config['min_name_chars'], phpbb::$config['max_name_chars']),
-			'L_PASSWORD_EXPLAIN'		=> sprintf($user->lang[phpbb::$config['pass_complex'] . '_EXPLAIN'], phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
+			'L_USERNAME_EXPLAIN'		=> sprintf(phpbb::$user->lang[phpbb::$config['allow_name_chars'] . '_EXPLAIN'], phpbb::$config['min_name_chars'], phpbb::$config['max_name_chars']),
+			'L_PASSWORD_EXPLAIN'		=> sprintf(phpbb::$user->lang[phpbb::$config['pass_complex'] . '_EXPLAIN'], phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
 
 			'S_LANG_OPTIONS'	=> language_select($data['lang']),
 			'S_TZ_OPTIONS'		=> tz_select($data['tz']),
@@ -476,10 +474,10 @@ class ucp_register
 		);
 
 		//
-		$user->profile_fields = array();
+		phpbb::$user->profile_fields = array();
 
 		// Generate profile fields -> Template Block Variable profile_fields
-		$cp->generate_profile_fields('register', $user->get_iso_lang_id());
+		$cp->generate_profile_fields('register', phpbb::$user->get_iso_lang_id());
 
 		//
 		$this->tpl_name = 'ucp_register';
diff --git a/phpBB/modules/ucp/ucp_remind.php b/phpBB/modules/ucp/ucp_remind.php
index 2a921a52b2..378fa49f08 100644
--- a/phpBB/modules/ucp/ucp_remind.php
+++ b/phpBB/modules/ucp/ucp_remind.php
@@ -27,8 +27,6 @@ class ucp_remind
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template;
-
 		$username	= request_var('username', '', true);
 		$email		= strtolower(request_var('email', ''));
 		$submit		= phpbb_request::is_set_post('submit');
@@ -106,7 +104,7 @@ class ucp_remind
 
 			meta_refresh(3, append_sid('index'));
 
-			$message = $user->lang['PASSWORD_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
+			$message = phpbb::$user->lang['PASSWORD_UPDATED'] . '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
 			trigger_error($message);
 		}
 
diff --git a/phpBB/modules/ucp/ucp_resend.php b/phpBB/modules/ucp/ucp_resend.php
index cde79ccabd..ad58fd4c4d 100644
--- a/phpBB/modules/ucp/ucp_resend.php
+++ b/phpBB/modules/ucp/ucp_resend.php
@@ -27,8 +27,6 @@ class ucp_resend
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template;
-
 		$username	= request_var('username', '', true);
 		$email		= strtolower(request_var('email', ''));
 		$submit		= phpbb_request::is_set_post('submit');
@@ -94,12 +92,12 @@ class ucp_resend
 				$messenger->to($user_row['user_email'], $user_row['username']);
 
 				$messenger->headers('X-AntiAbuse: Board servername - ' . phpbb::$config['server_name']);
-				$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
-				$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
-				$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+				$messenger->headers('X-AntiAbuse: User_id - ' . phpbb::$user->data['user_id']);
+				$messenger->headers('X-AntiAbuse: Username - ' . phpbb::$user->data['username']);
+				$messenger->headers('X-AntiAbuse: User IP - ' . phpbb::$user->ip);
 
 				$messenger->assign_vars(array(
-					'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], phpbb::$config['sitename'])),
+					'WELCOME_MSG'	=> htmlspecialchars_decode(sprintf(phpbb::$user->lang['WELCOME_SUBJECT'], phpbb::$config['sitename'])),
 					'USERNAME'		=> htmlspecialchars_decode($user_row['username']),
 					'U_ACTIVATE'	=> generate_board_url() . '/ucp.' . PHP_EXT . "?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}")
 				);
@@ -145,8 +143,8 @@ class ucp_resend
 
 			meta_refresh(3, append_sid('index'));
 
-			$message = (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN) ? $user->lang['ACIVATION_EMAIL_SENT_ADMIN'] : $user->lang['ACTIVATION_EMAIL_SENT'];
-			$message .= '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
+			$message = (phpbb::$config['require_activation'] == USER_ACTIVATION_ADMIN) ? phpbb::$user->lang['ACIVATION_EMAIL_SENT_ADMIN'] : phpbb::$user->lang['ACTIVATION_EMAIL_SENT'];
+			$message .= '<br /><br />' . sprintf(phpbb::$user->lang['RETURN_INDEX'], '<a href="' . append_sid('index') . '">', '</a>');
 			trigger_error($message);
 		}
 
diff --git a/phpBB/modules/ucp/ucp_zebra.php b/phpBB/modules/ucp/ucp_zebra.php
index 060aa7d9a7..9ee73dbc76 100644
--- a/phpBB/modules/ucp/ucp_zebra.php
+++ b/phpBB/modules/ucp/ucp_zebra.php
@@ -26,8 +26,6 @@ class ucp_zebra
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template;
-
 		$submit = phpbb_request::is_set_post('submit') || phpbb_request::is_set('add', phpbb_request::GET) || phpbb_request::is_set('remove', phpbb_request::GET);
 		$s_hidden_fields = '';
 
@@ -62,7 +60,7 @@ class ucp_zebra
 						// may lead to complaints
 						$sql = 'SELECT z.*, u.username, u.username_clean
 							FROM ' . ZEBRA_TABLE . ' z, ' . USERS_TABLE . ' u
-							WHERE z.user_id = ' . $user->data['user_id'] . '
+							WHERE z.user_id = ' . phpbb::$user->data['user_id'] . '
 								AND u.user_id = z.zebra_id';
 						$result = $db->sql_query($sql);
 
@@ -86,7 +84,7 @@ class ucp_zebra
 
 						if (sizeof($data['add']) < $n && $mode == 'foes')
 						{
-							$error[] = $user->lang['NOT_ADDED_FOES_FRIENDS'];
+							$error[] = phpbb::$user->lang['NOT_ADDED_FOES_FRIENDS'];
 						}
 
 						// remove foes from the username array
@@ -95,16 +93,16 @@ class ucp_zebra
 
 						if (sizeof($data['add']) < $n && $mode == 'friends')
 						{
-							$error[] = $user->lang['NOT_ADDED_FRIENDS_FOES'];
+							$error[] = phpbb::$user->lang['NOT_ADDED_FRIENDS_FOES'];
 						}
 
 						// remove the user himself from the username array
 						$n = sizeof($data['add']);
-						$data['add'] = array_diff($data['add'], array(utf8_clean_string($user->data['username'])));
+						$data['add'] = array_diff($data['add'], array(utf8_clean_string(phpbb::$user->data['username'])));
 
 						if (sizeof($data['add']) < $n)
 						{
-							$error[] = $user->lang['NOT_ADDED_' . $l_mode . '_SELF'];
+							$error[] = phpbb::$user->lang['NOT_ADDED_' . $l_mode . '_SELF'];
 						}
 
 						unset($friends, $foes, $n);
@@ -126,7 +124,7 @@ class ucp_zebra
 								}
 								else
 								{
-									$error[] = $user->lang['NOT_ADDED_' . $l_mode . '_ANONYMOUS'];
+									$error[] = phpbb::$user->lang['NOT_ADDED_' . $l_mode . '_ANONYMOUS'];
 								}
 							}
 							$db->sql_freeresult($result);
@@ -149,7 +147,7 @@ class ucp_zebra
 
 									if (sizeof($perms))
 									{
-										$error[] = $user->lang['NOT_ADDED_FOES_MOD_ADMIN'];
+										$error[] = phpbb::$user->lang['NOT_ADDED_FOES_MOD_ADMIN'];
 									}
 
 									// This may not be right ... it may yield true when perms equate to deny
@@ -165,7 +163,7 @@ class ucp_zebra
 									foreach ($user_id_ary as $zebra_id)
 									{
 										$sql_ary[] = array(
-											'user_id'		=> (int) $user->data['user_id'],
+											'user_id'		=> (int) phpbb::$user->data['user_id'],
 											'zebra_id'		=> (int) $zebra_id,
 											$sql_mode		=> 1
 										);
@@ -179,7 +177,7 @@ class ucp_zebra
 							}
 							else if (!sizeof($error))
 							{
-								$error[] = $user->lang['USER_NOT_FOUND_OR_INACTIVE'];
+								$error[] = phpbb::$user->lang['USER_NOT_FOUND_OR_INACTIVE'];
 							}
 						}
 					}
@@ -189,7 +187,7 @@ class ucp_zebra
 						$data['usernames'] = array_map('intval', $data['usernames']);
 
 						$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
-							WHERE user_id = ' . $user->data['user_id'] . '
+							WHERE user_id = ' . phpbb::$user->data['user_id'] . '
 								AND ' . $db->sql_in_set('zebra_id', $data['usernames']);
 						$db->sql_query($sql);
 
@@ -199,7 +197,7 @@ class ucp_zebra
 					if ($updated)
 					{
 						meta_refresh(3, $this->u_action);
-						$message = $user->lang[$l_mode . '_UPDATED'] . '<br />' . implode('<br />', $error) . ((sizeof($error)) ? '<br />' : '') . '<br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						$message = phpbb::$user->lang[$l_mode . '_UPDATED'] . '<br />' . implode('<br />', $error) . ((sizeof($error)) ? '<br />' : '') . '<br />' . sprintf(phpbb::$user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
 						trigger_error($message);
 					}
 					else
@@ -209,7 +207,7 @@ class ucp_zebra
 				}
 				else
 				{
-					confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+					confirm_box(false, phpbb::$user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
 						'mode'		=> $mode,
 						'submit'	=> true,
 						'usernames'	=> $data['usernames'],
@@ -222,7 +220,7 @@ class ucp_zebra
 		$sql_and = ($mode == 'friends') ? 'z.friend = 1' : 'z.foe = 1';
 		$sql = 'SELECT z.*, u.username, u.username_clean
 			FROM ' . ZEBRA_TABLE . ' z, ' . USERS_TABLE . ' u
-			WHERE z.user_id = ' . $user->data['user_id'] . "
+			WHERE z.user_id = ' . phpbb::$user->data['user_id'] . "
 				AND $sql_and
 				AND u.user_id = z.zebra_id
 			ORDER BY u.username_clean ASC";
@@ -236,7 +234,7 @@ class ucp_zebra
 		$db->sql_freeresult($result);
 
 		$template->assign_vars(array(
-			'L_TITLE'			=> $user->lang['UCP_ZEBRA_' . $l_mode],
+			'L_TITLE'			=> phpbb::$user->lang['UCP_ZEBRA_' . $l_mode],
 
 			'U_FIND_USERNAME'	=> append_sid('memberlist', 'mode=searchuser&amp;form=ucp&amp;field=add'),