Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2

* 'develop' of https://github.com/phpbb/phpbb3: [ticket/11367] Always freeresult [ticket/11367] Migrator throws error if migrations table does not exist [feature/migrations] Inject migrator rather than the container. [feature/migrations] Use the user class for language handling [feature/migrations] Fully revert the removal of the user_msnm field [feature/migrations] Revert unrelated change to schema_data.sql [feature/migrations] Remove user_msnm migration [feature/migrations] Correct depends_on [feature/migrations] Subdirectories for migration data [feature/migrations] Reports table schema changes in recent develop [feature/migrations] Automatically populate migrations table on install [feature/migrations] effectively installed check for migration data [feature/migrations] Comments for the return in the custom functions [feature/migrations] Order the migrations schema in schema_data.sql [feature/migrations] Fix migrations installer, schema for schema_data.sql [feature/migrations] Make depends_on static to call it without dependencies [feature/migrations] Remove hardcoded language, use lang instead. [feature/migrations] Revert schema for migration data [feature/migrations] Replace database_update.php with migrations updater [feature/migrations] Rebuilding migrations data on develop
author: Joas Schilling <nickvergessen@gmx.de> 2013-02-27 00:12:51 +0100
committer: Joas Schilling <nickvergessen@gmx.de> 2013-02-27 00:12:51 +0100
commit: f76f36c6693d8c4545d45f1454db102b1b313d07 (patch)
tree: f28782ba502d833e5f95491a420dd0f8c31b04a9 /phpBB/includes
parent: d61eb95b4868377cfc2a7a98b03a7d908418b1af (diff)
parent: 80bd78a5e5e1069773c05073cd47662a311bda79 (diff)
download: forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar
forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar.gz
forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar.bz2
forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar.xz
forums-f76f36c6693d8c4545d45f1454db102b1b313d07.zip
44 files changed, 3220 insertions, 10 deletions
diff --git a/phpBB/includes/db/migration/data/30x/3_0_1.php b/phpBB/includes/db/migration/data/30x/3_0_1.php
new file mode 100644
index 0000000000..c996a0138a
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_1.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_1_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10.php b/phpBB/includes/db/migration/data/30x/3_0_10.php
new file mode 100644
index 0000000000..122f93d6b4
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_10.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_10 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.10', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_10_rc3');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.10')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_10_rc1.php
new file mode 100644
index 0000000000..0ed05812dc
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_10_rc1.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_10_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.10-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_9');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('email_max_chunk_size', 50)),
+
+			array('config.update', array('version', '3.0.10-rc1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_10_rc2.php
new file mode 100644
index 0000000000..b14b3b00aa
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_10_rc2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_10_rc2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.10-rc2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_10_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.10-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_10_rc3.php b/phpBB/includes/db/migration/data/30x/3_0_10_rc3.php
new file mode 100644
index 0000000000..473057d65d
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_10_rc3.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_10_rc3 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.10-rc3', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_10_rc2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.10-rc3')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_11.php b/phpBB/includes/db/migration/data/30x/3_0_11.php
new file mode 100644
index 0000000000..e063c699cc
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_11.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_11 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.11', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11_rc2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.11')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_11_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_11_rc1.php
new file mode 100644
index 0000000000..dddfc0e0e7
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_11_rc1.php
@@ -0,0 +1,95 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_11_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.11-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_10');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
+			array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
+
+			array('config.update', array('version', '3.0.11-rc1')),
+		);
+	}
+
+	public function cleanup_deactivated_styles()
+	{
+		// Updates users having current style a deactivated one
+		$sql = 'SELECT style_id
+			FROM ' . STYLES_TABLE . '
+			WHERE style_active = 0';
+		$result = $this->sql_query($sql);
+
+		$deactivated_style_ids = array();
+		while ($style_id = $this->db->sql_fetchfield('style_id', false, $result))
+		{
+			$deactivated_style_ids[] = (int) $style_id;
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($deactivated_style_ids))
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_style = ' . (int) $this->config['default_style'] .'
+				WHERE ' . $this->db->sql_in_set('user_style', $deactivated_style_ids);
+			$this->sql_query($sql);
+		}
+	}
+
+	public function delete_orphan_private_messages()
+	{
+		// Delete orphan private messages
+		$batch_size = 500;
+
+		$sql_array = array(
+			'SELECT'	=> 'p.msg_id',
+			'FROM'		=> array(
+				PRIVMSGS_TABLE	=> 'p',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(PRIVMSGS_TO_TABLE => 't'),
+					'ON'	=> 'p.msg_id = t.msg_id',
+				),
+			),
+			'WHERE'		=> 't.user_id IS NULL',
+		);
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+
+		$result = $this->db->sql_query_limit($sql, $batch_size);
+
+		$delete_pms = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$delete_pms[] = (int) $row['msg_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($delete_pms))
+		{
+			$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('msg_id', $delete_pms);
+			$this->sql_query($sql);
+
+			// Return false to have the Migrator call this function again
+			return false;
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_11_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_11_rc2.php
new file mode 100644
index 0000000000..fac8523e8c
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_11_rc2.php
@@ -0,0 +1,50 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_11_rc2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.11-rc2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11_rc1');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_novalue' => array('BOOL', 0),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_novalue',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.11-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_12_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_12_rc1.php
new file mode 100644
index 0000000000..6a31a51201
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_12_rc1.php
@@ -0,0 +1,123 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 **/
+
+class phpbb_db_migration_data_30x_3_0_12_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.12-rc1', '>=');
+	}
+
+ 	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_module_auth'))),
+			array('custom', array(array(&$this, 'update_bots'))),
+			array('custom', array(array(&$this, 'disable_bots_from_receiving_pms'))),
+
+			array('config.update', array('version', '3.0.12-rc1')),
+		);
+	}
+
+	public function disable_bots_from_receiving_pms()
+	{
+		// Disable receiving pms for bots
+		$sql = 'SELECT user_id
+			FROM ' . BOTS_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		$bot_user_ids = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$bot_user_ids[] = (int) $row['user_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($bot_user_ids))
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . '
+				SET user_allow_pm = 0
+				WHERE ' . $this->db->sql_in_set('user_id', $bot_user_ids);
+			$this->sql_query($sql);
+		}
+	}
+
+	public function update_module_auth()
+	{
+		$sql = 'UPDATE ' . MODULES_TABLE . '
+			SET module_auth = \'acl_u_sig\'
+			WHERE module_class = \'ucp\'
+				AND module_basename = \'profile\'
+				AND module_mode = \'signature\'';
+		$this->sql_query($sql);
+	}
+
+	public function update_bots()
+	{
+		// Update bots
+		if (!function_exists('user_delete'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		}
+
+		$bots_updates = array(
+			// Bot Deletions
+			'NG-Search [Bot]'		=> false,
+			'Nutch/CVS [Bot]'		=> false,
+			'OmniExplorer [Bot]'	=> false,
+			'Seekport [Bot]'		=> false,
+			'Synoo [Bot]'			=> false,
+			'WiseNut [Bot]'			=> false,
+
+			// Bot Updates
+			// Bot name to bot user agent map
+			'Baidu [Spider]'	=> 'Baiduspider',
+			'Exabot [Bot]'		=> 'Exabot',
+			'Voyager [Bot]'		=> 'voyager/',
+			'W3C [Validator]'	=> 'W3C_Validator',
+		);
+
+		foreach ($bots_updates as $bot_name => $bot_agent)
+		{
+			$sql = 'SELECT user_id
+				FROM ' . USERS_TABLE . '
+				WHERE user_type = ' . USER_IGNORE . "
+					AND username_clean = '" . $this->db->sql_escape(utf8_clean_string($bot_name)) . "'";
+			$result = $this->db->sql_query($sql);
+			$bot_user_id = (int) $this->db->sql_fetchfield('user_id');
+			$this->db->sql_freeresult($result);
+
+			if ($bot_user_id)
+			{
+				if ($bot_agent === false)
+				{
+					$sql = 'DELETE FROM ' . BOTS_TABLE . "
+						WHERE user_id = $bot_user_id";
+					$this->sql_query($sql);
+
+					user_delete('remove', $bot_user_id);
+				}
+				else
+				{
+					$sql = 'UPDATE ' . BOTS_TABLE . "
+						SET bot_agent = '" .  $this->db->sql_escape($bot_agent) . "'
+						WHERE user_id = $bot_user_id";
+					$this->sql_query($sql);
+				}
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_1_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_1_rc1.php
new file mode 100644
index 0000000000..562ccf077c
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_1_rc1.php
@@ -0,0 +1,108 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_1_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.1-rc1', '>=');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'display_subforum_list' => array('BOOL', 1),
+				),
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array('UINT', 0),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'groups' => array(
+					'group_legend',
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array('session_forum_id'),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_legend_name' => array('group_legend', 'group_name'),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'display_subforum_list',
+				),
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id',
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'groups' => array(
+					'group_legend' => array('group_legend'),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id',
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_legend_name',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
+			array('custom', array(array(&$this, 'reset_smiley_size'))),
+
+			array('config.update', array('version', '3.0.1-rc1')),
+		);
+	}
+
+	public function fix_unset_last_view_time()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . "topics
+			SET topic_last_view_time = topic_last_post_time
+			WHERE topic_last_view_time = 0";
+		$this->sql_query($sql);
+	}
+
+	public function reset_smiley_size()
+	{
+		// Update smiley sizes
+		$smileys = array('icon_e_surprised.gif', 'icon_eek.gif', 'icon_cool.gif', 'icon_lol.gif', 'icon_mad.gif', 'icon_razz.gif', 'icon_redface.gif', 'icon_cry.gif', 'icon_evil.gif', 'icon_twisted.gif', 'icon_rolleyes.gif', 'icon_exclaim.gif', 'icon_question.gif', 'icon_idea.gif', 'icon_arrow.gif', 'icon_neutral.gif', 'icon_mrgreen.gif', 'icon_e_ugeek.gif');
+
+		foreach ($smileys as $smiley)
+		{
+			if (file_exists($this->phpbb_root_path . 'images/smilies/' . $smiley))
+			{
+				list($width, $height) = getimagesize($this->phpbb_root_path . 'images/smilies/' . $smiley);
+
+				$sql = 'UPDATE ' . SMILIES_TABLE . '
+					SET smiley_width = ' . $width . ', smiley_height = ' . $height . "
+					WHERE smiley_url = '" . $this->db->sql_escape($smiley) . "'";
+
+				$this->sql_query($sql);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_2.php b/phpBB/includes/db/migration/data/30x/3_0_2.php
new file mode 100644
index 0000000000..eed5acef82
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_2_rc2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_2_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_2_rc1.php
new file mode 100644
index 0000000000..a960e90765
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_2_rc1.php
@@ -0,0 +1,32 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_2_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.2-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('referer_validation', '1')),
+			array('config.add', array('check_attachment_content', '1')),
+			array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
+
+			array('config.update', array('version', '3.0.2-rc1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_2_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_2_rc2.php
new file mode 100644
index 0000000000..8917dfea77
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_2_rc2.php
@@ -0,0 +1,80 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_2_rc2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.2-rc2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_2_rc1');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'change_columns' => array(
+				$this->table_prefix . 'drafts' => array(
+					'draft_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_last_post_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_subject' => array('STEXT_UNI', '', 'true_sort'),
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_subject' => array('STEXT_UNI', ''),
+				),
+				$this->table_prefix . 'topics' => array(
+					'topic_title' => array('STEXT_UNI', '', 'true_sort'),
+					'topic_last_post_subject' => array('STEXT_UNI', ''),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id',
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_fid' => array('session_forum_id'),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'add_index' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_forum_id' => array(
+						'session_forum_id',
+					),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'sessions' => array(
+					'session_fid',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.2-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_3.php b/phpBB/includes/db/migration/data/30x/3_0_3.php
new file mode 100644
index 0000000000..8984cf7b76
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_3.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_3 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.3', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_3_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.3')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_3_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_3_rc1.php
new file mode 100644
index 0000000000..4b102e1a2e
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_3_rc1.php
@@ -0,0 +1,83 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_3_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.3-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_2');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'styles_template' => array(
+					'template_inherits_id' => array('UINT:4', 0),
+					'template_inherit_path' => array('VCHAR', ''),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_max_recipients' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'styles_template' => array(
+					'template_inherits_id',
+					'template_inherit_path',
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_max_recipients',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('enable_queue_trigger', '0')),
+			array('config.add', array('queue_trigger_posts', '3')),
+			array('config.add', array('pm_max_recipients', '0')),
+			array('custom', array(array(&$this, 'set_group_default_max_recipients'))),
+			array('config.add', array('dbms_version', $this->db->sql_server_info(true))),
+			array('permission.add', array('u_masspm_group', true, 'u_masspm')),
+			array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
+
+			array('config.update', array('version', '3.0.3-rc1')),
+		);
+	}
+
+	public function correct_acp_email_permissions()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . 'modules
+			SET module_auth = \'acl_a_email && cfg_email_enable\'
+			WHERE module_class = \'acp\'
+				AND module_basename = \'email\'';
+		$this->sql_query($sql);
+	}
+
+	public function set_group_default_max_recipients()
+	{
+		// Set maximum number of recipients for the registered users, bots, guests group
+		$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_max_recipients = 5
+			WHERE ' . $this->db->sql_in_set('group_name', array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA', 'BOTS'));
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_4.php b/phpBB/includes/db/migration/data/30x/3_0_4.php
new file mode 100644
index 0000000000..9a0c132e78
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_4.php
@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_4 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.4', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_4_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'rename_log_delete_topic'))),
+
+			array('config.update', array('version', '3.0.4')),
+		);
+	}
+
+	public function rename_log_delete_topic()
+	{
+		if ($this->db->sql_layer == 'oracle')
+		{
+			// log_operation is CLOB - but we can change this later
+			$sql = 'UPDATE ' . $this->table_prefix . "log
+				SET log_operation = 'LOG_DELETE_TOPIC'
+				WHERE log_operation LIKE 'LOG_TOPIC_DELETED'";
+			$this->sql_query($sql);
+		}
+		else
+		{
+			$sql = 'UPDATE ' . $this->table_prefix . "log
+				SET log_operation = 'LOG_DELETE_TOPIC'
+				WHERE log_operation = 'LOG_TOPIC_DELETED'";
+			$this->sql_query($sql);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_4_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_4_rc1.php
new file mode 100644
index 0000000000..8ad75a557b
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_4_rc1.php
@@ -0,0 +1,123 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_4_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.4-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_3');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_profile' => array('BOOL', 0),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'styles' => array(
+					'style_id' => array('UINT', NULL, 'auto_increment'),
+					'template_id' => array('UINT', 0),
+					'theme_id' => array('UINT', 0),
+					'imageset_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'styles_imageset' => array(
+					'imageset_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_imageset_data' => array(
+					'image_id' => array('UINT', NULL, 'auto_increment'),
+					'imageset_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'styles_theme' => array(
+					'theme_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_template' => array(
+					'template_id' => array('UINT', NULL, 'auto_increment'),
+				),
+				$this->table_prefix . 'styles_template_data' => array(
+					'template_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_style' => array('UINT', 0),
+				),
+				$this->table_prefix . 'users' => array(
+					'user_style' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'profile_fields' => array(
+					'field_show_profile',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_custom_profile_fields'))),
+
+			array('config.update', array('version', '3.0.4-rc1')),
+		);
+	}
+
+	public function update_custom_profile_fields()
+	{
+		// Update the Custom Profile Fields based on previous settings to the new format
+		$sql = 'SELECT field_id, field_required, field_show_on_reg, field_hide
+				FROM ' . PROFILE_FIELDS_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql_ary = array(
+				'field_required'	=> 0,
+				'field_show_on_reg'	=> 0,
+				'field_hide'		=> 0,
+				'field_show_profile'=> 0,
+			);
+
+			if ($row['field_required'])
+			{
+				$sql_ary['field_required'] = $sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+			}
+			else if ($row['field_show_on_reg'])
+			{
+				$sql_ary['field_show_on_reg'] = $sql_ary['field_show_profile'] = 1;
+			}
+			else if ($row['field_hide'])
+			{
+				// Only administrators and moderators can see this CPF, if the view is enabled, they can see it, otherwise just admins in the acp_users module
+				$sql_ary['field_hide'] = 1;
+			}
+			else
+			{
+				// equivelant to "none", which is the "Display in user control panel" option
+				$sql_ary['field_show_profile'] = 1;
+			}
+
+			$this->sql_query('UPDATE ' . $this->table_prefix . 'profile_fields SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE field_id = ' . $row['field_id'], $errored, $error_ary);
+		}
+
+		$this->db->sql_freeresult($result);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_5.php b/phpBB/includes/db/migration/data/30x/3_0_5.php
new file mode 100644
index 0000000000..16d2dee457
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_5.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_5 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.5', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_5_rc1part2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.5')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_5_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_5_rc1.php
new file mode 100644
index 0000000000..ea17cc1e31
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_5_rc1.php
@@ -0,0 +1,124 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_5_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.5-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_4');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'change_columns' => array(
+				$this->table_prefix . 'forums' => array(
+					'forum_style' => array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		$search_indexing_state = $this->config['search_indexing_state'];
+
+		return array(
+			array('config.add', array('captcha_gd_wave', 0)),
+			array('config.add', array('captcha_gd_3d_noise', 1)),
+			array('config.add', array('captcha_gd_fonts', 1)),
+			array('config.add', array('confirm_refresh', 1)),
+			array('config.add', array('max_num_search_keywords', 10)),
+			array('config.remove', array('search_indexing_state')),
+			array('config.add', array('search_indexing_state', $search_indexing_state, true)),
+			array('custom', array(array(&$this, 'hash_old_passwords'))),
+			array('custom', array(array(&$this, 'update_ichiro_bot'))),
+		);
+	}
+
+	public function hash_old_passwords()
+	{
+		$sql = 'SELECT user_id, user_password
+				FROM ' . $this->table_prefix . 'users
+				WHERE user_pass_convert = 1';
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			if (strlen($row['user_password']) == 32)
+			{
+				$sql_ary = array(
+					'user_password'	=> phpbb_hash($row['user_password']),
+				);
+
+				$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
+			}
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function update_ichiro_bot()
+	{
+		// Adjust bot entry
+		$sql = 'UPDATE ' . $this->table_prefix . "bots
+			SET bot_agent = 'ichiro/'
+			WHERE bot_agent = 'ichiro/2'";
+		$this->sql_query($sql);
+	}
+
+	public function remove_duplicate_auth_options()
+	{
+		// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
+		$sql = 'SELECT auth_option
+			FROM ' . $this->table_prefix . 'acl_options
+			GROUP BY auth_option
+			HAVING COUNT(*) >= 2';
+		$result = $this->db->sql_query($sql);
+
+		$auth_options = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$auth_options[] = $row['auth_option'];
+		}
+		$this->db->sql_freeresult($result);
+
+		// Remove specific auth options
+		if (!empty($auth_options))
+		{
+			foreach ($auth_options as $option)
+			{
+				// Select auth_option_ids... the largest id will be preserved
+				$sql = 'SELECT auth_option_id
+					FROM ' . ACL_OPTIONS_TABLE . "
+					WHERE auth_option = '" . $db->sql_escape($option) . "'
+					ORDER BY auth_option_id DESC";
+				// sql_query_limit not possible here, due to bug in postgresql layer
+				$result = $this->db->sql_query($sql);
+
+				// Skip first row, this is our original auth option we want to preserve
+				$row = $this->db->sql_fetchrow($result);
+
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					// Ok, remove this auth option...
+					$this->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+					$this->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id']);
+				}
+				$this->db->sql_freeresult($result);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php b/phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php
new file mode 100644
index 0000000000..8538347b1a
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_5_rc1part2.php
@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_5_rc1part2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.5-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_5_rc1');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_keys'			=> array(
+				$this->table_prefix . 'acl_options'		=> array('auth_option'),
+			),
+			'add_unique_index'	=> array(
+				$this->table_prefix . 'acl_options'		=> array(
+					'auth_option'		=> array('auth_option'),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.5-rc1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6.php b/phpBB/includes/db/migration/data/30x/3_0_6.php
new file mode 100644
index 0000000000..bb651dc7cd
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_6.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_6 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_6_rc4');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.6')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_6_rc1.php
new file mode 100644
index 0000000000..38c282ebf0
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_6_rc1.php
@@ -0,0 +1,324 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_6_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_5');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns' => array(
+				$this->table_prefix . 'confirm' => array(
+					'attempts' => array('UINT', 0),
+				),
+				$this->table_prefix . 'users' => array(
+					'user_new' => array('BOOL', 1),
+					'user_reminded' => array('TINT:4', 0),
+					'user_reminded_time' => array('TIMESTAMP', 0),
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_skip_auth' => array('BOOL', 0, 'after' => 'group_founder_manage'),
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_reported' => array('BOOL', 0),
+				),
+				$this->table_prefix . 'reports' => array(
+					'pm_id' => array('UINT', 0),
+				),
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_show_on_vt' => array('BOOL', 0),
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_options' => array('UINT:20', 0),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'users' => array(
+					'user_options' => array('UINT:11', 230271),
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'reports' => array(
+					'post_id' => array('post_id'),
+					'pm_id' => array('pm_id'),
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_username' => array('post_username:255'),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns' => array(
+				$this->table_prefix . 'confirm' => array(
+					'attempts',
+				),
+				$this->table_prefix . 'users' => array(
+					'user_new',
+					'user_reminded',
+					'user_reminded_time',
+				),
+				$this->table_prefix . 'groups' => array(
+					'group_skip_auth',
+				),
+				$this->table_prefix . 'privmsgs' => array(
+					'message_reported',
+				),
+				$this->table_prefix . 'reports' => array(
+					'pm_id',
+				),
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_show_on_vt',
+				),
+				$this->table_prefix . 'forums' => array(
+					'forum_options',
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'reports' => array(
+					'post_id',
+					'pm_id',
+				),
+				$this->table_prefix . 'posts' => array(
+					'post_username',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('captcha_plugin', 'phpbb_captcha_nogd')),
+			array('if', array(
+				($this->config['captcha_gd']),
+				array('config.update', array('captcha_plugin', 'phpbb_captcha_gd')),
+			)),
+
+			array('config.add', array('feed_enable', 0)),
+			array('config.add', array('feed_limit', 10)),
+			array('config.add', array('feed_overall_forums', 1)),
+			array('config.add', array('feed_overall_forums_limit', 15)),
+			array('config.add', array('feed_overall_topics', 0)),
+			array('config.add', array('feed_overall_topics_limit', 15)),
+			array('config.add', array('feed_forum', 1)),
+			array('config.add', array('feed_topic', 1)),
+			array('config.add', array('feed_item_statistics', 1)),
+
+			array('config.add', array('smilies_per_page', 50)),
+			array('config.add', array('allow_pm_report', 1)),
+			array('config.add', array('min_post_chars', 1)),
+			array('config.add', array('allow_quick_reply', 1)),
+			array('config.add', array('new_member_post_limit', 0)),
+			array('config.add', array('new_member_group_default', 0)),
+			array('config.add', array('delete_time', $this->config['edit_time'])),
+
+			array('config.add', array('allow_avatar', 0)),
+			array('if', array(
+				($this->config['allow_avatar_upload'] || $this->config['allow_avatar_local'] || $this->config['allow_avatar_remote']),
+				array('config.update', array('allow_avatar', 1)),
+			)),
+			array('config.add', array('allow_avatar_remote_upload', 0)),
+			array('if', array(
+				($this->config['allow_avatar_remote'] && $this->config['allow_avatar_upload']),
+				array('config.update', array('allow_avatar_remote_upload', 1)),
+			)),
+
+			array('module.add', array(
+				'acp',
+				'ACP_BOARD_CONFIGURATION',
+				array(
+					'module_basename'	=> 'acp_board',
+					'modes'				=> array('feed'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_CAT_USERS',
+				array(
+					'module_basename'	=> 'acp_users',
+					'modes'				=> array('warnings'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_SERVER_CONFIGURATION',
+				array(
+					'module_basename'	=> 'acp_send_statistics',
+					'modes'				=> array('send_statistics'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_FORUM_BASED_PERMISSIONS',
+				array(
+					'module_basename'	=> 'acp_permissions',
+					'modes'				=> array('setting_forum_copy'),
+				),
+			)),
+			array('module.add', array(
+				'mcp',
+				'MCP_REPORTS',
+				array(
+					'module_basename'	=> 'mcp_pm_reports',
+					'modes'				=> array('pm_reports','pm_reports_closed','pm_report_details'),
+				),
+			)),
+			array('custom', array(array(&$this, 'add_newly_registered_group'))),
+			array('custom', array(array(&$this, 'set_user_options_default'))),
+
+			array('config.update', array('version', '3.0.6-rc1')),
+		);
+	}
+
+	public function set_user_options_default()
+	{
+		// 229376 is the added value to enable all three signature options
+		$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = user_options + 229376';
+		$this->sql_query($sql);
+	}
+
+	public function add_newly_registered_group()
+	{
+		// Add newly_registered group... but check if it already exists (we always supported running the updater on any schema)
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . "
+			WHERE group_name = 'NEWLY_REGISTERED'";
+		$result = $this->db->sql_query($sql);
+		$group_id = (int) $this->db->sql_fetchfield('group_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$group_id)
+		{
+			$sql = 'INSERT INTO ' .  GROUPS_TABLE . " (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('NEWLY_REGISTERED', 3, 0, '', 0, '', '', '', 5)";
+			$this->sql_query($sql);
+
+			$group_id = $this->db->sql_nextid();
+		}
+
+		// Insert new user role... at the end of the chain
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = 'ROLE_USER_NEW_MEMBER'
+				AND role_type = 'u_'";
+		$result = $this->db->sql_query($sql);
+		$u_role = (int) $this->db->sql_fetchfield('role_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$u_role)
+		{
+			$sql = 'SELECT MAX(role_order) as max_order_id
+				FROM ' . ACL_ROLES_TABLE . "
+				WHERE role_type = 'u_'";
+			$result = $this->db->sql_query($sql);
+			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
+			$this->db->sql_freeresult($result);
+
+			$next_order_id++;
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NEW_MEMBER', 'ROLE_DESCRIPTION_USER_NEW_MEMBER', 'u_', $next_order_id)";
+			$this->sql_query($sql);
+			$u_role = $this->db->sql_nextid();
+
+			// Now add the correct data to the roles...
+			// The standard role says that new users are not able to send a PM, Mass PM, are not able to PM groups
+			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $u_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_sendpm', 'u_masspm', 'u_masspm_group')";
+			$this->sql_query($sql);
+
+			// Add user role to group
+			$sql = 'INSERT INTO ' . ACL_GROUPS_TABLE . " (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES ($group_id, 0, 0, $u_role, 0)";
+			$this->sql_query($sql);
+		}
+
+		// Insert new forum role
+		$sql = 'SELECT role_id
+			FROM ' . ACL_ROLES_TABLE . "
+			WHERE role_name = 'ROLE_FORUM_NEW_MEMBER'
+				AND role_type = 'f_'";
+		$result = $this->db->sql_query($sql);
+		$f_role = (int) $this->db->sql_fetchfield('role_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$f_role)
+		{
+			$sql = 'SELECT MAX(role_order) as max_order_id
+				FROM ' . ACL_ROLES_TABLE . "
+				WHERE role_type = 'f_'";
+			$result = $this->db->sql_query($sql);
+			$next_order_id = (int) $this->db->sql_fetchfield('max_order_id');
+			$this->db->sql_freeresult($result);
+
+			$next_order_id++;
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_TABLE . " (role_name, role_description, role_type, role_order) VALUES  ('ROLE_FORUM_NEW_MEMBER', 'ROLE_DESCRIPTION_FORUM_NEW_MEMBER', 'f_', $next_order_id)";
+			$this->sql_query($sql);
+			$f_role = $this->db->sql_nextid();
+
+			$sql = 'INSERT INTO ' . ACL_ROLES_DATA_TABLE . " (role_id, auth_option_id, auth_setting) SELECT $f_role, auth_option_id, 0 FROM " . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove')";
+			$this->sql_query($sql);
+		}
+
+		// Set every members user_new column to 0 (old users) only if there is no one yet (this makes sure we do not execute this more than once)
+		$sql = 'SELECT 1
+			FROM ' . USERS_TABLE . '
+			WHERE user_new = 0';
+		$result = $this->db->sql_query_limit($sql, 1);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (!$row)
+		{
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_new = 0';
+			$this->sql_query($sql);
+		}
+
+		// To mimick the old "feature" we will assign the forum role to every forum, regardless of the setting (this makes sure there are no "this does not work!!!! YUO!!!" posts...
+		// Check if the role is already assigned...
+		$sql = 'SELECT forum_id
+			FROM ' . ACL_GROUPS_TABLE . '
+			WHERE group_id = ' . $group_id . '
+				AND auth_role_id = ' . $f_role;
+		$result = $this->db->sql_query($sql);
+		$is_options = (int) $this->db->sql_fetchfield('forum_id');
+		$this->db->sql_freeresult($result);
+
+		// Not assigned at all... :/
+		if (!$is_options)
+		{
+			// Get postable forums
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type != ' . FORUM_LINK;
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$this->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (' . $group_id . ', ' . (int) $row['forum_id'] . ', 0, ' . $f_role . ', 0)');
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		// Clear permissions...
+		include_once($this->phpbb_root_path . 'includes/acp/auth.' . $this->php_ext);
+		$auth_admin = new auth_admin();
+		$auth_admin->acl_clear_prefetch();
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_6_rc2.php
new file mode 100644
index 0000000000..a939dbd489
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_6_rc2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_6_rc2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6-rc2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_6_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.6-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc3.php b/phpBB/includes/db/migration/data/30x/3_0_6_rc3.php
new file mode 100644
index 0000000000..b3f09d8ab8
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_6_rc3.php
@@ -0,0 +1,40 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_6_rc3 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6-rc3', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_6_rc2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_cp_fields'))),
+
+			array('config.update', array('version', '3.0.6-rc3')),
+		);
+	}
+
+	public function update_cp_fields()
+	{
+		// Update the Custom Profile Fields based on previous settings to the new format
+		$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
+			SET field_show_on_vt = 1
+			WHERE field_hide = 0
+				AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_6_rc4.php b/phpBB/includes/db/migration/data/30x/3_0_6_rc4.php
new file mode 100644
index 0000000000..fc2923f99b
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_6_rc4.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_6_rc4 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.6-rc4', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_6_rc3');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.6-rc4')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7.php b/phpBB/includes/db/migration/data/30x/3_0_7.php
new file mode 100644
index 0000000000..9ff2e9e4ab
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_7.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_7 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.7', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_7_rc2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.7')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_pl1.php b/phpBB/includes/db/migration/data/30x/3_0_7_pl1.php
new file mode 100644
index 0000000000..c9cc9d19ac
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_7_pl1.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_7_pl1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.7-pl1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_7');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.7-pl1')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_7_rc1.php
new file mode 100644
index 0000000000..ffebf66f2d
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_7_rc1.php
@@ -0,0 +1,76 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_7_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.7-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_6');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_keys' => array(
+				$this->table_prefix . 'log' => array(
+					'log_time',
+				),
+			),
+			'add_index' => array(
+				$this->table_prefix . 'topics_track' => array(
+					'topic_id' => array('topic_id'),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'add_index' => array(
+				$this->table_prefix . 'log' => array(
+					'log_time'	=> array('log_time'),
+				),
+			),
+			'drop_keys' => array(
+				$this->table_prefix . 'topics_track' => array(
+					'topic_id',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('feed_overall', 1)),
+			array('config.add', array('feed_http_auth', 0)),
+			array('config.add', array('feed_limit_post', $this->config['feed_limit'])),
+			array('config.add', array('feed_limit_topic', $this->config['feed_overall_topics_limit'])),
+			array('config.add', array('feed_topics_new', $this->config['feed_overall_topics'])),
+			array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
+			array('custom', array(array(&$this, 'delete_text_templates'))),
+
+			array('config.update', array('version', '3.0.7-rc1')),
+		);
+	}
+
+	public function delete_text_templates()
+	{
+		// Delete all text-templates from the template_data
+		$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
+			WHERE template_filename ' . $this->db->sql_like_expression($this->db->any_char . '.txt');
+		$this->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_7_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_7_rc2.php
new file mode 100644
index 0000000000..55bc2bc679
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_7_rc2.php
@@ -0,0 +1,73 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_7_rc2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.7-rc2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_7_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_email_hash'))),
+
+			array('config.update', array('version', '3.0.7-rc2')),
+		);
+	}
+
+	public function update_email_hash($start = 0)
+	{
+		$limit = 1000;
+
+		$sql = 'SELECT user_id, user_email, user_email_hash
+			FROM ' . USERS_TABLE . '
+			WHERE user_type <> ' . USER_IGNORE . "
+				AND user_email <> ''";
+		$result = $this->db->sql_query_limit($sql, $limit, $start);
+
+		$i = 0;
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$i++;
+
+			// Snapshot of the phpbb_email_hash() function
+			// We cannot call it directly because the auto updater updates the DB first. :/
+			$user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']);
+
+			if ($user_email_hash != $row['user_email_hash'])
+			{
+				$sql_ary = array(
+					'user_email_hash'	=> $user_email_hash,
+				);
+
+				$sql = 'UPDATE ' . USERS_TABLE . '
+					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE user_id = ' . (int) $row['user_id'];
+				$this->sql_query($sql);
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		if ($i < $limit)
+		{
+			// Completed
+			return;
+		}
+
+		// Return the next start, will be sent to $start when this function is called again
+		return $start + $limit;
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_8.php b/phpBB/includes/db/migration/data/30x/3_0_8.php
new file mode 100644
index 0000000000..8998ef9627
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_8.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_8 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.8', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_8_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.8')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_8_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_8_rc1.php
new file mode 100644
index 0000000000..aeff35333e
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_8_rc1.php
@@ -0,0 +1,221 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_8_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.8-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_7_pl1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
+			array('custom', array(array(&$this, 'update_module_auth'))),
+			array('custom', array(array(&$this, 'update_bots'))),
+			array('custom', array(array(&$this, 'delete_orphan_shadow_topics'))),
+			array('module.add', array(
+				'acp',
+				'ACP_MESSAGES',
+				array(
+					'module_basename'	=> 'acp_board',
+					'modes'				=> array('post'),
+				),
+			)),
+			array('config.add', array('load_unreads_search', 1)),
+			array('config.update_if_equals', array(600, 'queue_interval', 60)),
+			array('config.update_if_equals', array(50, 'email_package_size', 20)),
+
+			array('config.update', array('version', '3.0.8-rc1')),
+		);
+	}
+
+	public function update_file_extension_group_names()
+	{
+		// Update file extension group names to use language strings.
+		$sql = 'SELECT lang_dir
+			FROM ' . LANG_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		$extension_groups_updated = array();
+		while ($lang_dir = $this->db->sql_fetchfield('lang_dir'))
+		{
+			$lang_dir = basename($lang_dir);
+
+			// The language strings we need are either in language/.../acp/attachments.php
+			// in the update package if we're updating to 3.0.8-RC1 or later,
+			// or they are in language/.../install.php when we're updating from 3.0.7-PL1 or earlier.
+			// On an already updated board, they can also already be in language/.../acp/attachments.php
+			// in the board root.
+			$lang_files = array(
+				"{$this->phpbb_root_path}install/update/new/language/$lang_dir/acp/attachments.{$this->php_ext}",
+				"{$this->phpbb_root_path}language/$lang_dir/install.{$this->php_ext}",
+				"{$this->phpbb_root_path}language/$lang_dir/acp/attachments.{$this->php_ext}",
+			);
+
+			foreach ($lang_files as $lang_file)
+			{
+				if (!file_exists($lang_file))
+				{
+					continue;
+				}
+
+				$lang = array();
+				include($lang_file);
+
+				foreach($lang as $lang_key => $lang_val)
+				{
+					if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0)
+					{
+						continue;
+					}
+
+					$sql_ary = array(
+						'group_name'	=> substr($lang_key, 10), // Strip off 'EXT_GROUP_'
+					);
+
+					$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+						SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . "
+						WHERE group_name = '" . $this->db->sql_escape($lang_val) . "'";
+					$this->sql_query($sql);
+
+					$extension_groups_updated[$lang_key] = true;
+				}
+			}
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function update_module_auth()
+	{
+		$sql = 'UPDATE ' . MODULES_TABLE . '
+			SET module_auth = \'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload)\'
+			WHERE module_class = \'ucp\'
+				AND module_basename = \'profile\'
+				AND module_mode = \'avatar\'';
+		$this->sql_query($sql);
+	}
+
+	public function update_bots()
+	{
+		$bot_name = 'Bing [Bot]';
+		$bot_name_clean = utf8_clean_string($bot_name);
+
+		$sql = 'SELECT user_id
+			FROM ' . USERS_TABLE . "
+			WHERE username_clean = '" . $this->db->sql_escape($bot_name_clean) . "'";
+		$result = $this->db->sql_query($sql);
+		$bing_already_added = (bool) $this->db->sql_fetchfield('user_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$bing_already_added)
+		{
+			$bot_agent = 'bingbot/';
+			$bot_ip = '';
+			$sql = 'SELECT group_id, group_colour
+				FROM ' . GROUPS_TABLE . "
+				WHERE group_name = 'BOTS'";
+			$result = $this->db->sql_query($sql);
+			$group_row = $this->db->sql_fetchrow($result);
+			$this->db->sql_freeresult($result);
+
+			if (!$group_row)
+			{
+				// default fallback, should never get here
+				$group_row['group_id'] = 6;
+				$group_row['group_colour'] = '9E8DA7';
+			}
+
+			if (!function_exists('user_add'))
+			{
+				include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+			}
+
+			$user_row = array(
+				'user_type'				=> USER_IGNORE,
+				'group_id'				=> $group_row['group_id'],
+				'username'				=> $bot_name,
+				'user_regdate'			=> time(),
+				'user_password'			=> '',
+				'user_colour'			=> $group_row['group_colour'],
+				'user_email'			=> '',
+				'user_lang'				=> $this->config['default_lang'],
+				'user_style'			=> $this->config['default_style'],
+				'user_timezone'			=> 0,
+				'user_dateformat'		=> $this->config['default_dateformat'],
+				'user_allow_massemail'	=> 0,
+			);
+
+			$user_id = user_add($user_row);
+
+			$sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
+				'bot_active'	=> 1,
+				'bot_name'		=> (string) $bot_name,
+				'user_id'		=> (int) $user_id,
+				'bot_agent'		=> (string) $bot_agent,
+				'bot_ip'		=> (string) $bot_ip,
+			));
+
+			$this->sql_query($sql);
+		}
+	}
+
+	public function delete_orphan_shadow_topics()
+	{
+		// Delete shadow topics pointing to not existing topics
+		$batch_size = 500;
+
+		// Set of affected forums we have to resync
+		$sync_forum_ids = array();
+
+		$sql_array = array(
+			'SELECT'	=> 't1.topic_id, t1.forum_id',
+			'FROM'		=> array(
+				TOPICS_TABLE	=> 't1',
+			),
+			'LEFT_JOIN'	=> array(
+				array(
+					'FROM'	=> array(TOPICS_TABLE	=> 't2'),
+					'ON'	=> 't1.topic_moved_id = t2.topic_id',
+				),
+			),
+			'WHERE'		=> 't1.topic_moved_id <> 0
+						AND t2.topic_id IS NULL',
+		);
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+		$result = $this->db->sql_query_limit($sql, $batch_size);
+
+		$topic_ids = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$topic_ids[] = (int) $row['topic_id'];
+
+			$sync_forum_ids[(int) $row['forum_id']] = (int) $row['forum_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($topic_ids))
+		{
+			$sql = 'DELETE FROM ' . TOPICS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
+			$this->db->sql_query($sql);
+
+			// Sync the forums we have deleted shadow topics from.
+			sync('forum', 'forum_id', $sync_forum_ids, true, true);
+
+			return false;
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9.php b/phpBB/includes/db/migration/data/30x/3_0_9.php
new file mode 100644
index 0000000000..d5269ea6f0
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_9.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_9 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_9_rc4');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.9')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc1.php b/phpBB/includes/db/migration/data/30x/3_0_9_rc1.php
new file mode 100644
index 0000000000..1f8622798e
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_9_rc1.php
@@ -0,0 +1,124 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_9_rc1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9-rc1', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_8');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables' => array(
+				$this->table_prefix . 'login_attempts' => array(
+					'COLUMNS' => array(
+						// this column was removed from the database updater
+						// after 3.0.9-RC3 was released. It might still exist
+						// in 3.0.9-RCX installations and has to be dropped in
+						// 3.0.12 after the db_tools class is capable of properly
+						// removing a primary key.
+						// 'attempt_id'			=> array('UINT', NULL, 'auto_increment'),
+						'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),
+					),
+					//'PRIMARY_KEY' => 'attempt_id',
+					'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'),
+					),
+				),
+			),
+			'change_columns' => array(
+				$this->table_prefix . 'bbcodes' => array(
+					'bbcode_id' => array('USINT', 0),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables' => array(
+				$this->table_prefix . 'login_attempts',
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('ip_login_limit_max', 50)),
+			array('config.add', array('ip_login_limit_time', 21600)),
+			array('config.add', array('ip_login_limit_use_forwarded', 0)),
+			array('custom', array(array(&$this, 'update_file_extension_group_names'))),
+			array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
+
+			array('config.update', array('version', '3.0.9-rc1')),
+		);
+	}
+
+	public function update_file_extension_group_names()
+	{
+		// Update file extension group names to use language strings, again.
+		$sql = 'SELECT group_id, group_name
+			FROM ' . EXTENSION_GROUPS_TABLE . '
+			WHERE group_name ' . $this->db->sql_like_expression('EXT_GROUP_' . $this->db->any_char);
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql_ary = array(
+				'group_name'	=> substr($row['group_name'], 10), // Strip off 'EXT_GROUP_'
+			);
+
+			$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
+				SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+				WHERE group_id = ' . $row['group_id'];
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function fix_firebird_qa_captcha()
+	{
+		// Recover from potentially broken Q&A CAPTCHA table on firebird
+		// Q&A CAPTCHA was uninstallable, so it's safe to remove these
+		// without data loss
+		if ($this->db_tools->sql_layer == 'firebird')
+		{
+			$tables = array(
+				$this->table_prefix . 'captcha_questions',
+				$this->table_prefix . 'captcha_answers',
+				$this->table_prefix . 'qa_confirm',
+			);
+			foreach ($tables as $table)
+			{
+				if ($this->db_tools->sql_table_exists($table))
+				{
+					$this->db_tools->sql_table_drop($table);
+				}
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc2.php b/phpBB/includes/db/migration/data/30x/3_0_9_rc2.php
new file mode 100644
index 0000000000..c0e662aa45
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_9_rc2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_9_rc2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9-rc2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_9_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.9-rc2')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc3.php b/phpBB/includes/db/migration/data/30x/3_0_9_rc3.php
new file mode 100644
index 0000000000..d6d1f14b2e
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_9_rc3.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_9_rc3 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9-rc3', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_9_rc2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.9-rc3')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/30x/3_0_9_rc4.php b/phpBB/includes/db/migration/data/30x/3_0_9_rc4.php
new file mode 100644
index 0000000000..e673249343
--- /dev/null
+++ b/phpBB/includes/db/migration/data/30x/3_0_9_rc4.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_30x_3_0_9_rc4 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.0.9-rc4', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_9_rc3');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.0.9-rc4')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
new file mode 100644
index 0000000000..13b36bbf30
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -0,0 +1,405 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_dev extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.1.0-dev', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array(
+			'phpbb_db_migration_data_310_extensions',
+			'phpbb_db_migration_data_310_style_update_p2',
+			'phpbb_db_migration_data_310_timezone_p2',
+			'phpbb_db_migration_data_310_reported_posts_display',
+		);
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns'		=> array(
+				$this->table_prefix . 'groups'		=> array(
+					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
+				),
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_show_on_pm'		=> array('BOOL', 0),
+				),
+				$this->table_prefix . 'styles'		=> array(
+					'style_path'			=> array('VCHAR:100', ''),
+					'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+					'style_parent_id'		=> array('UINT:4', 0),
+					'style_parent_tree'		=> array('TEXT', ''),
+				),
+				$this->table_prefix . 'reports'		=> array(
+					'reported_post_text'		=> array('MTEXT_UNI', ''),
+					'reported_post_uid'			=> array('VCHAR:8', ''),
+					'reported_post_bitfield'	=> array('VCHAR:255', ''),
+				),
+			),
+			'change_columns'	=> array(
+				$this->table_prefix . 'groups'		=> array(
+					'group_legend'		=> array('UINT', 0),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns'		=> array(
+				$this->table_prefix . 'groups'		=> array(
+					'group_teampage',
+				),
+				$this->table_prefix . 'profile_fields'	=> array(
+					'field_show_on_pm',
+				),
+				$this->table_prefix . 'styles'		=> array(
+					'style_path',
+					'bbcode_bitfield',
+					'style_parent_id',
+					'style_parent_tree',
+				),
+				$this->table_prefix . 'reports'		=> array(
+					'reported_post_text',
+					'reported_post_uid',
+					'reported_post_bitfield',
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('search_type', 'phpbb_search_' . $this->config['search_type'])),
+
+			array('config.add', array('fulltext_postgres_ts_name', 'simple')),
+			array('config.add', array('fulltext_postgres_min_word_len', 4)),
+			array('config.add', array('fulltext_postgres_max_word_len', 254)),
+			array('config.add', array('fulltext_sphinx_stopwords', 0)),
+			array('config.add', array('fulltext_sphinx_indexer_mem_limit', 512)),
+
+			array('config.add', array('load_jquery_cdn', 0)),
+			array('config.add', array('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js')),
+
+			array('config.add', array('use_system_cron', 0)),
+
+			array('config.add', array('legend_sort_groupname', 0)),
+			array('config.add', array('teampage_forums', 1)),
+			array('config.add', array('teampage_memberships', 1)),
+
+			array('config.add', array('load_cpf_pm', 0)),
+
+			array('config.add', array('display_last_subject', 1)),
+
+			array('config.add', array('assets_version', 1)),
+
+			array('config.add', array('site_home_url', '')),
+			array('config.add', array('site_home_text', '')),
+
+			array('permission.add', array('u_chgprofileinfo', true, 'u_sig')),
+
+			array('module.add', array(
+				'acp',
+				'ACP_GROUPS',
+				array(
+					'module_basename'	=> 'acp_groups',
+					'modes'				=> array('position'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_ATTACHMENTS',
+				array(
+					'module_basename'	=> 'acp_attachments',
+					'modes'				=> array('manage'),
+				),
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_STYLE_MANAGEMENT',
+				array(
+					'module_basename'	=> 'acp_styles',
+					'modes'				=> array('install', 'cache'),
+				),
+			)),
+			array('module.add', array(
+				'ucp',
+				'UCP_PROFILE',
+				array(
+					'module_basename'	=> 'ucp_profile',
+					'modes'				=> array('autologin_keys'),
+				),
+			)),
+			// Module will be renamed later
+			array('module.add', array(
+				'acp',
+				'ACP_CAT_STYLES',
+				'ACP_LANGUAGE'
+			)),
+
+			array('module.remove', array(
+				'acp',
+				false,
+				'ACP_TEMPLATES',
+			)),
+			array('module.remove', array(
+				'acp',
+				false,
+				'ACP_THEMES',
+			)),
+			array('module.remove', array(
+				'acp',
+				false,
+				'ACP_IMAGESETS',
+			)),
+
+			array('custom', array(array($this, 'rename_module_basenames'))),
+			array('custom', array(array($this, 'rename_styles_module'))),
+			array('custom', array(array($this, 'add_group_teampage'))),
+			array('custom', array(array($this, 'update_group_legend'))),
+			array('custom', array(array($this, 'localise_global_announcements'))),
+			array('custom', array(array($this, 'update_ucp_pm_basename'))),
+			array('custom', array(array($this, 'update_ucp_profile_auth'))),
+			array('custom', array(array($this, 'move_customise_modules'))),
+
+			array('config.update', array('version', '3.1.0-dev')),
+		);
+	}
+
+	public function move_customise_modules()
+	{
+		// Move language management to new location in the Customise tab
+		// First get language module id
+		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+			WHERE module_basename = 'acp_language'";
+		$result = $this->db->sql_query($sql);
+		$language_module_id = $this->db->sql_fetchfield('module_id');
+		$this->db->sql_freeresult($result);
+		// Next get language management module id of the one just created
+		$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+			WHERE module_langname = 'ACP_LANGUAGE'";
+		$result = $this->db->sql_query($sql);
+		$language_management_module_id = $this->db->sql_fetchfield('module_id');
+		$this->db->sql_freeresult($result);
+
+		if (!class_exists('acp_modules'))
+		{
+			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
+		}
+		// acp_modules calls adm_back_link, which is undefined at this point
+		if (!function_exists('adm_back_link'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
+		}
+		$module_manager = new acp_modules();
+		$module_manager->module_class = 'acp';
+		$module_manager->move_module($language_module_id, $language_management_module_id);
+	}
+
+	public function update_ucp_pm_basename()
+	{
+		$sql = 'SELECT module_id, module_basename
+			FROM ' . MODULES_TABLE . "
+			WHERE module_basename <> 'ucp_pm' AND
+				module_langname='UCP_PM'";
+		$result = $this->db->sql_query_limit($sql, 1);
+
+		if ($row = $this->db->sql_fetchrow($result))
+		{
+			// This update is still not applied. Applying it
+
+			$sql = 'UPDATE ' . MODULES_TABLE . "
+				SET module_basename = 'ucp_pm'
+				WHERE  module_id = " . (int) $row['module_id'];
+
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function update_ucp_profile_auth()
+	{
+		// Update the auth setting for the module
+		$sql = 'UPDATE ' . MODULES_TABLE . "
+			SET module_auth = 'acl_u_chgprofileinfo'
+			WHERE module_class = 'ucp'
+				AND module_basename = 'ucp_profile'
+				AND module_mode = 'profile_info'";
+		$this->sql_query($sql);
+	}
+
+	public function rename_styles_module()
+	{
+		// Rename styles module to Customise
+		$sql = 'UPDATE ' . MODULES_TABLE . "
+			SET module_langname = 'ACP_CAT_CUSTOMISE'
+			WHERE module_langname = 'ACP_CAT_STYLES'";
+		$this->sql_query($sql);
+	}
+
+	public function rename_module_basenames()
+	{
+		// rename all module basenames to full classname
+		$sql = 'SELECT module_id, module_basename, module_class
+			FROM ' . MODULES_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$module_id = (int) $row['module_id'];
+			unset($row['module_id']);
+
+			if (!empty($row['module_basename']) && !empty($row['module_class']))
+			{
+				// all the class names start with class name or with phpbb_ for auto loading
+				if (strpos($row['module_basename'], $row['module_class'] . '_') !== 0 &&
+					strpos($row['module_basename'], 'phpbb_') !== 0)
+				{
+					$row['module_basename'] = $row['module_class'] . '_' . $row['module_basename'];
+
+					$sql_update = $this->db->sql_build_array('UPDATE', $row);
+
+					$sql = 'UPDATE ' . MODULES_TABLE . '
+						SET ' . $sql_update . '
+						WHERE module_id = ' . $module_id;
+					$this->sql_query($sql);
+				}
+			}
+		}
+
+		$this->db->sql_freeresult($result);
+	}
+
+	public function add_group_teampage()
+	{
+		$sql = 'UPDATE ' . GROUPS_TABLE . '
+			SET group_teampage = 1
+			WHERE group_type = ' . GROUP_SPECIAL . "
+				AND group_name = 'ADMINISTRATORS'";
+		$this->sql_query($sql);
+
+		$sql = 'UPDATE ' . GROUPS_TABLE . '
+			SET group_teampage = 2
+			WHERE group_type = ' . GROUP_SPECIAL . "
+				AND group_name = 'GLOBAL_MODERATORS'";
+		$this->sql_query($sql);
+	}
+
+	public function update_group_legend()
+	{
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . '
+			WHERE group_legend = 1
+			ORDER BY group_name ASC';
+		$result = $this->db->sql_query($sql);
+
+		$next_legend = 1;
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql = 'UPDATE ' . GROUPS_TABLE . '
+				SET group_legend = ' . $next_legend . '
+				WHERE group_id = ' . (int) $row['group_id'];
+			$this->sql_query($sql);
+
+			$next_legend++;
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	public function localise_global_announcements()
+	{
+		// Localise Global Announcements
+		$sql = 'SELECT topic_id, topic_approved, (topic_replies + 1) AS topic_posts, topic_last_post_id, topic_last_post_subject, topic_last_post_time, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour
+			FROM ' . TOPICS_TABLE . '
+			WHERE forum_id = 0
+				AND topic_type = ' . POST_GLOBAL;
+		$result = $this->db->sql_query($sql);
+
+		$global_announcements = $update_lastpost_data = array();
+		$update_lastpost_data['forum_last_post_time'] = 0;
+		$update_forum_data = array(
+			'forum_posts'		=> 0,
+			'forum_topics'		=> 0,
+			'forum_topics_real'	=> 0,
+		);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$global_announcements[] = (int) $row['topic_id'];
+
+			$update_forum_data['forum_posts'] += (int) $row['topic_posts'];
+			$update_forum_data['forum_topics_real']++;
+			if ($row['topic_approved'])
+			{
+				$update_forum_data['forum_topics']++;
+			}
+
+			if ($update_lastpost_data['forum_last_post_time'] < $row['topic_last_post_time'])
+			{
+				$update_lastpost_data = array(
+					'forum_last_post_id'		=> (int) $row['topic_last_post_id'],
+					'forum_last_post_subject'	=> $row['topic_last_post_subject'],
+					'forum_last_post_time'		=> (int) $row['topic_last_post_time'],
+					'forum_last_poster_id'		=> (int) $row['topic_last_poster_id'],
+					'forum_last_poster_name'	=> $row['topic_last_poster_name'],
+					'forum_last_poster_colour'	=> $row['topic_last_poster_colour'],
+				);
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!empty($global_announcements))
+		{
+			// Update the post/topic-count for the forum and the last-post if needed
+			$sql = 'SELECT forum_id
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_type = ' . FORUM_POST;
+			$result = $this->db->sql_query_limit($sql, 1);
+			$ga_forum_id = $this->db->sql_fetchfield('forum_id');
+			$this->db->sql_freeresult($result);
+
+			$sql = 'SELECT forum_last_post_time
+				FROM ' . FORUMS_TABLE . '
+				WHERE forum_id = ' . $ga_forum_id;
+			$result = $this->db->sql_query($sql);
+			$lastpost = (int) $this->db->sql_fetchfield('forum_last_post_time');
+			$this->db->sql_freeresult($result);
+
+			$sql_update = 'forum_posts = forum_posts + ' . $update_forum_data['forum_posts'] . ', ';
+			$sql_update .= 'forum_topics_real = forum_topics_real + ' . $update_forum_data['forum_topics_real'] . ', ';
+			$sql_update .= 'forum_topics = forum_topics + ' . $update_forum_data['forum_topics'];
+			if ($lastpost < $update_lastpost_data['forum_last_post_time'])
+			{
+				$sql_update .= ', ' . $this->db->sql_build_array('UPDATE', $update_lastpost_data);
+			}
+
+			$sql = 'UPDATE ' . FORUMS_TABLE . '
+				SET ' . $sql_update . '
+				WHERE forum_id = ' . $ga_forum_id;
+			$this->sql_query($sql);
+
+			// Update some forum_ids
+			$table_ary = array(TOPICS_TABLE, POSTS_TABLE, LOG_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE);
+			foreach ($table_ary as $table)
+			{
+				$sql = "UPDATE $table
+					SET forum_id = $ga_forum_id
+					WHERE " . $this->db->sql_in_set('topic_id', $global_announcements);
+				$this->sql_query($sql);
+			}
+			unset($table_ary);
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/extensions.php b/phpBB/includes/db/migration/data/310/extensions.php
new file mode 100644
index 0000000000..6a9caa1cfc
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/extensions.php
@@ -0,0 +1,69 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_extensions extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'ext');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables'		=> array(
+				$this->table_prefix . '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'),
+					),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'		=> array(
+				$this->table_prefix . 'ext',
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			// Module will be renamed later
+			array('module.add', array(
+				'acp',
+				'ACP_CAT_STYLES',
+				'ACP_EXTENSION_MANAGEMENT'
+			)),
+			array('module.add', array(
+				'acp',
+				'ACP_EXTENSION_MANAGEMENT',
+				array(
+					'module_basename'	=> 'acp_extensions',
+					'modes'				=> array('main'),
+				),
+			)),
+			array('permission.add', array('a_extensions', true, 'a_styles')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/reported_posts_display.php b/phpBB/includes/db/migration/data/310/reported_posts_display.php
new file mode 100644
index 0000000000..80a0a0e43f
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/reported_posts_display.php
@@ -0,0 +1,47 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_reported_posts_display extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_column_exists($this->table_prefix . 'reports', 'reported_post_enable_bbcode');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_columns'		=> array(
+				$this->table_prefix . 'reports'		=> array(
+					'reported_post_enable_bbcode'		=> array('BOOL', 1),
+					'reported_post_enable_smilies'		=> array('BOOL', 1),
+					'reported_post_enable_magic_url'	=> array('BOOL', 1),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_columns'		=> array(
+				$this->table_prefix . 'reports'		=> array(
+					'reported_post_enable_bbcode',
+					'reported_post_enable_smilies',
+					'reported_post_enable_magic_url',
+				),
+			),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/style_update_p1.php b/phpBB/includes/db/migration/data/310/style_update_p1.php
new file mode 100644
index 0000000000..e324ce7f24
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/style_update_p1.php
@@ -0,0 +1,157 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_style_update_p1 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'styles_update'))),
+		);
+	}
+
+	public function styles_update()
+	{
+		// Get list of valid 3.1 styles
+		$available_styles = array('prosilver');
+
+		$iterator = new DirectoryIterator($this->phpbb_root_path . 'styles');
+		$skip_dirs = array('.', '..', 'prosilver');
+		foreach ($iterator as $fileinfo)
+		{
+			if ($fileinfo->isDir() && !in_array($fileinfo->getFilename(), $skip_dirs) && file_exists($fileinfo->getPathname() . '/style.cfg'))
+			{
+				$style_cfg = parse_cfg_file($fileinfo->getPathname() . '/style.cfg');
+				if (isset($style_cfg['phpbb_version']) && version_compare($style_cfg['phpbb_version'], '3.1.0-dev', '>='))
+				{
+					// 3.1 style
+					$available_styles[] = $fileinfo->getFilename();
+				}
+			}
+		}
+
+		// Get all installed styles
+		if ($this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset'))
+		{
+			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id, i.imageset_path
+				FROM ' . STYLES_TABLE . ' s, ' . $this->table_prefix . 'styles_template t, ' . $this->table_prefix . 'styles_theme c, ' . $this->table_prefix . "styles_imageset i
+				WHERE t.template_id = s.template_id
+					AND c.theme_id = s.theme_id
+					AND i.imageset_id = s.imageset_id";
+		}
+		else
+		{
+			$sql = 'SELECT s.style_id, t.template_path, t.template_id, t.bbcode_bitfield, t.template_inherits_id, t.template_inherit_path, c.theme_path, c.theme_id
+				FROM ' . STYLES_TABLE . ' s, ' . $this->table_prefix . 'styles_template t, ' . $this->table_prefix . "stles_theme c
+				WHERE t.template_id = s.template_id
+					AND c.theme_id = s.theme_id";
+		}
+		$result = $this->db->sql_query($sql);
+
+		$styles = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$styles[] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		// Decide which styles to keep, all others will be deleted
+		$valid_styles = array();
+		foreach ($styles as $style_row)
+		{
+			if (
+				// Delete styles with parent style (not supported yet)
+				$style_row['template_inherits_id'] == 0 &&
+				// Check if components match
+				$style_row['template_path'] == $style_row['theme_path'] && (!isset($style_row['imageset_path']) || $style_row['template_path'] == $style_row['imageset_path']) &&
+				// Check if components are valid
+				in_array($style_row['template_path'], $available_styles)
+				)
+			{
+				// Valid style. Keep it
+				$sql_ary = array(
+					'style_path'	=> $style_row['template_path'],
+					'bbcode_bitfield'	=> $style_row['bbcode_bitfield'],
+					'style_parent_id'	=> 0,
+					'style_parent_tree'	=> '',
+				);
+				$this->sql_query('UPDATE ' . STYLES_TABLE . '
+					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+					WHERE style_id = ' . $style_row['style_id']);
+				$valid_styles[] = (int) $style_row['style_id'];
+			}
+		}
+
+		// Remove old entries from styles table
+		if (!sizeof($valid_styles))
+		{
+			// No valid styles: remove everything and add prosilver
+			$this->sql_query('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
+
+			$sql_ary = array(
+				'style_name'		=> 'prosilver',
+				'style_copyright'	=> '&copy; phpBB Group',
+				'style_active'		=> 1,
+				'style_path'		=> 'prosilver',
+				'bbcode_bitfield'	=> 'lNg=',
+				'style_parent_id'	=> 0,
+				'style_parent_tree'	=> '',
+
+				// Will be removed in the next step
+				'imageset_id'		=> 0,
+				'template_id'		=> 0,
+				'theme_id'			=> 0,
+			);
+
+			$sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $this->db->sql_build_array('INSERT', $sql_ary);
+			$this->sql_query($sql);
+
+			$sql = 'SELECT style_id
+				FROM ' . $table . "
+				WHERE style_name = 'prosilver'";
+			$result = $this->sql_query($sql);
+			$default_style = $this->db->sql_fetchfield($result);
+			$this->db->sql_freeresult($result);
+
+			set_config('default_style', $default_style);
+
+			$sql = 'UPDATE ' . USERS_TABLE . ' SET user_style = 0';
+			$this->sql_query($sql);
+		}
+		else
+		{
+			// There are valid styles in styles table. Remove styles that are outdated
+			$this->sql_query('DELETE FROM ' . STYLES_TABLE . '
+				WHERE ' . $this->db->sql_in_set('style_id', $valid_styles, true));
+
+			// Change default style
+			if (!in_array($this->config['default_style'], $valid_styles))
+			{
+				$this->sql_query('UPDATE ' . CONFIG_TABLE . "
+					SET config_value = '" . $valid_styles[0] . "'
+					WHERE config_name = 'default_style'");
+			}
+
+			// Reset styles for users
+			$this->sql_query('UPDATE ' . USERS_TABLE . '
+				SET user_style = 0
+				WHERE ' . $this->db->sql_in_set('user_style', $valid_styles, true));
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/style_update_p2.php b/phpBB/includes/db/migration/data/310/style_update_p2.php
new file mode 100644
index 0000000000..7b10518a66
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/style_update_p2.php
@@ -0,0 +1,129 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_style_update_p2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_table_exists($this->table_prefix . 'styles_imageset');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_style_update_p1');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_columns'	=> array(
+				$this->table_prefix . 'styles'		=> array(
+					'imageset_id',
+					'template_id',
+					'theme_id',
+				),
+			),
+
+			'drop_tables'	=> array(
+				$this->table_prefix . 'styles_imageset',
+				$this->table_prefix . 'styles_imageset_data',
+				$this->table_prefix . 'styles_template',
+				$this->table_prefix . 'styles_template_data',
+				$this->table_prefix . 'styles_theme',
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'add_columns'	=> array(
+				$this->table_prefix . 'styles'		=> array(
+					'imageset_id'	=> array('UINT', 0),
+					'template_id'	=> array('UINT', 0),
+					'theme_id'		=> array('UINT', 0),
+				),
+			),
+
+			'add_tables'	=> array(
+				$this->table_prefix . 'styles_imageset'		=> array(
+					'COLUMNS'		=> array(
+						'imageset_id'				=> array('UINT', NULL, 'auto_increment'),
+						'imageset_name'				=> array('VCHAR_UNI:255', ''),
+						'imageset_copyright'		=> array('VCHAR_UNI', ''),
+						'imageset_path'				=> array('VCHAR:100', ''),
+					),
+					'PRIMARY_KEY'		=> 'imageset_id',
+					'KEYS'				=> array(
+						'imgset_nm'			=> array('UNIQUE', 'imageset_name'),
+					),
+				),
+				$this->table_prefix . 'styles_imageset_data'	=> array(
+					'COLUMNS'		=> array(
+						'image_id'				=> array('UINT', NULL, 'auto_increment'),
+						'image_name'			=> array('VCHAR:200', ''),
+						'image_filename'		=> array('VCHAR:200', ''),
+						'image_lang'			=> array('VCHAR:30', ''),
+						'image_height'			=> array('USINT', 0),
+						'image_width'			=> array('USINT', 0),
+						'imageset_id'			=> array('UINT', 0),
+					),
+					'PRIMARY_KEY'		=> 'image_id',
+					'KEYS'				=> array(
+						'i_d'			=> array('INDEX', 'imageset_id'),
+					),
+				),
+				$this->table_prefix . 'styles_template'		=> array(
+					'COLUMNS'		=> array(
+						'template_id'			=> array('UINT', NULL, 'auto_increment'),
+						'template_name'			=> array('VCHAR_UNI:255', ''),
+						'template_copyright'	=> array('VCHAR_UNI', ''),
+						'template_path'			=> array('VCHAR:100', ''),
+						'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+						'template_storedb'		=> array('BOOL', 0),
+						'template_inherits_id'		=> array('UINT:4', 0),
+						'template_inherit_path'		=> array('VCHAR', ''),
+					),
+					'PRIMARY_KEY'	=> 'template_id',
+					'KEYS'			=> array(
+						'tmplte_nm'				=> array('UNIQUE', 'template_name'),
+					),
+				),
+				$this->table_prefix . 'styles_template_data'	=> array(
+					'COLUMNS'		=> array(
+						'template_id'			=> array('UINT', 0),
+						'template_filename'		=> array('VCHAR:100', ''),
+						'template_included'		=> array('TEXT', ''),
+						'template_mtime'		=> array('TIMESTAMP', 0),
+						'template_data'			=> array('MTEXT_UNI', ''),
+					),
+					'KEYS'			=> array(
+						'tid'					=> array('INDEX', 'template_id'),
+						'tfn'					=> array('INDEX', 'template_filename'),
+					),
+				),
+				$this->table_prefix . 'styles_theme'			=> array(
+					'COLUMNS'		=> array(
+						'theme_id'				=> array('UINT', NULL, 'auto_increment'),
+						'theme_name'			=> array('VCHAR_UNI:255', ''),
+						'theme_copyright'		=> array('VCHAR_UNI', ''),
+						'theme_path'			=> array('VCHAR:100', ''),
+						'theme_storedb'			=> array('BOOL', 0),
+						'theme_mtime'			=> array('TIMESTAMP', 0),
+						'theme_data'			=> array('MTEXT_UNI', ''),
+					),
+					'PRIMARY_KEY'	=> 'theme_id',
+					'KEYS'			=> array(
+						'theme_name'		=> array('UNIQUE', 'theme_name'),
+					),
+				),
+			),
+		);
+	}
+}
diff --git a/phpBB/includes/update_helpers.php b/phpBB/includes/db/migration/data/310/timezone.php
index 69d678b2f8..6e50cbe45f 100644
--- a/phpBB/includes/update_helpers.php
+++ b/phpBB/includes/db/migration/data/310/timezone.php
@@ -1,16 +1,67 @@
 <?php
 /**
 *
-* @package phpBB3
+* @package migration
 * @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
 */
 
-/**
-* phpBB Update Helpers
-*/
-class phpbb_update_helpers
+class phpbb_db_migration_data_310_timezone extends phpbb_db_migration
 {
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_dst');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_30x_3_0_11');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'change_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_timezone'		=> array('VCHAR:100', ''),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'update_timezones'))),
+		);
+	}
+
+	public function update_timezones()
+	{
+		// Update user timezones
+		$sql = 'SELECT user_dst, user_timezone
+			FROM ' . $this->table_prefix . 'users
+			GROUP BY user_timezone, user_dst';
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$sql = 'UPDATE ' . $this->table_prefix . "users
+				SET user_timezone = '" . $this->db->sql_escape($this->convert_phpbb30_timezone($row['user_timezone'], $row['user_dst'])) . "'
+				WHERE user_timezone = '" . $this->db->sql_escape($row['user_timezone']) . "'
+					AND user_dst = " . (int) $row['user_dst'];
+			$this->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+
+		// Update board default timezone
+		$sql = 'UPDATE ' . $this->table_prefix . "config
+			SET config_value = '" . $this->convert_phpbb30_timezone($this->config['board_timezone'], $this->config['board_dst']) . "'
+			WHERE config_name = 'board_timezone'";
+		$this->sql_query($sql);
+	}
+
 	/**
 	* Determine the new timezone for a given phpBB 3.0 timezone and
 	* "Daylight Saving Time" option
@@ -19,7 +70,7 @@ class phpbb_update_helpers
 	*	@param	$dst		int		Users daylight saving time
 	*	@return		string		Users new php Timezone which is used since 3.1
 	*/
-	function convert_phpbb30_timezone($timezone, $dst)
+	public function convert_phpbb30_timezone($timezone, $dst)
 	{
 		$offset = $timezone + $dst;
 
diff --git a/phpBB/includes/db/migration/data/310/timezone_p2.php b/phpBB/includes/db/migration/data/310/timezone_p2.php
new file mode 100644
index 0000000000..113b979e4f
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/timezone_p2.php
@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_timezone_p2 extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_dst');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_timezone');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_dst',
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'add_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_dst'		=> array('BOOL', 0),
+				),
+			),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 41d996b1e3..74f71775f3 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -99,18 +99,26 @@ class phpbb_db_migrator
 	{
 		$this->migration_state = array();
 
+		// prevent errors in case the table does not exist yet
+		$this->db->sql_return_on_error(true);
+
 		$sql = "SELECT *
 			FROM " . $this->migrations_table;
 		$result = $this->db->sql_query($sql);
 
-		while ($migration = $this->db->sql_fetchrow($result))
+		if (!$this->db->sql_error_triggered)
 		{
-			$this->migration_state[$migration['migration_name']] = $migration;
+			while ($migration = $this->db->sql_fetchrow($result))
+			{
+				$this->migration_state[$migration['migration_name']] = $migration;
 
-			$this->migration_state[$migration['migration_name']]['migration_depends_on'] = unserialize($migration['migration_depends_on']);
+				$this->migration_state[$migration['migration_name']]['migration_depends_on'] = unserialize($migration['migration_depends_on']);
+			}
 		}
 
 		$this->db->sql_freeresult($result);
+
+		$this->db->sql_return_on_error(false);
 	}
 
 	/**
author	Joas Schilling <nickvergessen@gmx.de>	2013-02-27 00:12:51 +0100
committer	Joas Schilling <nickvergessen@gmx.de>	2013-02-27 00:12:51 +0100
commit	f76f36c6693d8c4545d45f1454db102b1b313d07 (patch)
tree	f28782ba502d833e5f95491a420dd0f8c31b04a9 /phpBB/includes
parent	d61eb95b4868377cfc2a7a98b03a7d908418b1af (diff)
parent	80bd78a5e5e1069773c05073cd47662a311bda79 (diff)
download	forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar.gz forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar.bz2 forums-f76f36c6693d8c4545d45f1454db102b1b313d07.tar.xz forums-f76f36c6693d8c4545d45f1454db102b1b313d07.zip