6 files changed, 272 insertions, 118 deletions
diff --git a/phpBB/includes/db/migration/data/310/avatars.php b/phpBB/includes/db/migration/data/310/avatars.php
new file mode 100644
index 0000000000..79547337f7
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/avatars.php
@@ -0,0 +1,67 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_avatars extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return isset($this->config['allow_avatar_gravatar']);
+	}
+
+	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_avatar_type'		=> array('VCHAR:255', ''),
+				),
+				$this->table_prefix . 'groups'			=> array(
+					'group_avatar_type'		=> array('VCHAR:255', ''),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'change_columns'	=> array(
+				$this->table_prefix . 'users'			=> array(
+					'user_avatar_type'		=> array('TINT:2', ''),
+				),
+				$this->table_prefix . 'groups'			=> array(
+					'group_avatar_type'		=> array('TINT:2', ''),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('allow_avatar_gravatar', 0)),
+			array('custom', array(array($this, 'update_module_auth'))),
+		);
+	}
+
+	public function update_module_auth()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . "modules
+			SET module_auth = 'cfg_allow_avatar'
+			WHERE module_class = 'ucp'
+				AND module_basename = 'ucp_profile'
+				AND module_mode = 'avatar'";
+		$this->db->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/teampage.php b/phpBB/includes/db/migration/data/310/teampage.php
new file mode 100644
index 0000000000..4e77da17b7
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/teampage.php
@@ -0,0 +1,104 @@
+<?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_teampage extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'teampage');
+	}
+
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_dev');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables'		=> array(
+				$this->table_prefix . 'teampage'	=> array(
+					'COLUMNS'		=> array(
+						'teampage_id'		=> array('UINT', NULL, 'auto_increment'),
+						'group_id'			=> array('UINT', 0),
+						'teampage_name'		=> array('VCHAR_UNI:255', ''),
+						'teampage_position'	=> array('UINT', 0),
+						'teampage_parent'	=> array('UINT', 0),
+					),
+					'PRIMARY_KEY'		=> 'teampage_id',
+				),
+			),
+			'drop_columns'		=> array(
+				$this->table_prefix . 'groups'		=> array(
+					'group_teampage',
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'		=> array(
+				$this->table_prefix . 'teampage',
+			),
+			'add_columns'		=> array(
+				$this->table_prefix . 'groups'		=> array(
+					'group_teampage'	=> array('UINT', 0, 'after' => 'group_legend'),
+				),
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'add_groups_teampage'))),
+		);
+	}
+
+	public function add_groups_teampage()
+	{
+		$sql = 'SELECT teampage_id
+			FROM ' . TEAMPAGE_TABLE;
+		$result = $this->db->sql_query_limit($sql, 1);
+		$added_groups_teampage = (bool) $this->db->sql_fetchfield('teampage_id');
+		$this->db->sql_freeresult($result);
+
+		if (!$added_groups_teampage)
+		{
+			$sql = 'SELECT *
+				FROM ' . GROUPS_TABLE . '
+				WHERE group_type = ' . GROUP_SPECIAL . "
+					AND (group_name = 'ADMINISTRATORS'
+						OR group_name = 'GLOBAL_MODERATORS')
+				ORDER BY group_name ASC";
+			$result = $this->db->sql_query($sql);
+
+			$teampage_entries = array();
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$teampage_entries[] = array(
+					'group_id'			=> (int) $row['group_id'],
+					'teampage_name'		=> '',
+					'teampage_position'	=> sizeof($teampage_entries) + 1,
+					'teampage_parent'	=> 0,
+				);
+			}
+			$this->db->sql_freeresult($result);
+
+			if (sizeof($teampage_entries))
+			{
+				$this->db->sql_multi_insert(TEAMPAGE_TABLE, $teampage_entries);
+			}
+			unset($teampage_entries);
+		}
+
+	}
+}
diff --git a/phpBB/includes/db/migration/tool/config.php b/phpBB/includes/db/migration/tool/config.php
index 458a25fb66..0b626bf455 100644
--- a/phpBB/includes/db/migration/tool/config.php
+++ b/phpBB/includes/db/migration/tool/config.php
@@ -49,7 +49,7 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 	{
 		if (isset($this->config[$config_name]))
 		{
-			throw new phpbb_db_migration_exception('CONFIG_ALREADY_EXIST', $config_name);
+			return;
 		}
 
 		$this->config->set($config_name, $config_value, !$is_dynamic);
@@ -105,7 +105,7 @@ class phpbb_db_migration_tool_config implements phpbb_db_migration_tool_interfac
 	{
 		if (!isset($this->config[$config_name]))
 		{
-			throw new phpbb_db_migration_exception('CONFIG_NOT_EXIST', $config_name);
+			return;
 		}
 
 		$this->config->delete($config_name);
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index ad94c5aadb..ec683d36af 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -236,7 +236,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 
 		if ($this->exists($class, $parent, $data['module_langname']))
 		{
-			throw new phpbb_db_migration_exception('MODULE_ALREADY_EXIST', $data['module_langname']);
+			return;
 		}
 
 		if (!class_exists('acp_modules'))
@@ -369,7 +369,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 		{
 			if (!$this->exists($class, $parent, $module))
 			{
-				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', ((isset($this->user->lang[$module])) ? $this->user->lang[$module] : $module));
+				return;
 			}
 
 			$parent_sql = '';
@@ -442,7 +442,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 				$result = $acp_modules->delete_module($module_id);
 				if (!empty($result))
 				{
-					throw new phpbb_db_migration_exception('MODULE_NOT_REMOVABLE', $module_id, $result);
+					return;
 				}
 			}
 
diff --git a/phpBB/includes/db/migration/tool/permission.php b/phpBB/includes/db/migration/tool/permission.php
index 4231fbe1dd..2f09c0ac72 100644
--- a/phpBB/includes/db/migration/tool/permission.php
+++ b/phpBB/includes/db/migration/tool/permission.php
@@ -107,7 +107,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	{
 		if ($this->exists($auth_option, $global))
 		{
-			throw new phpbb_db_migration_exception('PERMISSION_ALREADY_EXIST', $auth_option);
+			return;
 		}
 
 		// We've added permissions, so set to true to notify the user.
@@ -190,7 +190,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 	{
 		if (!$this->exists($auth_option, $global))
 		{
-			throw new phpbb_db_migration_exception('PERMISSION_NOT_EXIST', $auth_option);
+			return;
 		}
 
 		if ($global)
@@ -315,7 +315,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 
 		if (!$role_id)
 		{
-			throw new phpbb_db_migration_exception('ROLE_NOT_EXIST', $role_name);
+			return;
 		}
 
 		$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
@@ -422,7 +422,7 @@ class phpbb_db_migration_tool_permission implements phpbb_db_migration_tool_inte
 					$this->db->sql_query($sql);
 					$role_name = $this->db->sql_fetchfield('role_name');
 
-					return $this->set($role_name, $auth_option, 'role', $has_permission);
+					return $this->permission_set($role_name, $auth_option, 'role', $has_permission);
 				}
 
 				$sql = 'SELECT auth_option_id, auth_setting
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index de9c06948c..9d7cede95b 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -31,9 +31,6 @@ class phpbb_db_migrator
 	/** @var phpbb_db_tools */
 	protected $db_tools;
 
-	/** @var phpbb_extension_manager */
-	protected $extension_manager;
-
 	/** @var string */
 	protected $table_prefix;
 
@@ -63,7 +60,9 @@ class phpbb_db_migrator
 	protected $migrations = array();
 
 	/**
-	* 'name' and 'class' of the last migration run
+	* 'name,' 'class,' and 'state' of the last migration run
+	*
+	* 'effectively_installed' set and set to true if the migration was effectively_installed
 	*
 	* @var array
 	*/
@@ -94,16 +93,6 @@ class phpbb_db_migrator
 	}
 
 	/**
-	* Set Extension Manager (required)
-	*
-	* Not in constructor to prevent circular reference error
-	*/
-	public function set_extension_manager(phpbb_extension_manager $extension_manager)
-	{
-		$this->extension_manager = $extension_manager;
-	}
-
-	/**
 	* Loads all migrations and their application state from the database.
 	*
 	* @return null
@@ -146,98 +135,6 @@ class phpbb_db_migrator
 	}
 
 	/**
-	* This function adds all migrations in a specified directory to the migrations table
-	*
-	* THIS SHOULD NOT GENERALLY BE USED! THIS IS FOR THE PHPBB INSTALLER.
-	* THIS WILL THROW ERRORS IF MIGRATIONS ALREADY EXIST IN THE TABLE, DO NOT CALL MORE THAN ONCE!
-	*
-	* @param string $path Path to migration data files
-	* @param bool $recursive Set to true to also load data files from subdirectories
-	* @return null
-	*/
-	public function populate_migrations_from_directory($path, $recursive = true)
-	{
-		$existing_migrations = $this->migrations;
-
-		$this->migrations = array();
-		$this->load_migrations($path, true, $recursive);
-
-		foreach ($this->migrations as $name)
-		{
-			if ($this->migration_state($name) === false)
-			{
-				$state = array(
-					'migration_depends_on'	=> $name::depends_on(),
-					'migration_schema_done' => true,
-					'migration_data_done'	=> true,
-					'migration_data_state'	=> '',
-					'migration_start_time'	=> time(),
-					'migration_end_time'	=> time(),
-				);
-				$this->insert_migration($name, $state);
-			}
-		}
-
-		$this->migrations = $existing_migrations;
-	}
-
-	/**
-	* Load migration data files from a directory
-	*
-	* Migration data files loaded with this function MUST contain
-	* 	ONLY ONE class in them (or an exception will be thrown).
-	*
-	* @param string $path Path to migration data files
-	* @param bool $check_fulfillable If TRUE (default), we will check
-	* 	if all of the migrations are fulfillable after loading them.
-	* 	If FALSE, we will not check. You SHOULD check at least once
-	* 	to prevent errors (if including multiple directories, check
-	* 	with the last call to prevent throwing errors unnecessarily).
-	* @return array Array of migration names
-	*/
-	public function load_migrations($path, $check_fulfillable = true)
-	{
-		if (!is_dir($path))
-		{
-			throw new phpbb_db_migration_exception('DIRECTORY INVALID', $path);
-		}
-
-		$migrations = array();
-
-		$finder = $this->extension_manager->get_finder();
-		$files = $finder
-			->extension_directory("/")
-			->find_from_paths(array('/' => $path));
-		foreach ($files as $file)
-		{
-			$migrations[$file['path'] . $file['filename']] = '';
-		}
-		$migrations = $finder->get_classes_from_files($migrations);
-
-		foreach ($migrations as $migration)
-		{
-			if (!in_array($migration, $this->migrations))
-			{
-				$this->migrations[] = $migration;
-			}
-		}
-
-		if ($check_fulfillable)
-		{
-			foreach ($this->migrations as $name)
-			{
-				$unfulfillable = $this->unfulfillable($name);
-				if ($unfulfillable !== false)
-				{
-					throw new phpbb_db_migration_exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable);
-				}
-			}
-		}
-
-		return $this->migrations;
-	}
-
-	/**
 	* Runs a single update step from the next migration to be applied.
 	*
 	* The update step can either be a schema or a (partial) data update. To
@@ -304,6 +201,7 @@ class phpbb_db_migrator
 		$this->last_run_migration = array(
 			'name'	=> $name,
 			'class'	=> $migration,
+			'state'	=> $state,
 		);
 
 		if (!isset($this->migration_state[$name]))
@@ -318,6 +216,8 @@ class phpbb_db_migrator
 					'migration_start_time'	=> 0,
 					'migration_end_time'	=> 0,
 				);
+
+				$this->last_run_migration['effectively_installed'] = true;
 			}
 			else
 			{
@@ -350,7 +250,7 @@ class phpbb_db_migrator
 			}
 		}
 
-		$this->insert_migration($name, $state);
+		$this->set_migration_state($name, $state);
 
 		return true;
 	}
@@ -422,7 +322,7 @@ class phpbb_db_migrator
 				$state['migration_data_done'] = ($result === true) ? false : true;
 			}
 
-			$this->insert_migration($name, $state);
+			$this->set_migration_state($name, $state);
 		}
 		else
 		{
@@ -641,7 +541,7 @@ class phpbb_db_migrator
 	* @param array $state
 	* @return null
 	*/
-	protected function insert_migration($name, $state)
+	protected function set_migration_state($name, $state)
 	{
 		$migration_row = $state;
 		$migration_row['migration_depends_on'] = serialize($state['migration_depends_on']);
@@ -662,6 +562,8 @@ class phpbb_db_migrator
 		}
 
 		$this->migration_state[$name] = $state;
+
+		$this->last_run_migration['state'] = $state;
 	}
 
 	/**
@@ -754,4 +656,85 @@ class phpbb_db_migrator
 	{
 		return new $name($this->config, $this->db, $this->db_tools, $this->phpbb_root_path, $this->php_ext, $this->table_prefix);
 	}
+
+	/**
+	* This function adds all migrations sent to it to the migrations table
+	*
+	* THIS SHOULD NOT GENERALLY BE USED! THIS IS FOR THE PHPBB INSTALLER.
+	* THIS WILL THROW ERRORS IF MIGRATIONS ALREADY EXIST IN THE TABLE, DO NOT CALL MORE THAN ONCE!
+	*
+	* @param array $migrations Array of migrations (names) to add to the migrations table
+	* @return null
+	*/
+	public function populate_migrations($migrations)
+	{
+		foreach ($migrations as $name)
+		{
+			if ($this->migration_state($name) === false)
+			{
+				$state = array(
+					'migration_depends_on'	=> $name::depends_on(),
+					'migration_schema_done' => true,
+					'migration_data_done'	=> true,
+					'migration_data_state'	=> '',
+					'migration_start_time'	=> time(),
+					'migration_end_time'	=> time(),
+				);
+				$this->set_migration_state($name, $state);
+			}
+		}
+	}
+
+	/**
+	* Load migration data files from a directory
+	*
+	* @param phpbb_extension_finder $finder
+	* @param string $path Path to migration data files
+	* @param bool $check_fulfillable If TRUE (default), we will check
+	* 	if all of the migrations are fulfillable after loading them.
+	* 	If FALSE, we will not check. You SHOULD check at least once
+	* 	to prevent errors (if including multiple directories, check
+	* 	with the last call to prevent throwing errors unnecessarily).
+	* @return array Array of migration names
+	*/
+	public function load_migrations(phpbb_extension_finder $finder, $path, $check_fulfillable = true)
+	{
+		if (!is_dir($path))
+		{
+			throw new phpbb_db_migration_exception('DIRECTORY INVALID', $path);
+		}
+
+		$migrations = array();
+
+		$files = $finder
+			->extension_directory("/")
+			->find_from_paths(array('/' => $path));
+		foreach ($files as $file)
+		{
+			$migrations[$file['path'] . $file['filename']] = '';
+		}
+		$migrations = $finder->get_classes_from_files($migrations);
+
+		foreach ($migrations as $migration)
+		{
+			if (!in_array($migration, $this->migrations))
+			{
+				$this->migrations[] = $migration;
+			}
+		}
+
+		if ($check_fulfillable)
+		{
+			foreach ($this->migrations as $name)
+			{
+				$unfulfillable = $this->unfulfillable($name);
+				if ($unfulfillable !== false)
+				{
+					throw new phpbb_db_migration_exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable);
+				}
+			}
+		}
+
+		return $this->migrations;
+	}
 }