9 files changed, 1855 insertions, 67 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 04bb565f6f..449ce55e0f 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -659,6 +659,13 @@ class acp_board
 				$auth_tpl = $provider->get_acp_template($this->new_config);
 				if ($auth_tpl)
 				{
+					if (array_key_exists('BLOCK_VAR_NAME', $auth_tpl))
+					{
+						foreach ($auth_tpl['BLOCK_VARS'] as $block_vars)
+						{
+							$template->assign_block_vars($auth_tpl['BLOCK_VAR_NAME'], $block_vars);
+						}
+					}
 					$template->assign_vars($auth_tpl['TEMPLATE_VARS']);
 					$template->assign_block_vars('auth_tpl', array(
 						'TEMPLATE_FILE'	=> $auth_tpl['TEMPLATE_FILE'],
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index c1f4c6ac0e..ae55a71e50 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -61,6 +61,7 @@ define('LOGIN_CONTINUE', 1);
 define('LOGIN_BREAK', 2);
 define('LOGIN_SUCCESS', 3);
 define('LOGIN_SUCCESS_CREATE_PROFILE', 20);
+define('LOGIN_SUCCESS_LINK_PROFILE', 21);
 define('LOGIN_ERROR_USERNAME', 10);
 define('LOGIN_ERROR_PASSWORD', 11);
 define('LOGIN_ERROR_ACTIVE', 12);
diff --git a/phpBB/includes/db/schema_data.php b/phpBB/includes/db/schema_data.php
new file mode 100644
index 0000000000..69d39e0f8c
--- /dev/null
+++ b/phpBB/includes/db/schema_data.php
@@ -0,0 +1,1219 @@
+<?php
+/**
+*
+* @package dbal
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+$schema_data = array();
+
+/**
+* Define the basic structure
+* The format:
+*		array('{TABLE_NAME}' => {TABLE_DATA})
+*		{TABLE_DATA}:
+*			COLUMNS = array({column_name} = array({column_type}, {default}, {auto_increment}))
+*			PRIMARY_KEY = {column_name(s)}
+*			KEYS = array({key_name} = array({key_type}, {column_name(s)})),
+*
+*	Column Types:
+*	INT:x		=> SIGNED int(x)
+*	BINT		=> BIGINT
+*	UINT		=> mediumint(8) UNSIGNED
+*	UINT:x		=> int(x) UNSIGNED
+*	TINT:x		=> tinyint(x)
+*	USINT		=> smallint(4) UNSIGNED (for _order columns)
+*	BOOL		=> tinyint(1) UNSIGNED
+*	VCHAR		=> varchar(255)
+*	CHAR:x		=> char(x)
+*	XSTEXT_UNI	=> text for storing 100 characters (topic_title for example)
+*	STEXT_UNI	=> text for storing 255 characters (normal input field with a max of 255 single-byte chars) - same as VCHAR_UNI
+*	TEXT_UNI	=> text for storing 3000 characters (short text, descriptions, comments, etc.)
+*	MTEXT_UNI	=> mediumtext (post text, large text)
+*	VCHAR:x		=> varchar(x)
+*	TIMESTAMP	=> int(11) UNSIGNED
+*	DECIMAL		=> decimal number (5,2)
+*	DECIMAL:	=> decimal number (x,2)
+*	PDECIMAL	=> precision decimal number (6,3)
+*	PDECIMAL:	=> precision decimal number (x,3)
+*	VCHAR_UNI	=> varchar(255) BINARY
+*	VCHAR_CI	=> varchar_ci for postgresql, others VCHAR
+*/
+$schema_data['phpbb_attachments'] = array(
+	'COLUMNS'		=> array(
+		'attach_id'			=> array('UINT', NULL, 'auto_increment'),
+		'post_msg_id'		=> array('UINT', 0),
+		'topic_id'			=> array('UINT', 0),
+		'in_message'		=> array('BOOL', 0),
+		'poster_id'			=> array('UINT', 0),
+		'is_orphan'			=> array('BOOL', 1),
+		'physical_filename'	=> array('VCHAR', ''),
+		'real_filename'		=> array('VCHAR', ''),
+		'download_count'	=> array('UINT', 0),
+		'attach_comment'	=> array('TEXT_UNI', ''),
+		'extension'			=> array('VCHAR:100', ''),
+		'mimetype'			=> array('VCHAR:100', ''),
+		'filesize'			=> array('UINT:20', 0),
+		'filetime'			=> array('TIMESTAMP', 0),
+		'thumbnail'			=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> 'attach_id',
+	'KEYS'			=> array(
+		'filetime'			=> array('INDEX', 'filetime'),
+		'post_msg_id'		=> array('INDEX', 'post_msg_id'),
+		'topic_id'			=> array('INDEX', 'topic_id'),
+		'poster_id'			=> array('INDEX', 'poster_id'),
+		'is_orphan'			=> array('INDEX', 'is_orphan'),
+	),
+);
+
+$schema_data['phpbb_acl_groups'] = array(
+	'COLUMNS'		=> array(
+		'group_id'			=> array('UINT', 0),
+		'forum_id'			=> array('UINT', 0),
+		'auth_option_id'	=> array('UINT', 0),
+		'auth_role_id'		=> array('UINT', 0),
+		'auth_setting'		=> array('TINT:2', 0),
+	),
+	'KEYS'			=> array(
+		'group_id'		=> array('INDEX', 'group_id'),
+		'auth_opt_id'	=> array('INDEX', 'auth_option_id'),
+		'auth_role_id'	=> array('INDEX', 'auth_role_id'),
+	),
+);
+
+$schema_data['phpbb_acl_options'] = array(
+	'COLUMNS'		=> array(
+		'auth_option_id'	=> array('UINT', NULL, 'auto_increment'),
+		'auth_option'		=> array('VCHAR:50', ''),
+		'is_global'			=> array('BOOL', 0),
+		'is_local'			=> array('BOOL', 0),
+		'founder_only'		=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> 'auth_option_id',
+	'KEYS'			=> array(
+		'auth_option'		=> array('UNIQUE', 'auth_option'),
+	),
+);
+
+$schema_data['phpbb_acl_roles'] = array(
+	'COLUMNS'		=> array(
+		'role_id'			=> array('UINT', NULL, 'auto_increment'),
+		'role_name'			=> array('VCHAR_UNI', ''),
+		'role_description'	=> array('TEXT_UNI', ''),
+		'role_type'			=> array('VCHAR:10', ''),
+		'role_order'		=> array('USINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'role_id',
+	'KEYS'			=> array(
+		'role_type'			=> array('INDEX', 'role_type'),
+		'role_order'		=> array('INDEX', 'role_order'),
+	),
+);
+
+$schema_data['phpbb_acl_roles_data'] = array(
+	'COLUMNS'		=> array(
+		'role_id'			=> array('UINT', 0),
+		'auth_option_id'	=> array('UINT', 0),
+		'auth_setting'		=> array('TINT:2', 0),
+	),
+	'PRIMARY_KEY'	=> array('role_id', 'auth_option_id'),
+	'KEYS'			=> array(
+		'ath_op_id'			=> array('INDEX', 'auth_option_id'),
+	),
+);
+
+$schema_data['phpbb_acl_users'] = array(
+	'COLUMNS'		=> array(
+		'user_id'			=> array('UINT', 0),
+		'forum_id'			=> array('UINT', 0),
+		'auth_option_id'	=> array('UINT', 0),
+		'auth_role_id'		=> array('UINT', 0),
+		'auth_setting'		=> array('TINT:2', 0),
+	),
+	'KEYS'			=> array(
+		'user_id'			=> array('INDEX', 'user_id'),
+		'auth_option_id'	=> array('INDEX', 'auth_option_id'),
+		'auth_role_id'		=> array('INDEX', 'auth_role_id'),
+	),
+);
+
+$schema_data['phpbb_banlist'] = array(
+	'COLUMNS'		=> array(
+		'ban_id'			=> array('UINT', NULL, 'auto_increment'),
+		'ban_userid'		=> array('UINT', 0),
+		'ban_ip'			=> array('VCHAR:40', ''),
+		'ban_email'			=> array('VCHAR_UNI:100', ''),
+		'ban_start'			=> array('TIMESTAMP', 0),
+		'ban_end'			=> array('TIMESTAMP', 0),
+		'ban_exclude'		=> array('BOOL', 0),
+		'ban_reason'		=> array('VCHAR_UNI', ''),
+		'ban_give_reason'	=> array('VCHAR_UNI', ''),
+	),
+	'PRIMARY_KEY'			=> 'ban_id',
+	'KEYS'			=> array(
+		'ban_end'			=> array('INDEX', 'ban_end'),
+		'ban_user'			=> array('INDEX', array('ban_userid', 'ban_exclude')),
+		'ban_email'			=> array('INDEX', array('ban_email', 'ban_exclude')),
+		'ban_ip'			=> array('INDEX', array('ban_ip', 'ban_exclude')),
+	),
+);
+
+$schema_data['phpbb_bbcodes'] = array(
+	'COLUMNS'		=> array(
+		'bbcode_id'				=> array('USINT', 0),
+		'bbcode_tag'			=> array('VCHAR:16', ''),
+		'bbcode_helpline'		=> array('VCHAR_UNI', ''),
+		'display_on_posting'	=> array('BOOL', 0),
+		'bbcode_match'			=> array('TEXT_UNI', ''),
+		'bbcode_tpl'			=> array('MTEXT_UNI', ''),
+		'first_pass_match'		=> array('MTEXT_UNI', ''),
+		'first_pass_replace'	=> array('MTEXT_UNI', ''),
+		'second_pass_match'		=> array('MTEXT_UNI', ''),
+		'second_pass_replace'	=> array('MTEXT_UNI', ''),
+	),
+	'PRIMARY_KEY'	=> 'bbcode_id',
+	'KEYS'			=> array(
+		'display_on_post'		=> array('INDEX', 'display_on_posting'),
+	),
+);
+
+$schema_data['phpbb_bookmarks'] = array(
+	'COLUMNS'		=> array(
+		'topic_id'			=> array('UINT', 0),
+		'user_id'			=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'			=> array('topic_id', 'user_id'),
+);
+
+$schema_data['phpbb_bots'] = array(
+	'COLUMNS'		=> array(
+		'bot_id'			=> array('UINT', NULL, 'auto_increment'),
+		'bot_active'		=> array('BOOL', 1),
+		'bot_name'			=> array('STEXT_UNI', ''),
+		'user_id'			=> array('UINT', 0),
+		'bot_agent'			=> array('VCHAR', ''),
+		'bot_ip'			=> array('VCHAR', ''),
+	),
+	'PRIMARY_KEY'	=> 'bot_id',
+	'KEYS'			=> array(
+		'bot_active'		=> array('INDEX', 'bot_active'),
+	),
+);
+
+$schema_data['phpbb_config'] = array(
+	'COLUMNS'		=> array(
+		'config_name'		=> array('VCHAR', ''),
+		'config_value'		=> array('VCHAR_UNI', ''),
+		'is_dynamic'		=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> 'config_name',
+	'KEYS'			=> array(
+		'is_dynamic'		=> array('INDEX', 'is_dynamic'),
+	),
+);
+
+$schema_data['phpbb_config_text'] = array(
+	'COLUMNS'		=> array(
+		'config_name'		=> array('VCHAR', ''),
+		'config_value'		=> array('MTEXT', ''),
+	),
+	'PRIMARY_KEY'	=> 'config_name',
+);
+
+$schema_data['phpbb_confirm'] = array(
+	'COLUMNS'		=> array(
+		'confirm_id'		=> array('CHAR:32', ''),
+		'session_id'		=> array('CHAR:32', ''),
+		'confirm_type'		=> array('TINT:3', 0),
+		'code'				=> array('VCHAR:8', ''),
+		'seed'				=> array('UINT:10', 0),
+		'attempts'			=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> array('session_id', 'confirm_id'),
+	'KEYS'			=> array(
+		'confirm_type'		=> array('INDEX', 'confirm_type'),
+	),
+);
+
+$schema_data['phpbb_disallow'] = array(
+	'COLUMNS'		=> array(
+		'disallow_id'		=> array('UINT', NULL, 'auto_increment'),
+		'disallow_username'	=> array('VCHAR_UNI:255', ''),
+	),
+	'PRIMARY_KEY'	=> 'disallow_id',
+);
+
+$schema_data['phpbb_drafts'] = array(
+	'COLUMNS'		=> array(
+		'draft_id'			=> array('UINT', NULL, 'auto_increment'),
+		'user_id'			=> array('UINT', 0),
+		'topic_id'			=> array('UINT', 0),
+		'forum_id'			=> array('UINT', 0),
+		'save_time'			=> array('TIMESTAMP', 0),
+		'draft_subject'		=> array('STEXT_UNI', ''),
+		'draft_message'		=> array('MTEXT_UNI', ''),
+	),
+	'PRIMARY_KEY'	=> 'draft_id',
+	'KEYS'			=> array(
+		'save_time'			=> array('INDEX', 'save_time'),
+	),
+);
+
+$schema_data['phpbb_ext'] = array(
+	'COLUMNS'		=> array(
+		'ext_name'				=> array('VCHAR', ''),
+		'ext_active'			=> array('BOOL', 0),
+		'ext_state'				=> array('TEXT', ''),
+	),
+	'KEYS'			=> array(
+		'ext_name'				=> array('UNIQUE', 'ext_name'),
+	),
+);
+
+$schema_data['phpbb_extensions'] = array(
+	'COLUMNS'		=> array(
+		'extension_id'		=> array('UINT', NULL, 'auto_increment'),
+		'group_id'			=> array('UINT', 0),
+		'extension'			=> array('VCHAR:100', ''),
+	),
+	'PRIMARY_KEY'	=> 'extension_id',
+);
+
+$schema_data['phpbb_extension_groups'] = array(
+	'COLUMNS'		=> array(
+		'group_id'			=> array('UINT', NULL, 'auto_increment'),
+		'group_name'		=> array('VCHAR_UNI', ''),
+		'cat_id'			=> array('TINT:2', 0),
+		'allow_group'		=> array('BOOL', 0),
+		'download_mode'		=> array('BOOL', 1),
+		'upload_icon'		=> array('VCHAR', ''),
+		'max_filesize'		=> array('UINT:20', 0),
+		'allowed_forums'	=> array('TEXT', ''),
+		'allow_in_pm'		=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> 'group_id',
+);
+
+$schema_data['phpbb_forums'] = array(
+	'COLUMNS'		=> array(
+		'forum_id'				=> array('UINT', NULL, 'auto_increment'),
+		'parent_id'				=> array('UINT', 0),
+		'left_id'				=> array('UINT', 0),
+		'right_id'				=> array('UINT', 0),
+		'forum_parents'			=> array('MTEXT', ''),
+		'forum_name'			=> array('STEXT_UNI', ''),
+		'forum_desc'			=> array('TEXT_UNI', ''),
+		'forum_desc_bitfield'	=> array('VCHAR:255', ''),
+		'forum_desc_options'	=> array('UINT:11', 7),
+		'forum_desc_uid'		=> array('VCHAR:8', ''),
+		'forum_link'			=> array('VCHAR_UNI', ''),
+		'forum_password'		=> array('VCHAR_UNI:40', ''),
+		'forum_style'			=> array('UINT', 0),
+		'forum_image'			=> array('VCHAR', ''),
+		'forum_rules'			=> array('TEXT_UNI', ''),
+		'forum_rules_link'		=> array('VCHAR_UNI', ''),
+		'forum_rules_bitfield'	=> array('VCHAR:255', ''),
+		'forum_rules_options'	=> array('UINT:11', 7),
+		'forum_rules_uid'		=> array('VCHAR:8', ''),
+		'forum_topics_per_page'	=> array('TINT:4', 0),
+		'forum_type'			=> array('TINT:4', 0),
+		'forum_status'			=> array('TINT:4', 0),
+		'forum_posts_approved'		=> array('UINT', 0),
+		'forum_posts_unapproved'	=> array('UINT', 0),
+		'forum_posts_softdeleted'	=> array('UINT', 0),
+		'forum_topics_approved'		=> array('UINT', 0),
+		'forum_topics_unapproved'	=> array('UINT', 0),
+		'forum_topics_softdeleted'	=> array('UINT', 0),
+		'forum_last_post_id'	=> array('UINT', 0),
+		'forum_last_poster_id'	=> array('UINT', 0),
+		'forum_last_post_subject' => array('STEXT_UNI', ''),
+		'forum_last_post_time'	=> array('TIMESTAMP', 0),
+		'forum_last_poster_name'=> array('VCHAR_UNI', ''),
+		'forum_last_poster_colour'=> array('VCHAR:6', ''),
+		'forum_flags'			=> array('TINT:4', 32),
+		'forum_options'			=> array('UINT:20', 0),
+		'display_subforum_list'	=> array('BOOL', 1),
+		'display_on_index'		=> array('BOOL', 1),
+		'enable_indexing'		=> array('BOOL', 1),
+		'enable_icons'			=> array('BOOL', 1),
+		'enable_prune'			=> array('BOOL', 0),
+		'prune_next'			=> array('TIMESTAMP', 0),
+		'prune_days'			=> array('UINT', 0),
+		'prune_viewed'			=> array('UINT', 0),
+		'prune_freq'			=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'forum_id',
+	'KEYS'			=> array(
+		'left_right_id'			=> array('INDEX', array('left_id', 'right_id')),
+		'forum_lastpost_id'		=> array('INDEX', 'forum_last_post_id'),
+	),
+);
+
+$schema_data['phpbb_forums_access'] = array(
+	'COLUMNS'		=> array(
+		'forum_id'				=> array('UINT', 0),
+		'user_id'				=> array('UINT', 0),
+		'session_id'			=> array('CHAR:32', ''),
+	),
+	'PRIMARY_KEY'	=> array('forum_id', 'user_id', 'session_id'),
+);
+
+$schema_data['phpbb_forums_track'] = array(
+	'COLUMNS'		=> array(
+		'user_id'				=> array('UINT', 0),
+		'forum_id'				=> array('UINT', 0),
+		'mark_time'				=> array('TIMESTAMP', 0),
+	),
+	'PRIMARY_KEY'	=> array('user_id', 'forum_id'),
+);
+
+$schema_data['phpbb_forums_watch'] = array(
+	'COLUMNS'		=> array(
+		'forum_id'				=> array('UINT', 0),
+		'user_id'				=> array('UINT', 0),
+		'notify_status'			=> array('BOOL', 0),
+	),
+	'KEYS'			=> array(
+		'forum_id'				=> array('INDEX', 'forum_id'),
+		'user_id'				=> array('INDEX', 'user_id'),
+		'notify_stat'			=> array('INDEX', 'notify_status'),
+	),
+);
+
+$schema_data['phpbb_groups'] = array(
+	'COLUMNS'		=> array(
+		'group_id'				=> array('UINT', NULL, 'auto_increment'),
+		'group_type'			=> array('TINT:4', 1),
+		'group_founder_manage'	=> array('BOOL', 0),
+		'group_skip_auth'		=> array('BOOL', 0),
+		'group_name'			=> array('VCHAR_CI', ''),
+		'group_desc'			=> array('TEXT_UNI', ''),
+		'group_desc_bitfield'	=> array('VCHAR:255', ''),
+		'group_desc_options'	=> array('UINT:11', 7),
+		'group_desc_uid'		=> array('VCHAR:8', ''),
+		'group_display'			=> array('BOOL', 0),
+		'group_avatar'			=> array('VCHAR', ''),
+		'group_avatar_type'		=> array('VCHAR:255', ''),
+		'group_avatar_width'	=> array('USINT', 0),
+		'group_avatar_height'	=> array('USINT', 0),
+		'group_rank'			=> array('UINT', 0),
+		'group_colour'			=> array('VCHAR:6', ''),
+		'group_sig_chars'		=> array('UINT', 0),
+		'group_receive_pm'		=> array('BOOL', 0),
+		'group_message_limit'	=> array('UINT', 0),
+		'group_max_recipients'	=> array('UINT', 0),
+		'group_legend'			=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'group_id',
+	'KEYS'			=> array(
+		'group_legend_name'		=> array('INDEX', array('group_legend', 'group_name')),
+	),
+);
+
+$schema_data['phpbb_icons'] = array(
+	'COLUMNS'		=> array(
+		'icons_id'				=> array('UINT', NULL, 'auto_increment'),
+		'icons_url'				=> array('VCHAR', ''),
+		'icons_width'			=> array('TINT:4', 0),
+		'icons_height'			=> array('TINT:4', 0),
+		'icons_order'			=> array('UINT', 0),
+		'display_on_posting'	=> array('BOOL', 1),
+	),
+	'PRIMARY_KEY'	=> 'icons_id',
+	'KEYS'			=> array(
+		'display_on_posting'	=> array('INDEX', 'display_on_posting'),
+	),
+);
+
+$schema_data['phpbb_lang'] = array(
+	'COLUMNS'		=> array(
+		'lang_id'				=> array('TINT:4', NULL, 'auto_increment'),
+		'lang_iso'				=> array('VCHAR:30', ''),
+		'lang_dir'				=> array('VCHAR:30', ''),
+		'lang_english_name'		=> array('VCHAR_UNI:100', ''),
+		'lang_local_name'		=> array('VCHAR_UNI:255', ''),
+		'lang_author'			=> array('VCHAR_UNI:255', ''),
+	),
+	'PRIMARY_KEY'	=> 'lang_id',
+	'KEYS'			=> array(
+		'lang_iso'				=> array('INDEX', 'lang_iso'),
+	),
+);
+
+$schema_data['phpbb_log'] = array(
+	'COLUMNS'		=> array(
+		'log_id'				=> array('UINT', NULL, 'auto_increment'),
+		'log_type'				=> array('TINT:4', 0),
+		'user_id'				=> array('UINT', 0),
+		'forum_id'				=> array('UINT', 0),
+		'topic_id'				=> array('UINT', 0),
+		'reportee_id'			=> array('UINT', 0),
+		'log_ip'				=> array('VCHAR:40', ''),
+		'log_time'				=> array('TIMESTAMP', 0),
+		'log_operation'			=> array('TEXT_UNI', ''),
+		'log_data'				=> array('MTEXT_UNI', ''),
+	),
+	'PRIMARY_KEY'	=> 'log_id',
+	'KEYS'			=> array(
+		'log_type'				=> array('INDEX', 'log_type'),
+		'log_time'				=> array('INDEX', 'log_time'),
+		'forum_id'				=> array('INDEX', 'forum_id'),
+		'topic_id'				=> array('INDEX', 'topic_id'),
+		'reportee_id'			=> array('INDEX', 'reportee_id'),
+		'user_id'				=> array('INDEX', 'user_id'),
+	),
+);
+
+$schema_data['phpbb_login_attempts'] = array(
+	'COLUMNS'		=> array(
+		'attempt_ip'			=> array('VCHAR:40', ''),
+		'attempt_browser'		=> array('VCHAR:150', ''),
+		'attempt_forwarded_for'	=> array('VCHAR:255', ''),
+		'attempt_time'			=> array('TIMESTAMP', 0),
+		'user_id'				=> array('UINT', 0),
+		'username'				=> array('VCHAR_UNI:255', 0),
+		'username_clean'		=> array('VCHAR_CI', 0),
+	),
+	'KEYS'			=> array(
+		'att_ip'				=> array('INDEX', array('attempt_ip', 'attempt_time')),
+		'att_for'		=> array('INDEX', array('attempt_forwarded_for', 'attempt_time')),
+		'att_time'				=> array('INDEX', array('attempt_time')),
+		'user_id'					=> array('INDEX', 'user_id'),
+	),
+);
+
+$schema_data['phpbb_moderator_cache'] = array(
+	'COLUMNS'		=> array(
+		'forum_id'				=> array('UINT', 0),
+		'user_id'				=> array('UINT', 0),
+		'username'				=> array('VCHAR_UNI:255', ''),
+		'group_id'				=> array('UINT', 0),
+		'group_name'			=> array('VCHAR_UNI', ''),
+		'display_on_index'		=> array('BOOL', 1),
+	),
+	'KEYS'			=> array(
+		'disp_idx'				=> array('INDEX', 'display_on_index'),
+		'forum_id'				=> array('INDEX', 'forum_id'),
+	),
+);
+
+$schema_data['phpbb_migrations'] = array(
+	'COLUMNS'		=> array(
+		'migration_name'			=> array('VCHAR', ''),
+		'migration_depends_on'		=> array('TEXT', ''),
+		'migration_schema_done'		=> array('BOOL', 0),
+		'migration_data_done'		=> array('BOOL', 0),
+		'migration_data_state'		=> array('TEXT', ''),
+		'migration_start_time'		=> array('TIMESTAMP', 0),
+		'migration_end_time'		=> array('TIMESTAMP', 0),
+	),
+	'PRIMARY_KEY'	=> 'migration_name',
+);
+
+$schema_data['phpbb_modules'] = array(
+	'COLUMNS'		=> array(
+		'module_id'				=> array('UINT', NULL, 'auto_increment'),
+		'module_enabled'		=> array('BOOL', 1),
+		'module_display'		=> array('BOOL', 1),
+		'module_basename'		=> array('VCHAR', ''),
+		'module_class'			=> array('VCHAR:10', ''),
+		'parent_id'				=> array('UINT', 0),
+		'left_id'				=> array('UINT', 0),
+		'right_id'				=> array('UINT', 0),
+		'module_langname'		=> array('VCHAR', ''),
+		'module_mode'			=> array('VCHAR', ''),
+		'module_auth'			=> array('VCHAR', ''),
+	),
+	'PRIMARY_KEY'	=> 'module_id',
+	'KEYS'			=> array(
+		'left_right_id'			=> array('INDEX', array('left_id', 'right_id')),
+		'module_enabled'		=> array('INDEX', 'module_enabled'),
+		'class_left_id'			=> array('INDEX', array('module_class', 'left_id')),
+	),
+);
+
+$schema_data['phpbb_notification_types'] = array(
+	'COLUMNS'			=> array(
+		'notification_type_id'		=> array('USINT', NULL, 'auto_increment'),
+		'notification_type_name'	=> array('VCHAR:255', ''),
+		'notification_type_enabled'	=> array('BOOL', 1),
+	),
+	'PRIMARY_KEY'		=> array('notification_type_id'),
+	'KEYS'				=> array(
+		'type'			=> array('UNIQUE', array('notification_type_name')),
+	),
+);
+
+$schema_data['phpbb_notifications'] = array(
+	'COLUMNS'			=> array(
+		'notification_id'				=> array('UINT:10', NULL, 'auto_increment'),
+		'notification_type_id'			=> array('USINT', 0),
+		'item_id'						=> array('UINT', 0),
+		'item_parent_id'				=> array('UINT', 0),
+		'user_id'						=> array('UINT', 0),
+		'notification_read'				=> array('BOOL', 0),
+		'notification_time'				=> array('TIMESTAMP', 1),
+		'notification_data'				=> array('TEXT_UNI', ''),
+	),
+	'PRIMARY_KEY'		=> 'notification_id',
+	'KEYS'				=> array(
+		'item_ident'		=> array('INDEX', array('notification_type_id', 'item_id')),
+		'user'				=> array('INDEX', array('user_id', 'notification_read')),
+	),
+);
+
+$schema_data['phpbb_oauth_accounts'] = array(
+	'COLUMNS' => array(
+		'user_id'			=> array('UINT', 0),
+		'provider'			=> array('VCHAR', ''),
+		'oauth_provider_id'	=> array('TEXT_UNI', ''),
+	),
+	'PRIMARY_KEY' => array(
+		'user_id',
+		'provider',
+	),
+);
+
+$schema_data['phpbb_oauth_tokens'] = array(
+	'COLUMNS' => array(
+		'user_id'			=> array('UINT', 0), // phpbb_users.user_id
+		'session_id'		=> array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set
+		'provider'			=> array('VCHAR', ''), // Name of the OAuth provider
+		'oauth_token'		=> array('MTEXT', ''), // Serialized token
+	),
+	'KEYS' => array(
+		'user_id'			=> array('INDEX', 'user_id'),
+		'provider'			=> array('INDEX', 'provider'),
+	),
+);
+
+$schema_data['phpbb_poll_options'] = array(
+	'COLUMNS'		=> array(
+		'poll_option_id'		=> array('TINT:4', 0),
+		'topic_id'				=> array('UINT', 0),
+		'poll_option_text'		=> array('TEXT_UNI', ''),
+		'poll_option_total'		=> array('UINT', 0),
+	),
+	'KEYS'			=> array(
+		'poll_opt_id'			=> array('INDEX', 'poll_option_id'),
+		'topic_id'				=> array('INDEX', 'topic_id'),
+	),
+);
+
+$schema_data['phpbb_poll_votes'] = array(
+	'COLUMNS'		=> array(
+		'topic_id'				=> array('UINT', 0),
+		'poll_option_id'		=> array('TINT:4', 0),
+		'vote_user_id'			=> array('UINT', 0),
+		'vote_user_ip'			=> array('VCHAR:40', ''),
+	),
+	'KEYS'			=> array(
+		'topic_id'				=> array('INDEX', 'topic_id'),
+		'vote_user_id'			=> array('INDEX', 'vote_user_id'),
+		'vote_user_ip'			=> array('INDEX', 'vote_user_ip'),
+	),
+);
+
+$schema_data['phpbb_posts'] = array(
+	'COLUMNS'		=> array(
+		'post_id'				=> array('UINT', NULL, 'auto_increment'),
+		'topic_id'				=> array('UINT', 0),
+		'forum_id'				=> array('UINT', 0),
+		'poster_id'				=> array('UINT', 0),
+		'icon_id'				=> array('UINT', 0),
+		'poster_ip'				=> array('VCHAR:40', ''),
+		'post_time'				=> array('TIMESTAMP', 0),
+		'post_visibility'		=> array('TINT:3', 0),
+		'post_reported'			=> array('BOOL', 0),
+		'enable_bbcode'			=> array('BOOL', 1),
+		'enable_smilies'		=> array('BOOL', 1),
+		'enable_magic_url'		=> array('BOOL', 1),
+		'enable_sig'			=> array('BOOL', 1),
+		'post_username'			=> array('VCHAR_UNI:255', ''),
+		'post_subject'			=> array('STEXT_UNI', '', 'true_sort'),
+		'post_text'				=> array('MTEXT_UNI', ''),
+		'post_checksum'			=> array('VCHAR:32', ''),
+		'post_attachment'		=> array('BOOL', 0),
+		'bbcode_bitfield'		=> array('VCHAR:255', ''),
+		'bbcode_uid'			=> array('VCHAR:8', ''),
+		'post_postcount'		=> array('BOOL', 1),
+		'post_edit_time'		=> array('TIMESTAMP', 0),
+		'post_edit_reason'		=> array('STEXT_UNI', ''),
+		'post_edit_user'		=> array('UINT', 0),
+		'post_edit_count'		=> array('USINT', 0),
+		'post_edit_locked'		=> array('BOOL', 0),
+		'post_delete_time'		=> array('TIMESTAMP', 0),
+		'post_delete_reason'	=> array('STEXT_UNI', ''),
+		'post_delete_user'		=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'post_id',
+	'KEYS'			=> array(
+		'forum_id'				=> array('INDEX', 'forum_id'),
+		'topic_id'				=> array('INDEX', 'topic_id'),
+		'poster_ip'				=> array('INDEX', 'poster_ip'),
+		'poster_id'				=> array('INDEX', 'poster_id'),
+		'post_visibility'		=> array('INDEX', 'post_visibility'),
+		'post_username'			=> array('INDEX', 'post_username'),
+		'tid_post_time'			=> array('INDEX', array('topic_id', 'post_time')),
+	),
+);
+
+$schema_data['phpbb_privmsgs'] = array(
+	'COLUMNS'		=> array(
+		'msg_id'				=> array('UINT', NULL, 'auto_increment'),
+		'root_level'			=> array('UINT', 0),
+		'author_id'				=> array('UINT', 0),
+		'icon_id'				=> array('UINT', 0),
+		'author_ip'				=> array('VCHAR:40', ''),
+		'message_time'			=> array('TIMESTAMP', 0),
+		'enable_bbcode'			=> array('BOOL', 1),
+		'enable_smilies'		=> array('BOOL', 1),
+		'enable_magic_url'		=> array('BOOL', 1),
+		'enable_sig'			=> array('BOOL', 1),
+		'message_subject'		=> array('STEXT_UNI', ''),
+		'message_text'			=> array('MTEXT_UNI', ''),
+		'message_edit_reason'	=> array('STEXT_UNI', ''),
+		'message_edit_user'		=> array('UINT', 0),
+		'message_attachment'	=> array('BOOL', 0),
+		'bbcode_bitfield'		=> array('VCHAR:255', ''),
+		'bbcode_uid'			=> array('VCHAR:8', ''),
+		'message_edit_time'		=> array('TIMESTAMP', 0),
+		'message_edit_count'	=> array('USINT', 0),
+		'to_address'			=> array('TEXT_UNI', ''),
+		'bcc_address'			=> array('TEXT_UNI', ''),
+		'message_reported'		=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> 'msg_id',
+	'KEYS'			=> array(
+		'author_ip'				=> array('INDEX', 'author_ip'),
+		'message_time'			=> array('INDEX', 'message_time'),
+		'author_id'				=> array('INDEX', 'author_id'),
+		'root_level'			=> array('INDEX', 'root_level'),
+	),
+);
+
+$schema_data['phpbb_privmsgs_folder'] = array(
+	'COLUMNS'		=> array(
+		'folder_id'				=> array('UINT', NULL, 'auto_increment'),
+		'user_id'				=> array('UINT', 0),
+		'folder_name'			=> array('VCHAR_UNI', ''),
+		'pm_count'				=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'folder_id',
+	'KEYS'			=> array(
+		'user_id'				=> array('INDEX', 'user_id'),
+	),
+);
+
+$schema_data['phpbb_privmsgs_rules'] = array(
+	'COLUMNS'		=> array(
+		'rule_id'				=> array('UINT', NULL, 'auto_increment'),
+		'user_id'				=> array('UINT', 0),
+		'rule_check'			=> array('UINT', 0),
+		'rule_connection'		=> array('UINT', 0),
+		'rule_string'			=> array('VCHAR_UNI', ''),
+		'rule_user_id'			=> array('UINT', 0),
+		'rule_group_id'			=> array('UINT', 0),
+		'rule_action'			=> array('UINT', 0),
+		'rule_folder_id'		=> array('INT:11', 0),
+	),
+	'PRIMARY_KEY'	=> 'rule_id',
+	'KEYS'			=> array(
+		'user_id'				=> array('INDEX', 'user_id'),
+	),
+);
+
+$schema_data['phpbb_privmsgs_to'] = array(
+	'COLUMNS'		=> array(
+		'msg_id'				=> array('UINT', 0),
+		'user_id'				=> array('UINT', 0),
+		'author_id'				=> array('UINT', 0),
+		'pm_deleted'			=> array('BOOL', 0),
+		'pm_new'				=> array('BOOL', 1),
+		'pm_unread'				=> array('BOOL', 1),
+		'pm_replied'			=> array('BOOL', 0),
+		'pm_marked'				=> array('BOOL', 0),
+		'pm_forwarded'			=> array('BOOL', 0),
+		'folder_id'				=> array('INT:11', 0),
+	),
+	'KEYS'			=> array(
+		'msg_id'				=> array('INDEX', 'msg_id'),
+		'author_id'				=> array('INDEX', 'author_id'),
+		'usr_flder_id'			=> array('INDEX', array('user_id', 'folder_id')),
+	),
+);
+
+$schema_data['phpbb_profile_fields'] = array(
+	'COLUMNS'		=> array(
+		'field_id'				=> array('UINT', NULL, 'auto_increment'),
+		'field_name'			=> array('VCHAR_UNI', ''),
+		'field_type'			=> array('TINT:4', 0),
+		'field_ident'			=> array('VCHAR:20', ''),
+		'field_length'			=> array('VCHAR:20', ''),
+		'field_minlen'			=> array('VCHAR', ''),
+		'field_maxlen'			=> array('VCHAR', ''),
+		'field_novalue'			=> array('VCHAR_UNI', ''),
+		'field_default_value'	=> array('VCHAR_UNI', ''),
+		'field_validation'		=> array('VCHAR_UNI:20', ''),
+		'field_required'		=> array('BOOL', 0),
+		'field_show_novalue'	=> array('BOOL', 0),
+		'field_show_on_reg'		=> array('BOOL', 0),
+		'field_show_on_pm'		=> array('BOOL', 0),
+		'field_show_on_vt'		=> array('BOOL', 0),
+		'field_show_profile'	=> array('BOOL', 0),
+		'field_hide'			=> array('BOOL', 0),
+		'field_no_view'			=> array('BOOL', 0),
+		'field_active'			=> array('BOOL', 0),
+		'field_order'			=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'field_id',
+	'KEYS'			=> array(
+		'fld_type'			=> array('INDEX', 'field_type'),
+		'fld_ordr'			=> array('INDEX', 'field_order'),
+	),
+);
+
+$schema_data['phpbb_profile_fields_data'] = array(
+	'COLUMNS'		=> array(
+		'user_id'				=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'user_id',
+);
+
+$schema_data['phpbb_profile_fields_lang'] = array(
+	'COLUMNS'		=> array(
+		'field_id'				=> array('UINT', 0),
+		'lang_id'				=> array('UINT', 0),
+		'option_id'				=> array('UINT', 0),
+		'field_type'			=> array('TINT:4', 0),
+		'lang_value'			=> array('VCHAR_UNI', ''),
+	),
+	'PRIMARY_KEY'	=> array('field_id', 'lang_id', 'option_id'),
+);
+
+$schema_data['phpbb_profile_lang'] = array(
+	'COLUMNS'		=> array(
+		'field_id'				=> array('UINT', 0),
+		'lang_id'				=> array('UINT', 0),
+		'lang_name'				=> array('VCHAR_UNI', ''),
+		'lang_explain'			=> array('TEXT_UNI', ''),
+		'lang_default_value'	=> array('VCHAR_UNI', ''),
+	),
+	'PRIMARY_KEY'	=> array('field_id', 'lang_id'),
+);
+
+$schema_data['phpbb_ranks'] = array(
+	'COLUMNS'		=> array(
+		'rank_id'				=> array('UINT', NULL, 'auto_increment'),
+		'rank_title'			=> array('VCHAR_UNI', ''),
+		'rank_min'				=> array('UINT', 0),
+		'rank_special'			=> array('BOOL', 0),
+		'rank_image'			=> array('VCHAR', ''),
+	),
+	'PRIMARY_KEY'	=> 'rank_id',
+);
+
+$schema_data['phpbb_reports'] = array(
+	'COLUMNS'		=> array(
+		'report_id'							=> array('UINT', NULL, 'auto_increment'),
+		'reason_id'							=> array('USINT', 0),
+		'post_id'							=> array('UINT', 0),
+		'pm_id'								=> array('UINT', 0),
+		'user_id'							=> array('UINT', 0),
+		'user_notify'						=> array('BOOL', 0),
+		'report_closed'						=> array('BOOL', 0),
+		'report_time'						=> array('TIMESTAMP', 0),
+		'report_text'						=> array('MTEXT_UNI', ''),
+		'reported_post_text'				=> array('MTEXT_UNI', ''),
+		'reported_post_uid'					=> array('VCHAR:8', ''),
+		'reported_post_bitfield'			=> array('VCHAR:255', ''),
+		'reported_post_enable_magic_url'	=> array('BOOL', 1),
+		'reported_post_enable_smilies'		=> array('BOOL', 1),
+		'reported_post_enable_bbcode'		=> array('BOOL', 1)
+	),
+	'PRIMARY_KEY'	=> 'report_id',
+	'KEYS'			=> array(
+		'post_id'			=> array('INDEX', 'post_id'),
+		'pm_id'				=> array('INDEX', 'pm_id'),
+	),
+);
+
+$schema_data['phpbb_reports_reasons'] = array(
+	'COLUMNS'		=> array(
+		'reason_id'				=> array('USINT', NULL, 'auto_increment'),
+		'reason_title'			=> array('VCHAR_UNI', ''),
+		'reason_description'	=> array('MTEXT_UNI', ''),
+		'reason_order'			=> array('USINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'reason_id',
+);
+
+$schema_data['phpbb_search_results'] = array(
+	'COLUMNS'		=> array(
+		'search_key'			=> array('VCHAR:32', ''),
+		'search_time'			=> array('TIMESTAMP', 0),
+		'search_keywords'		=> array('MTEXT_UNI', ''),
+		'search_authors'		=> array('MTEXT', ''),
+	),
+	'PRIMARY_KEY'	=> 'search_key',
+);
+
+$schema_data['phpbb_search_wordlist'] = array(
+	'COLUMNS'		=> array(
+		'word_id'			=> array('UINT', NULL, 'auto_increment'),
+		'word_text'			=> array('VCHAR_UNI', ''),
+		'word_common'		=> array('BOOL', 0),
+		'word_count'		=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'word_id',
+	'KEYS'			=> array(
+		'wrd_txt'			=> array('UNIQUE', 'word_text'),
+		'wrd_cnt'			=> array('INDEX', 'word_count'),
+	),
+);
+
+$schema_data['phpbb_search_wordmatch'] = array(
+	'COLUMNS'		=> array(
+		'post_id'			=> array('UINT', 0),
+		'word_id'			=> array('UINT', 0),
+		'title_match'		=> array('BOOL', 0),
+	),
+	'KEYS'			=> array(
+		'unq_mtch'			=> array('UNIQUE', array('word_id', 'post_id', 'title_match')),
+		'word_id'			=> array('INDEX', 'word_id'),
+		'post_id'			=> array('INDEX', 'post_id'),
+	),
+);
+
+$schema_data['phpbb_sessions'] = array(
+	'COLUMNS'		=> array(
+		'session_id'			=> array('CHAR:32', ''),
+		'session_user_id'		=> array('UINT', 0),
+		'session_forum_id'		=> array('UINT', 0),
+		'session_last_visit'	=> array('TIMESTAMP', 0),
+		'session_start'			=> array('TIMESTAMP', 0),
+		'session_time'			=> array('TIMESTAMP', 0),
+		'session_ip'			=> array('VCHAR:40', ''),
+		'session_browser'		=> array('VCHAR:150', ''),
+		'session_forwarded_for'	=> array('VCHAR:255', ''),
+		'session_page'			=> array('VCHAR_UNI', ''),
+		'session_viewonline'	=> array('BOOL', 1),
+		'session_autologin'		=> array('BOOL', 0),
+		'session_admin'			=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> 'session_id',
+	'KEYS'			=> array(
+		'session_time'		=> array('INDEX', 'session_time'),
+		'session_user_id'	=> array('INDEX', 'session_user_id'),
+		'session_fid'		=> array('INDEX', 'session_forum_id'),
+	),
+);
+
+$schema_data['phpbb_sessions_keys'] = array(
+	'COLUMNS'		=> array(
+		'key_id'			=> array('CHAR:32', ''),
+		'user_id'			=> array('UINT', 0),
+		'last_ip'			=> array('VCHAR:40', ''),
+		'last_login'		=> array('TIMESTAMP', 0),
+	),
+	'PRIMARY_KEY'	=> array('key_id', 'user_id'),
+	'KEYS'			=> array(
+		'last_login'		=> array('INDEX', 'last_login'),
+	),
+);
+
+$schema_data['phpbb_sitelist'] = array(
+	'COLUMNS'		=> array(
+		'site_id'		=> array('UINT', NULL, 'auto_increment'),
+		'site_ip'		=> array('VCHAR:40', ''),
+		'site_hostname'	=> array('VCHAR', ''),
+		'ip_exclude'	=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'		=> 'site_id',
+);
+
+$schema_data['phpbb_smilies'] = array(
+	'COLUMNS'		=> array(
+		'smiley_id'			=> array('UINT', NULL, 'auto_increment'),
+		// We may want to set 'code' to VCHAR:50 or check if unicode support is possible... at the moment only ASCII characters are allowed.
+		'code'				=> array('VCHAR_UNI:50', ''),
+		'emotion'			=> array('VCHAR_UNI:50', ''),
+		'smiley_url'		=> array('VCHAR:50', ''),
+		'smiley_width'		=> array('USINT', 0),
+		'smiley_height'		=> array('USINT', 0),
+		'smiley_order'		=> array('UINT', 0),
+		'display_on_posting'=> array('BOOL', 1),
+	),
+	'PRIMARY_KEY'	=> 'smiley_id',
+	'KEYS'			=> array(
+		'display_on_post'		=> array('INDEX', 'display_on_posting'),
+	),
+);
+
+$schema_data['phpbb_styles'] = array(
+	'COLUMNS'		=> array(
+		'style_id'				=> array('UINT', NULL, 'auto_increment'),
+		'style_name'			=> array('VCHAR_UNI:255', ''),
+		'style_copyright'		=> array('VCHAR_UNI', ''),
+		'style_active'			=> array('BOOL', 1),
+		'style_path'			=> array('VCHAR:100', ''),
+		'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+		'style_parent_id'		=> array('UINT:4', 0),
+		'style_parent_tree'		=> array('TEXT', ''),
+	),
+	'PRIMARY_KEY'	=> 'style_id',
+	'KEYS'			=> array(
+		'style_name'		=> array('UNIQUE', 'style_name'),
+	),
+);
+
+$schema_data['phpbb_teampage'] = array(
+	'COLUMNS'		=> array(
+		'teampage_id'		=> array('UINT', NULL, 'auto_increment'),
+		'group_id'			=> array('UINT', 0),
+		'teampage_name'		=> array('VCHAR_UNI:255', ''),
+		'teampage_position'	=> array('UINT', 0),
+		'teampage_parent'	=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'teampage_id',
+);
+
+$schema_data['phpbb_topics'] = array(
+	'COLUMNS'		=> array(
+		'topic_id'					=> array('UINT', NULL, 'auto_increment'),
+		'forum_id'					=> array('UINT', 0),
+		'icon_id'					=> array('UINT', 0),
+		'topic_attachment'			=> array('BOOL', 0),
+		'topic_visibility'			=> array('TINT:3', 0),
+		'topic_reported'			=> array('BOOL', 0),
+		'topic_title'				=> array('STEXT_UNI', '', 'true_sort'),
+		'topic_poster'				=> array('UINT', 0),
+		'topic_time'				=> array('TIMESTAMP', 0),
+		'topic_time_limit'			=> array('TIMESTAMP', 0),
+		'topic_views'				=> array('UINT', 0),
+		'topic_posts_approved'		=> array('UINT', 0),
+		'topic_posts_unapproved'	=> array('UINT', 0),
+		'topic_posts_softdeleted'	=> array('UINT', 0),
+		'topic_status'				=> array('TINT:3', 0),
+		'topic_type'				=> array('TINT:3', 0),
+		'topic_first_post_id'		=> array('UINT', 0),
+		'topic_first_poster_name'	=> array('VCHAR_UNI', ''),
+		'topic_first_poster_colour'	=> array('VCHAR:6', ''),
+		'topic_last_post_id'		=> array('UINT', 0),
+		'topic_last_poster_id'		=> array('UINT', 0),
+		'topic_last_poster_name'	=> array('VCHAR_UNI', ''),
+		'topic_last_poster_colour'	=> array('VCHAR:6', ''),
+		'topic_last_post_subject'	=> array('STEXT_UNI', ''),
+		'topic_last_post_time'		=> array('TIMESTAMP', 0),
+		'topic_last_view_time'		=> array('TIMESTAMP', 0),
+		'topic_moved_id'			=> array('UINT', 0),
+		'topic_bumped'				=> array('BOOL', 0),
+		'topic_bumper'				=> array('UINT', 0),
+		'poll_title'				=> array('STEXT_UNI', ''),
+		'poll_start'				=> array('TIMESTAMP', 0),
+		'poll_length'				=> array('TIMESTAMP', 0),
+		'poll_max_options'			=> array('TINT:4', 1),
+		'poll_last_vote'			=> array('TIMESTAMP', 0),
+		'poll_vote_change'			=> array('BOOL', 0),
+		'topic_delete_time'			=> array('TIMESTAMP', 0),
+		'topic_delete_reason'		=> array('STEXT_UNI', ''),
+		'topic_delete_user'			=> array('UINT', 0),
+	),
+	'PRIMARY_KEY'	=> 'topic_id',
+	'KEYS'			=> array(
+		'forum_id'			=> array('INDEX', 'forum_id'),
+		'forum_id_type'		=> array('INDEX', array('forum_id', 'topic_type')),
+		'last_post_time'	=> array('INDEX', 'topic_last_post_time'),
+		'topic_visibility'	=> array('INDEX', 'topic_visibility'),
+		'forum_appr_last'	=> array('INDEX', array('forum_id', 'topic_visibility', 'topic_last_post_id')),
+		'fid_time_moved'	=> array('INDEX', array('forum_id', 'topic_last_post_time', 'topic_moved_id')),
+	),
+);
+
+$schema_data['phpbb_topics_track'] = array(
+	'COLUMNS'		=> array(
+		'user_id'			=> array('UINT', 0),
+		'topic_id'			=> array('UINT', 0),
+		'forum_id'			=> array('UINT', 0),
+		'mark_time'			=> array('TIMESTAMP', 0),
+	),
+	'PRIMARY_KEY'	=> array('user_id', 'topic_id'),
+	'KEYS'			=> array(
+		'topic_id'			=> array('INDEX', 'topic_id'),
+		'forum_id'			=> array('INDEX', 'forum_id'),
+	),
+);
+
+$schema_data['phpbb_topics_posted'] = array(
+	'COLUMNS'		=> array(
+		'user_id'			=> array('UINT', 0),
+		'topic_id'			=> array('UINT', 0),
+		'topic_posted'		=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> array('user_id', 'topic_id'),
+);
+
+$schema_data['phpbb_topics_watch'] = array(
+	'COLUMNS'		=> array(
+		'topic_id'			=> array('UINT', 0),
+		'user_id'			=> array('UINT', 0),
+		'notify_status'		=> array('BOOL', 0),
+	),
+	'KEYS'			=> array(
+		'topic_id'			=> array('INDEX', 'topic_id'),
+		'user_id'			=> array('INDEX', 'user_id'),
+		'notify_stat'		=> array('INDEX', 'notify_status'),
+	),
+);
+
+$schema_data['phpbb_user_notifications'] = array(
+	'COLUMNS'		=> array(
+		'item_type'			=> array('VCHAR:255', ''),
+		'item_id'			=> array('UINT', 0),
+		'user_id'			=> array('UINT', 0),
+		'method'			=> array('VCHAR:255', ''),
+		'notify'			=> array('BOOL', 1),
+	),
+);
+
+$schema_data['phpbb_user_group'] = array(
+	'COLUMNS'		=> array(
+		'group_id'			=> array('UINT', 0),
+		'user_id'			=> array('UINT', 0),
+		'group_leader'		=> array('BOOL', 0),
+		'user_pending'		=> array('BOOL', 1),
+	),
+	'KEYS'			=> array(
+		'group_id'			=> array('INDEX', 'group_id'),
+		'user_id'			=> array('INDEX', 'user_id'),
+		'group_leader'		=> array('INDEX', 'group_leader'),
+	),
+);
+
+$schema_data['phpbb_users'] = array(
+	'COLUMNS'		=> array(
+		'user_id'					=> array('UINT', NULL, 'auto_increment'),
+		'user_type'					=> array('TINT:2', 0),
+		'group_id'					=> array('UINT', 3),
+		'user_permissions'			=> array('MTEXT', ''),
+		'user_perm_from'			=> array('UINT', 0),
+		'user_ip'					=> array('VCHAR:40', ''),
+		'user_regdate'				=> array('TIMESTAMP', 0),
+		'username'					=> array('VCHAR_CI', ''),
+		'username_clean'			=> array('VCHAR_CI', ''),
+		'user_password'				=> array('VCHAR_UNI:40', ''),
+		'user_passchg'				=> array('TIMESTAMP', 0),
+		'user_pass_convert'			=> array('BOOL', 0),
+		'user_email'				=> array('VCHAR_UNI:100', ''),
+		'user_email_hash'			=> array('BINT', 0),
+		'user_birthday'				=> array('VCHAR:10', ''),
+		'user_lastvisit'			=> array('TIMESTAMP', 0),
+		'user_lastmark'				=> array('TIMESTAMP', 0),
+		'user_lastpost_time'		=> array('TIMESTAMP', 0),
+		'user_lastpage'				=> array('VCHAR_UNI:200', ''),
+		'user_last_confirm_key'		=> array('VCHAR:10', ''),
+		'user_last_search'			=> array('TIMESTAMP', 0),
+		'user_warnings'				=> array('TINT:4', 0),
+		'user_last_warning'			=> array('TIMESTAMP', 0),
+		'user_login_attempts'		=> array('TINT:4', 0),
+		'user_inactive_reason'		=> array('TINT:2', 0),
+		'user_inactive_time'		=> array('TIMESTAMP', 0),
+		'user_posts'				=> array('UINT', 0),
+		'user_lang'					=> array('VCHAR:30', ''),
+		'user_timezone'				=> array('VCHAR:100', 'UTC'),
+		'user_dateformat'			=> array('VCHAR_UNI:30', 'd M Y H:i'),
+		'user_style'				=> array('UINT', 0),
+		'user_rank'					=> array('UINT', 0),
+		'user_colour'				=> array('VCHAR:6', ''),
+		'user_new_privmsg'			=> array('INT:4', 0),
+		'user_unread_privmsg'		=> array('INT:4', 0),
+		'user_last_privmsg'			=> array('TIMESTAMP', 0),
+		'user_message_rules'		=> array('BOOL', 0),
+		'user_full_folder'			=> array('INT:11', -3),
+		'user_emailtime'			=> array('TIMESTAMP', 0),
+		'user_topic_show_days'		=> array('USINT', 0),
+		'user_topic_sortby_type'	=> array('VCHAR:1', 't'),
+		'user_topic_sortby_dir'		=> array('VCHAR:1', 'd'),
+		'user_post_show_days'		=> array('USINT', 0),
+		'user_post_sortby_type'		=> array('VCHAR:1', 't'),
+		'user_post_sortby_dir'		=> array('VCHAR:1', 'a'),
+		'user_notify'				=> array('BOOL', 0),
+		'user_notify_pm'			=> array('BOOL', 1),
+		'user_notify_type'			=> array('TINT:4', 0),
+		'user_allow_pm'				=> array('BOOL', 1),
+		'user_allow_viewonline'		=> array('BOOL', 1),
+		'user_allow_viewemail'		=> array('BOOL', 1),
+		'user_allow_massemail'		=> array('BOOL', 1),
+		'user_options'				=> array('UINT:11', 230271),
+		'user_avatar'				=> array('VCHAR', ''),
+		'user_avatar_type'			=> array('VCHAR:255', ''),
+		'user_avatar_width'			=> array('USINT', 0),
+		'user_avatar_height'		=> array('USINT', 0),
+		'user_sig'					=> array('MTEXT_UNI', ''),
+		'user_sig_bbcode_uid'		=> array('VCHAR:8', ''),
+		'user_sig_bbcode_bitfield'	=> array('VCHAR:255', ''),
+		'user_from'					=> array('VCHAR_UNI:100', ''),
+		'user_icq'					=> array('VCHAR:15', ''),
+		'user_aim'					=> array('VCHAR_UNI', ''),
+		'user_yim'					=> array('VCHAR_UNI', ''),
+		'user_msnm'					=> array('VCHAR_UNI', ''),
+		'user_jabber'				=> array('VCHAR_UNI', ''),
+		'user_website'				=> array('VCHAR_UNI:200', ''),
+		'user_occ'					=> array('TEXT_UNI', ''),
+		'user_interests'			=> array('TEXT_UNI', ''),
+		'user_actkey'				=> array('VCHAR:32', ''),
+		'user_newpasswd'			=> array('VCHAR_UNI:40', ''),
+		'user_form_salt'			=> array('VCHAR_UNI:32', ''),
+		'user_new'					=> array('BOOL', 1),
+		'user_reminded'				=> array('TINT:4', 0),
+		'user_reminded_time'		=> array('TIMESTAMP', 0),
+	),
+	'PRIMARY_KEY'	=> 'user_id',
+	'KEYS'			=> array(
+		'user_birthday'				=> array('INDEX', 'user_birthday'),
+		'user_email_hash'			=> array('INDEX', 'user_email_hash'),
+		'user_type'					=> array('INDEX', 'user_type'),
+		'username_clean'			=> array('UNIQUE', 'username_clean'),
+	),
+);
+
+$schema_data['phpbb_warnings'] = array(
+	'COLUMNS'		=> array(
+		'warning_id'			=> array('UINT', NULL, 'auto_increment'),
+		'user_id'				=> array('UINT', 0),
+		'post_id'				=> array('UINT', 0),
+		'log_id'				=> array('UINT', 0),
+		'warning_time'			=> array('TIMESTAMP', 0),
+	),
+	'PRIMARY_KEY'	=> 'warning_id',
+);
+
+$schema_data['phpbb_words'] = array(
+	'COLUMNS'		=> array(
+		'word_id'				=> array('UINT', NULL, 'auto_increment'),
+		'word'					=> array('VCHAR_UNI', ''),
+		'replacement'			=> array('VCHAR_UNI', ''),
+	),
+	'PRIMARY_KEY'	=> 'word_id',
+);
+
+$schema_data['phpbb_zebra'] = array(
+	'COLUMNS'		=> array(
+		'user_id'				=> array('UINT', 0),
+		'zebra_id'				=> array('UINT', 0),
+		'friend'				=> array('BOOL', 0),
+		'foe'					=> array('BOOL', 0),
+	),
+	'PRIMARY_KEY'	=> array('user_id', 'zebra_id'),
+);
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 4d2d704a43..49d4e03921 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -7,8 +7,6 @@
 *
 */
 
-use Symfony\Component\HttpFoundation\Request;
-
 /**
 * @ignore
 */
@@ -2411,9 +2409,9 @@ function phpbb_on_page($template, $user, $base_url, $num_items, $per_page, $star
 */
 function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 {
-	global $_SID, $_EXTRA_URL, $phpbb_hook;
+	global $_SID, $_EXTRA_URL, $phpbb_hook, $phpbb_filesystem;
 	global $phpbb_dispatcher;
-	global $symfony_request, $phpbb_root_path;
+	global $symfony_request, $phpbb_root_path, $phpbb_container;
 
 	if ($params === '' || (is_array($params) && empty($params)))
 	{
@@ -2421,10 +2419,10 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 		$params = false;
 	}
 
-	$corrected_path = $symfony_request !== null ? phpbb_get_web_root_path($symfony_request, $phpbb_root_path) : '';
-	if ($corrected_path)
+	// Update the root path with the correct relative web path
+	if ($phpbb_filesystem instanceof phpbb_filesystem)
 	{
-		$url = substr($corrected_path . $url, strlen($phpbb_root_path));
+		$url = $phpbb_filesystem->update_web_root_path($url, $symfony_request);
 	}
 
 	$append_sid_overwrite = false;
@@ -2816,8 +2814,22 @@ function build_url($strip_vars = false)
 {
 	global $user, $phpbb_root_path;
 
+	$page = $user->page['page'];
+
+	// We need to be cautious here.
+	// On some situations, the redirect path is an absolute URL, sometimes a relative path
+	// For a relative path, let's prefix it with $phpbb_root_path to point to the correct location,
+	// else we use the URL directly.
+	$url_parts = @parse_url($page);
+
+	// URL
+	if ($url_parts !== false && !empty($url_parts['scheme']) && !empty($url_parts['host']))
+	{
+		$page = $phpbb_root_path . $page;
+	}
+
 	// Append SID
-	$redirect = append_sid($user->page['page'], false, false);
+	$redirect = append_sid($page, false, false);
 
 	// Add delimiter if not there...
 	if (strpos($redirect, '?') === false)
@@ -2872,19 +2884,7 @@ function build_url($strip_vars = false)
 		$redirect .= ($query) ? '?' . $query : '';
 	}
 
-	// We need to be cautious here.
-	// On some situations, the redirect path is an absolute URL, sometimes a relative path
-	// For a relative path, let's prefix it with $phpbb_root_path to point to the correct location,
-	// else we use the URL directly.
-	$url_parts = @parse_url($redirect);
-
-	// URL
-	if ($url_parts !== false && !empty($url_parts['scheme']) && !empty($url_parts['host']))
-	{
-		return str_replace('&', '&amp;', $redirect);
-	}
-
-	return $phpbb_root_path . str_replace('&', '&amp;', $redirect);
+	return str_replace('&', '&amp;', $redirect);
 }
 
 /**
@@ -3206,7 +3206,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
 function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = false, $s_display = true)
 {
 	global $db, $user, $template, $auth, $phpEx, $phpbb_root_path, $config;
-	global $request;
+	global $request, $phpbb_container;
 
 	if (!class_exists('phpbb_captcha_factory', false))
 	{
@@ -3233,7 +3233,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
 		trigger_error('NO_AUTH_ADMIN');
 	}
 
-	if (isset($_POST['login']))
+	if ($request->is_set_post('login') || ($request->is_set('login') && $request->variable('login', '') == 'external'))
 	{
 		// Get credential
 		if ($admin)
@@ -3374,6 +3374,29 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
 		$s_hidden_fields['credential'] = $credential;
 	}
 
+	$auth_provider = $phpbb_container->get('auth.provider.' . $config['auth_method']);
+
+	$auth_provider_data = $auth_provider->get_login_data();
+	if ($auth_provider_data)
+	{
+		if (isset($auth_provider_data['VARS']))
+		{
+			$template->assign_vars($auth_provider_data['VARS']);
+		}
+
+		if (isset($auth_provider_data['BLOCK_VAR_NAME']))
+		{
+			foreach ($auth_provider_data['BLOCK_VARS'] as $block_vars)
+			{
+				$template->assign_block_vars($auth_provider_data['BLOCK_VAR_NAME'], $block_vars);
+			}
+		}
+
+		$template->assign_vars(array(
+			'PROVIDER_TEMPLATE_FILE' => $auth_provider_data['TEMPLATE_FILE'],
+		));
+	}
+
 	$s_hidden_fields = build_hidden_fields($s_hidden_fields);
 
 	$template->assign_vars(array(
@@ -5058,7 +5081,7 @@ function phpbb_build_hidden_fields_for_query_params($request, $exclude = null)
 function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum')
 {
 	global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path;
-	global $phpbb_dispatcher, $request, $phpbb_container, $symfony_request;
+	global $phpbb_dispatcher, $request, $phpbb_container, $symfony_request, $adm_relative_path;
 
 	if (defined('HEADER_INC'))
 	{
@@ -5218,7 +5241,8 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 	// This path is sent with the base template paths in the assign_vars()
 	// call below. We need to correct it in case we are accessing from a
 	// controller because the web paths will be incorrect otherwise.
-	$corrected_path = $symfony_request !== null ? phpbb_get_web_root_path($symfony_request, $phpbb_root_path) : '';
+	$phpbb_filesystem = $phpbb_container->get('filesystem');
+	$corrected_path = $phpbb_filesystem->get_web_root_path($symfony_request);
 	$web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path;
 
 	// Send a proper content-language to the output
@@ -5357,7 +5381,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'S_FORUM_ID'			=> $forum_id,
 		'S_TOPIC_ID'			=> $topic_id,
 
-		'S_LOGIN_ACTION'		=> ((!defined('ADMIN_START')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("index.$phpEx", false, true, $user->session_id)),
+		'S_LOGIN_ACTION'		=> ((!defined('ADMIN_START')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("{$phpbb_root_path}{$adm_relative_path}index.$phpEx", false, true, $user->session_id)),
 		'S_LOGIN_REDIRECT'		=> build_hidden_fields(array('redirect' => build_url())),
 
 		'S_ENABLE_FEEDS'			=> ($config['feed_enable']) ? true : false,
@@ -5722,39 +5746,6 @@ function phpbb_create_symfony_request(phpbb_request $request)
 	array_walk_recursive($get_parameters, $sanitizer);
 	array_walk_recursive($post_parameters, $sanitizer);
 
-	$symfony_request = new Request($get_parameters, $post_parameters, array(), $cookie_parameters, $files_parameters, $server_parameters);
+	$symfony_request = new Symfony\Component\HttpFoundation\Request($get_parameters, $post_parameters, array(), $cookie_parameters, $files_parameters, $server_parameters);
 	return $symfony_request;
 }
-
-/**
-* Get a relative root path from the current URL
-*
-* @param Request $symfony_request Symfony Request object
-*/
-function phpbb_get_web_root_path(Request $symfony_request, $phpbb_root_path = '')
-{
-	static $path;
-	if (null !== $path)
-	{
-		return $path;
-	}
-
-	$path_info = $symfony_request->getPathInfo();
-	if ($path_info === '/')
-	{
-		$path = $phpbb_root_path;
-		return $path;
-	}
-
-	$corrections = substr_count($path_info, '/');
-
-	// When URL Rewriting is enabled, app.php is optional. We have to
-	// correct for it not being there
-	if (strpos($symfony_request->getRequestUri(), $symfony_request->getScriptName()) === false)
-	{
-		$corrections -= 1;
-	}
-
-	$path = $phpbb_root_path . str_repeat('../', $corrections);
-	return $path;
-}
diff --git a/phpBB/includes/ucp/info/ucp_auth_link.php b/phpBB/includes/ucp/info/ucp_auth_link.php
new file mode 100644
index 0000000000..ee88b15ea8
--- /dev/null
+++ b/phpBB/includes/ucp/info/ucp_auth_link.php
@@ -0,0 +1,34 @@
+<?php
+/**
+*
+* @package ucp
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @package module_install
+*/
+class ucp_auth_link_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> 'ucp_auth_link',
+			'title'		=> 'UCP_AUTH_LINK',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'auth_link'	=> array('title' => 'UCP_AUTH_LINK_MANAGE', 'auth' => '', 'cat' => array('UCP_PROFILE')),
+			),
+		);
+	}
+
+	function install()
+	{
+	}
+
+	function uninstall()
+	{
+	}
+}
diff --git a/phpBB/includes/ucp/ucp_auth_link.php b/phpBB/includes/ucp/ucp_auth_link.php
new file mode 100644
index 0000000000..5a5653e0b2
--- /dev/null
+++ b/phpBB/includes/ucp/ucp_auth_link.php
@@ -0,0 +1,142 @@
+<?php
+/**
+*
+* @package ucp
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class ucp_auth_link
+{
+	/**
+	* @var string
+	*/
+	public $u_action;
+
+	/**
+	* Generates the ucp_auth_link page and handles the auth link process
+	*
+	* @param	int		$id
+	* @param	string	$mode
+	*/
+	public function main($id, $mode)
+	{
+		global $config, $request, $template, $phpbb_container, $user;
+
+		$error = array();
+
+		$auth_provider = $phpbb_container->get('auth.provider.' . $config['auth_method']);
+
+		// confirm that the auth provider supports this page
+		$provider_data = $auth_provider->get_auth_link_data();
+		if ($provider_data === null)
+		{
+			$error[] = 'UCP_AUTH_LINK_NOT_SUPPORTED';
+		}
+
+		$s_hidden_fields = array();
+		add_form_key('ucp_auth_link');
+
+		$submit	= $request->variable('submit', false, false, phpbb_request_interface::POST);
+
+		// This path is only for primary actions
+		if (!sizeof($error) && $submit)
+		{
+			if (!check_form_key('ucp_auth_link'))
+			{
+				$error[] = 'FORM_INVALID';
+			}
+
+			if (!sizeof($error))
+			{
+				// Any post data could be necessary for auth (un)linking
+				$link_data = $request->get_super_global(phpbb_request_interface::POST);
+
+				// The current user_id is also necessary
+				$link_data['user_id'] = $user->data['user_id'];
+
+				// Tell the provider that the method is auth_link not login_link
+				$link_data['link_method'] = 'auth_link';
+
+				if ($request->variable('link', 0, false, phpbb_request_interface::POST))
+				{
+					$error[] = $auth_provider->link_account($link_data);
+				}
+				else
+				{
+					$error[] = $auth_provider->unlink_account($link_data);
+				}
+
+				// Template data may have changed, get new data
+				$provider_data = $auth_provider->get_auth_link_data();
+			}
+		}
+
+		// In some cases, a request to an external server may be required. In
+		// these cases, the GET parameter 'link' should exist and should be true
+		if ($request->variable('link', false))
+		{
+			// In this case the link data should only be populated with the
+			// link_method as the provider dictates how data is returned to it.
+			$link_data = array('link_method' => 'auth_link');
+
+			$error[] = $auth_provider->link_account($link_data);
+
+			// Template data may have changed, get new data
+			$provider_data = $auth_provider->get_auth_link_data();
+		}
+
+		if (isset($provider_data['VARS']))
+		{
+			// Handle hidden fields separately
+			if (isset($provider_data['VARS']['HIDDEN_FIELDS']))
+			{
+				$s_hidden_fields = array_merge($s_hidden_fields, $provider_data['VARS']['HIDDEN_FIELDS']);
+				unset($provider_data['VARS']['HIDDEN_FIELDS']);
+			}
+
+			$template->assign_vars($provider_data['VARS']);
+		}
+
+		if (isset($provider_data['BLOCK_VAR_NAME']))
+		{
+			foreach ($provider_data['BLOCK_VARS'] as $block_vars)
+			{
+				// See if there are additional hidden fields. This should be an associative array
+				if (isset($block_vars['HIDDEN_FIELDS']))
+				{
+					$block_vars['HIDDEN_FIELDS'] = build_hidden_fields($block_vars['HIDDEN_FIELDS']);
+				}
+
+				$template->assign_block_vars($provider_data['BLOCK_VAR_NAME'], $block_vars);
+			}
+		}
+
+		$s_hidden_fields = build_hidden_fields($s_hidden_fields);
+
+		// Replace "error" strings with their real, localised form
+		$error = array_map(array($user, 'lang'), $error);
+		$error = implode('<br />', $error);
+
+		$template->assign_vars(array(
+			'ERROR'	=> $error,
+
+			'PROVIDER_TEMPLATE_FILE'	=> $provider_data['TEMPLATE_FILE'],
+
+			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
+			'S_UCP_ACTION'		=> $this->u_action,
+		));
+
+		$this->tpl_name = 'ucp_auth_link';
+		$this->page_title = 'UCP_AUTH_LINK';
+	}
+}
diff --git a/phpBB/includes/ucp/ucp_login_link.php b/phpBB/includes/ucp/ucp_login_link.php
new file mode 100644
index 0000000000..4620eb9b9e
--- /dev/null
+++ b/phpBB/includes/ucp/ucp_login_link.php
@@ -0,0 +1,243 @@
+<?php
+/**
+*
+* @package ucp
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* ucp_login_link
+* Allows users of external accounts link those accounts to their phpBB accounts
+* during an attempted login.
+* @package ucp
+*/
+class ucp_login_link
+{
+	/**
+	* @var	string
+	*/
+	public $u_action;
+
+	/**
+	* Generates the ucp_login_link page and handles login link process
+	*
+	* @param	int		$id
+	* @param	string	$mode
+	*/
+	function main($id, $mode)
+	{
+		global $config, $phpbb_container, $request, $template, $user;
+		global $phpbb_root_path, $phpEx;
+
+		// Initialize necessary variables
+		$login_error = null;
+		$login_link_error = null;
+		$login_username = null;
+
+		// Build the data array
+		$data = $this->get_login_link_data_array();
+
+		// Ensure the person was sent here with login_link data
+		if (empty($data))
+		{
+			$login_link_error = $user->lang['LOGIN_LINK_NO_DATA_PROVIDED'];
+		}
+
+		// Use the auth_provider requested even if different from configured
+		$auth_provider = 'auth.provider.' . $request->variable('auth_provider', $config['auth_method']);
+		$auth_provider = $phpbb_container->get($auth_provider);
+
+		// Set the link_method to login_link
+		$data['link_method'] = 'login_link';
+
+		// Have the authentication provider check that all necessary data is available
+		$result = $auth_provider->login_link_has_necessary_data($data);
+		if ($result !== null)
+		{
+			$login_link_error = $user->lang[$result];
+		}
+
+		// Perform link action if there is no error
+		if (!$login_link_error)
+		{
+			if ($request->is_set_post('login'))
+			{
+				$login_username = $request->variable('login_username', '', false, phpbb_request_interface::POST);
+				$login_password = $request->untrimmed_variable('login_password', '', true, phpbb_request_interface::POST);
+
+				$login_result = $auth_provider->login($login_username, $login_password);
+
+				// We only care if there is or is not an error
+				$login_error = $this->process_login_result($login_result);
+
+				if (!$login_error)
+				{
+					// Give the user_id to the data
+					$data['user_id'] = $login_result['user_row']['user_id'];
+
+					// The user is now logged in, attempt to link the user to the external account
+					$result = $auth_provider->link_account($data);
+
+					if ($result)
+					{
+						$login_link_error = $user->lang[$result];
+					}
+					else
+					{
+						// Finish login
+						$result = $user->session_create($login_result['user_row']['user_id'], false, false, true);
+
+						// Perform a redirect as the account has been linked
+						$this->perform_redirect();
+					}
+				}
+			}
+		}
+
+		$template->assign_vars(array(
+			// Common template elements
+			'LOGIN_LINK_ERROR'		=> $login_link_error,
+			'PASSWORD_CREDENTIAL'	=> 'login_password',
+			'USERNAME_CREDENTIAL'	=> 'login_username',
+			'S_HIDDEN_FIELDS'		=> $this->get_hidden_fields($data),
+
+			// Registration elements
+			'REGISTER_ACTION'	=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'),
+
+			// Login elements
+			'LOGIN_ERROR'		=> $login_error,
+			'LOGIN_USERNAME'	=> $login_username,
+		));
+
+		$this->tpl_name = 'ucp_login_link';
+		$this->page_title = 'UCP_LOGIN_LINK';
+	}
+
+	/**
+	* Builds the hidden fields string from the data array.
+	*
+	* @param	array	$data	This function only includes data in the array
+	*							that has a key that begins with 'login_link_'
+	* @return	string	A string of hidden fields that can be included in the
+	*					template
+	*/
+	protected function get_hidden_fields($data)
+	{
+		$fields = array();
+
+		foreach ($data as $key => $value)
+		{
+			$fields['login_link_' . $key] = $value;
+		}
+
+		return build_hidden_fields($fields);
+	}
+
+	/**
+	* Builds the login_link data array
+	*
+	* @return	array	All login_link data. This is all GET data whose names
+	*					begin with 'login_link_'
+	*/
+	protected function get_login_link_data_array()
+	{
+		global $request;
+
+		$var_names = $request->variable_names(phpbb_request_interface::GET);
+		$login_link_data = array();
+		$string_start_length = strlen('login_link_');
+
+		foreach ($var_names as $var_name)
+		{
+			if (strpos($var_name, 'login_link_') === 0)
+			{
+				$key_name = substr($var_name, $string_start_length);
+				$login_link_data[$key_name] = $request->variable($var_name, '', false, phpbb_request_interface::GET);
+			}
+		}
+
+		return $login_link_data;
+	}
+
+	/**
+	* Processes the result array from the login process
+	* @param	array	$result	The login result array
+	* @return	string|null	If there was an error in the process, a string is
+	*						returned. If the login was successful, then null is
+	*						returned.
+	*/
+	protected function process_login_result($result)
+	{
+		global $config, $request, $template, $user;
+
+		$login_error = null;
+
+		if ($result['status'] != LOGIN_SUCCESS)
+		{
+			// Handle all errors first
+			if ($result['status'] == LOGIN_BREAK)
+			{
+				trigger_error($result['error_msg']);
+			}
+
+			switch ($result['status'])
+			{
+				case LOGIN_ERROR_ATTEMPTS:
+
+					$captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']);
+					$captcha->init(CONFIRM_LOGIN);
+
+					$template->assign_vars(array(
+						'CAPTCHA_TEMPLATE'			=> $captcha->get_template(),
+					));
+
+					$login_error = $user->lang[$result['error_msg']];
+				break;
+
+				case LOGIN_ERROR_PASSWORD_CONVERT:
+					$login_error = sprintf(
+						$user->lang[$result['error_msg']],
+						($config['email_enable']) ? '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') . '">' : '',
+						($config['email_enable']) ? '</a>' : '',
+						($config['board_contact']) ? '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">' : '',
+						($config['board_contact']) ? '</a>' : ''
+					);
+				break;
+
+				// Username, password, etc...
+				default:
+					$login_error = $user->lang[$result['error_msg']];
+
+					// Assign admin contact to some error messages
+					if ($result['error_msg'] == 'LOGIN_ERROR_USERNAME' || $result['error_msg'] == 'LOGIN_ERROR_PASSWORD')
+					{
+						$login_error = (!$config['board_contact']) ? sprintf($user->lang[$result['error_msg']], '', '') : sprintf($user->lang[$result['error_msg']], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
+					}
+
+				break;
+			}
+		}
+
+		return $login_error;
+	}
+
+	/**
+	* Performs a post login redirect
+	*/
+	protected function perform_redirect()
+	{
+		global $phpbb_root_path, $phpEx;
+		$url = append_sid($phpbb_root_path . 'index.' . $phpEx);
+		redirect($url);
+	}
+}
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index f24578da84..e80cc2dce3 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -26,7 +26,7 @@ class ucp_prefs
 
 	function main($id, $mode)
 	{
-		global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
+		global $config, $db, $user, $auth, $template, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
 
 		$submit = (isset($_POST['submit'])) ? true : false;
 		$error = $data = array();
@@ -55,6 +55,20 @@ class ucp_prefs
 					$data['notifymethod'] = NOTIFY_BOTH;
 				}
 
+				/**
+				* Add UCP edit global settings data before they are assigned to the template or submitted
+				*
+				* To assign data to the template, use $template->assign_vars()
+				*
+				* @event core.ucp_prefs_personal_data
+				* @var	bool	submit		Do we display the form only
+				*							or did the user press submit
+				* @var	array	data		Array with current ucp options data
+				* @since 3.1-A1
+				*/
+				$vars = array('submit', 'data');
+				extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_personal_data', compact($vars)));
+
 				if ($submit)
 				{
 					if ($config['override_user_style'])
@@ -93,6 +107,17 @@ class ucp_prefs
 							'user_style'			=> $data['style'],
 						);
 
+						/**
+						* Update UCP edit global settings data on form submit
+						*
+						* @event core.ucp_prefs_personal_update_data
+						* @var	array	data		Submitted display options data
+						* @var	array	sql_ary		Display options data we udpate
+						* @since 3.1-A1
+						*/
+						$vars = array('data', 'sql_ary');
+						extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_personal_update_data', compact($vars)));
+
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
 							WHERE user_id = ' . $user->data['user_id'];
@@ -209,6 +234,20 @@ class ucp_prefs
 					'wordcensor'	=> request_var('wordcensor', (bool) $user->optionget('viewcensors')),
 				);
 
+				/**
+				* Add UCP edit display options data before they are assigned to the template or submitted
+				*
+				* To assign data to the template, use $template->assign_vars()
+				*
+				* @event core.ucp_prefs_view_data
+				* @var	bool	submit		Do we display the form only
+				*							or did the user press submit
+				* @var	array	data		Array with current ucp options data
+				* @since 3.1-A1
+				*/
+				$vars = array('submit', 'data');
+				extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_view_data', compact($vars)));
+
 				if ($submit)
 				{
 					$error = validate_data($data, array(
@@ -247,6 +286,17 @@ class ucp_prefs
 							'user_post_show_days'	=> $data['post_st'],
 						);
 
+						/**
+						* Update UCP edit display options data on form submit
+						*
+						* @event core.ucp_prefs_view_update_data
+						* @var	array	data		Submitted display options data
+						* @var	array	sql_ary		Display options data we udpate
+						* @since 3.1-A1
+						*/
+						$vars = array('data', 'sql_ary');
+						extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_view_update_data', compact($vars)));
+
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
 							WHERE user_id = ' . $user->data['user_id'];
@@ -335,6 +385,20 @@ class ucp_prefs
 				);
 				add_form_key('ucp_prefs_post');
 
+				/**
+				* Add UCP edit posting defaults data before they are assigned to the template or submitted
+				*
+				* To assign data to the template, use $template->assign_vars()
+				*
+				* @event core.ucp_prefs_post_data
+				* @var	bool	submit		Do we display the form only
+				*							or did the user press submit
+				* @var	array	data		Array with current ucp options data
+				* @since 3.1-A1
+				*/
+				$vars = array('submit', 'data');
+				extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_post_data', compact($vars)));
+
 				if ($submit)
 				{
 					if (check_form_key('ucp_prefs_post'))
@@ -348,6 +412,17 @@ class ucp_prefs
 							'user_notify'	=> $data['notify'],
 						);
 
+						/**
+						* Update UCP edit posting defaults data on form submit
+						*
+						* @event core.ucp_prefs_post_update_data
+						* @var	array	data		Submitted display options data
+						* @var	array	sql_ary		Display options data we udpate
+						* @since 3.1-A1
+						*/
+						$vars = array('data', 'sql_ary');
+						extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_post_update_data', compact($vars)));
+
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
 							WHERE user_id = ' . $user->data['user_id'];
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 7bc7ac8191..44621e6dea 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -27,7 +27,7 @@ class ucp_register
 	function main($id, $mode)
 	{
 		global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
-		global $request;
+		global $request, $phpbb_container;
 
 		//
 		if ($config['require_activation'] == USER_ACTIVATION_DISABLE)
@@ -78,19 +78,37 @@ class ucp_register
 			}
 		}
 
-
 		$cp = new custom_profile();
 
 		$error = $cp_data = $cp_error = array();
+		$s_hidden_fields = array();
+
+		// Handle login_link data added to $_hidden_fields
+		$login_link_data = $this->get_login_link_data_array();
+
+		if (!empty($login_link_data))
+		{
+			// Confirm that we have all necessary data
+			$auth_provider = 'auth.provider.' . $request->variable('auth_provider', $config['auth_method']);
+			$auth_provider = $phpbb_container->get($auth_provider);
+
+			$result = $auth_provider->login_link_has_necessary_data($login_link_data);
+			if ($result !== null)
+			{
+				$error[] = $user->lang[$result];
+			}
+
+			$s_hidden_fields = array_merge($s_hidden_fields, $this->get_login_link_data_for_hidden_fields($login_link_data));
+		}
 
 		if (!$agreed || ($coppa === false && $config['coppa_enable']) || ($coppa && !$config['coppa_enable']))
 		{
 			$add_lang = ($change_lang) ? '&amp;change_lang=' . urlencode($change_lang) : '';
 			$add_coppa = ($coppa !== false) ? '&amp;coppa=' . $coppa : '';
 
-			$s_hidden_fields = array(
+			$s_hidden_fields = array_merge($s_hidden_fields, array(
 				'change_lang'	=> '',
-			);
+			));
 
 			// If we change the language, we want to pass on some more possible parameter.
 			if ($change_lang)
@@ -398,15 +416,28 @@ class ucp_register
 					}
 				}
 
+				// Perform account linking if necessary
+				if (!empty($login_link_data))
+				{
+					$login_link_data['user_id'] = $user_id;
+
+					$result = $auth_provider->link_account($login_link_data);
+
+					if ($result)
+					{
+						$message = $message . '<br /><br />' . $user->lang[$result];
+					}
+				}
+
 				$message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a>');
 				trigger_error($message);
 			}
 		}
 
-		$s_hidden_fields = array(
+		$s_hidden_fields = array_merge($s_hidden_fields, array(
 			'agreed'		=> 'true',
 			'change_lang'	=> 0,
-		);
+		));
 
 		if ($config['coppa_enable'])
 		{
@@ -474,4 +505,49 @@ class ucp_register
 		$this->tpl_name = 'ucp_register';
 		$this->page_title = 'UCP_REGISTRATION';
 	}
+
+	/**
+	* Creates the login_link data array
+	*
+	* @return	array	Returns an array of all POST paramaters whose names
+	*					begin with 'login_link_'
+	*/
+	protected function get_login_link_data_array()
+	{
+		global $request;
+
+		$var_names = $request->variable_names(phpbb_request_interface::POST);
+		$login_link_data = array();
+		$string_start_length = strlen('login_link_');
+
+		foreach ($var_names as $var_name)
+		{
+			if (strpos($var_name, 'login_link_') === 0)
+			{
+				$key_name = substr($var_name, $string_start_length);
+				$login_link_data[$key_name] = $request->variable($var_name, '', false, phpbb_request_interface::POST);
+			}
+		}
+
+		return $login_link_data;
+	}
+
+	/**
+	* Prepends they key names of an associative array with 'login_link_' for
+	* inclusion on the page as hidden fields.
+	*
+	* @param	array	$data	The array to be modified
+	* @return	array	The modified array
+	*/
+	protected function get_login_link_data_for_hidden_fields($data)
+	{
+		$new_data = array();
+
+		foreach ($data as $key => $value)
+		{
+			$new_data['login_link_' . $key] = $value;
+		}
+
+		return $new_data;
+	}
 }