3 files changed, 248 insertions, 114 deletions
diff --git a/phpBB/includes/db/migration/data/310/notifications.php b/phpBB/includes/db/migration/data/310/notifications.php
new file mode 100644
index 0000000000..82bfd4cb2d
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/notifications.php
@@ -0,0 +1,160 @@
+<?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_notifications extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'notifications');
+	}
+
+	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 . 'notification_types'	=> array(
+					'COLUMNS'			=> array(
+						'notification_type'			=> array('VCHAR:255', ''),
+						'notification_type_enabled'	=> array('BOOL', 1),
+					),
+					'PRIMARY_KEY'		=> array('notification_type', 'notification_type_enabled'),
+				),
+				$this->table_prefix . 'notifications'		=> array(
+					'COLUMNS'			=> array(
+						'notification_id'  				=> array('UINT', NULL, 'auto_increment'),
+						'item_type'			   			=> array('VCHAR:255', ''),
+						'item_id'		  				=> array('UINT', 0),
+						'item_parent_id'   				=> array('UINT', 0),
+						'user_id'						=> array('UINT', 0),
+						'notification_read'				=> array('BOOL', 0),
+						'notification_time'				=> array('TIMESTAMP', 1),
+						'notification_data'			   	=> array('TEXT_UNI', ''),
+					),
+					'PRIMARY_KEY'		=> 'notification_id',
+					'KEYS'				=> array(
+						'item_ident'		=> array('INDEX', array('item_type', 'item_id')),
+						'user'				=> array('INDEX', array('user_id', 'notification_read')),
+					),
+				),
+				$this->table_prefix . 'user_notifications'	=> array(
+					'COLUMNS'			=> array(
+						'item_type'			=> array('VCHAR:255', ''),
+						'item_id'			=> array('UINT', 0),
+						'user_id'			=> array('UINT', 0),
+						'method'			=> array('VCHAR:255', ''),
+						'notify'			=> array('BOOL', 1),
+					),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'	=> array(
+				$this->table_prefix . 'notification_types',
+				$this->table_prefix . 'notifications',
+				$this->table_prefix . 'user_notifications',
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('module.add', array(
+				'ucp',
+				'UCP_MAIN',
+				array(
+					'module_basename'	=> 'ucp_notifications',
+					'modes'				=> array('notification_list'),
+				),
+			)),
+			array('module.add', array(
+				'ucp',
+				'UCP_PREFS',
+				array(
+					'module_basename'	=> 'ucp_notifications',
+					'modes'				=> array('notification_options'),
+				),
+			)),
+			array('config.add', array('load_notifications', 1)),
+			array('custom', array(array($this, 'convert_notifications'))),
+		);
+	}
+
+	public function convert_notifications()
+	{
+		$convert_notifications = array(
+			array(
+				'check'			=> ($this->config['allow_topic_notify']),
+				'item_type'		=> 'post',
+			),
+			array(
+				'check'			=> ($this->config['allow_forum_notify']),
+				'item_type'		=> 'topic',
+			),
+			array(
+				'check'			=> ($this->config['allow_bookmarks']),
+				'item_type'		=> 'bookmark',
+			),
+			array(
+				'check'			=> ($this->config['allow_privmsg']),
+				'item_type'		=> 'pm',
+			),
+		);
+
+		foreach ($convert_notifications as $convert_data)
+		{
+			if ($convert_data['check'])
+			{
+				$sql = 'SELECT user_id, user_notify_type
+					FROM ' . USERS_TABLE . '
+						WHERE user_notify = 1';
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
+						'item_type'		=> $convert_data['item_type'],
+						'item_id'		=> 0,
+						'user_id'		=> $row['user_id'],
+						'method'		=> '',
+					)));
+
+					if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
+					{
+						$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
+							'item_type'		=> $convert_data['item_type'],
+							'item_id'		=> 0,
+							'user_id'		=> $row['user_id'],
+							'method'		=> 'email',
+						)));
+					}
+
+					if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
+					{
+						$this->sql_query('INSERT INTO ' . $this->table_prefix . 'user_notifications ' . $this->db->sql_build_array('INSERT', array(
+							'item_type'		=> $convert_data['item_type'],
+							'item_id'		=> 0,
+							'user_id'		=> $row['user_id'],
+							'method'		=> 'jabber',
+						)));
+					}
+				}
+				$this->db->sql_freeresult($result);
+			}
+		}
+	}
+}
diff --git a/phpBB/includes/db/migration/tool/module.php b/phpBB/includes/db/migration/tool/module.php
index 4d7fae2bb0..ad94c5aadb 100644
--- a/phpBB/includes/db/migration/tool/module.php
+++ b/phpBB/includes/db/migration/tool/module.php
@@ -183,25 +183,7 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			$basename = str_replace(array('/', '\\'), '', $basename);
 			$class = str_replace(array('/', '\\'), '', $class);
 
-			$include_path = ($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path;
-			$info_file = "$class/info/$basename.{$this->php_ext}";
-
-			// The manual and automatic ways both failed...
-			if (!file_exists($include_path . $info_file))
-			{
-				throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $info_file);
-			}
-
-			$classname = "{$basename}_info";
-
-			if (!class_exists($classname))
-			{
-				include($include_path . $info_file);
-			}
-
-			$info = new $classname;
-			$module = $info->module();
-			unset($info);
+			$module = $this->get_module_info($class, $basename);
 
 			$result = '';
 			foreach ($module['modes'] as $mode => $module_info)
@@ -373,30 +355,13 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			$basename = str_replace(array('/', '\\'), '', $module['module_basename']);
 			$class = str_replace(array('/', '\\'), '', $class);
 
-			$include_path = ($include_path === false) ? $this->phpbb_root_path . 'includes/' : $include_path;
-			$info_file = "$class/info/$basename.{$this->php_ext}";
-
-			if (!file_exists($include_path . $info_file))
-			{
-				throw new phpbb_db_migration_exception('MODULE_NOT_EXIST', $info_file);
-			}
-
-			$classname = "{$basename}_info";
-
-			if (!class_exists($classname))
-			{
-				include($include_path . $info_file);
-			}
-
-			$info = new $classname;
-			$module_info = $info->module();
-			unset($info);
+			$module_info = $this->get_module_info($class, $basename);
 
 			foreach ($module_info['modes'] as $mode => $info)
 			{
 				if (!isset($module['modes']) || in_array($mode, $module['modes']))
 				{
-					$this->remove($class, $parent, $info['title']) . '<br />';
+					$this->remove($class, $parent, $info['title']);
 				}
 			}
 		}
@@ -510,4 +475,28 @@ class phpbb_db_migration_tool_module implements phpbb_db_migration_tool_interfac
 			return call_user_func_array(array(&$this, $call), $arguments);
 		}
 	}
+
+	/**
+	* Wrapper for acp_modules::get_module_infos()
+	*
+	* @param string $class Module Class
+	* @param string $basename Module Basename
+	* @return array Module Information
+	*/
+	protected function get_module_info($class, $basename)
+	{
+		if (!class_exists('acp_modules'))
+		{
+			include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
+		}
+		$acp_modules = new acp_modules();
+		$module = $acp_modules->get_module_infos($basename, $class, true);
+
+		if (empty($module))
+		{
+			throw new phpbb_db_migration_exception('MODULE_INFO_FILE_NOT_EXIST', $class, $basename);
+		}
+
+		return array_pop($module);
+	}
 }
diff --git a/phpBB/includes/db/migrator.php b/phpBB/includes/db/migrator.php
index 74f71775f3..7b5e8cb2de 100644
--- a/phpBB/includes/db/migrator.php
+++ b/phpBB/includes/db/migrator.php
@@ -31,6 +31,9 @@ class phpbb_db_migrator
 	/** @var phpbb_db_tools */
 	protected $db_tools;
 
+	/** @var phpbb_extension_manager */
+	protected $extension_manager;
+
 	/** @var string */
 	protected $table_prefix;
 
@@ -91,6 +94,16 @@ 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
@@ -161,7 +174,7 @@ class phpbb_db_migrator
 					'migration_start_time'	=> time(),
 					'migration_end_time'	=> time(),
 				);
-				$this->insert_migration($name, $state);
+				$this->set_migration_state($name, $state);
 			}
 		}
 
@@ -180,55 +193,32 @@ class phpbb_db_migrator
 	* 	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).
-	* @param bool $recursive Set to true to also load data files from subdirectories
 	* @return array Array of migration names
 	*/
-	public function load_migrations($path, $check_fulfillable = true, $recursive = true)
+	public function load_migrations($path, $check_fulfillable = true)
 	{
 		if (!is_dir($path))
 		{
 			throw new phpbb_db_migration_exception('DIRECTORY INVALID', $path);
 		}
 
-		$handle = opendir($path);
-		while (($file = readdir($handle)) !== false)
-		{
-			if ($file == '.' || $file == '..')
-			{
-				continue;
-			}
+		$migrations = array();
 
-			// Recursion through subdirectories
-			if (is_dir($path . $file) && $recursive)
-			{
-				$this->load_migrations($path . $file . '/', $check_fulfillable, $recursive);
-			}
+		$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);
 
-			if (strpos($file, '_') !== 0 && strrpos($file, '.' . $this->php_ext) === (strlen($file) - strlen($this->php_ext) - 1))
+		foreach ($migrations as $migration)
+		{
+			if (!in_array($migration, $this->migrations))
 			{
-				// We try to find what class existed by comparing the classes declared before and after including the file.
-				$declared_classes = get_declared_classes();
-
-				include ($path . $file);
-
-				$added_classes = array_diff(get_declared_classes(), $declared_classes);
-
-				if (
-					// If two classes have been added and phpbb_db_migration is one of them, we've only added one real migration
-					!(sizeof($added_classes) == 2 && in_array('phpbb_db_migration', $added_classes)) &&
-					// Otherwise there should only be one class added
-					sizeof($added_classes) != 1
-				)
-				{
-					throw new phpbb_db_migration_exception('MIGRATION DATA FILE INVALID', $path . $file);
-				}
-
-				$name = array_pop($added_classes);
-
-				if (!in_array($name, $this->migrations))
-				{
-					$this->migrations[] = $name;
-				}
+				$this->migrations[] = $migration;
 			}
 		}
 
@@ -316,23 +306,22 @@ class phpbb_db_migrator
 			'class'	=> $migration,
 		);
 
-		if ($migration->effectively_installed())
-		{
-			$state = array(
-				'migration_depends_on'	=> $migration->depends_on(),
-				'migration_schema_done' => true,
-				'migration_data_done'	=> true,
-				'migration_data_state'	=> '',
-				'migration_start_time'	=> 0,
-				'migration_end_time'	=> 0,
-			);
-		}
-		else
+		if (!isset($this->migration_state[$name]))
 		{
-			if (!isset($this->migration_state[$name]))
+			if ($migration->effectively_installed())
+			{
+				$state = array(
+					'migration_depends_on'	=> $migration->depends_on(),
+					'migration_schema_done' => true,
+					'migration_data_done'	=> true,
+					'migration_data_state'	=> '',
+					'migration_start_time'	=> 0,
+					'migration_end_time'	=> 0,
+				);
+			}
+			else
 			{
 				$state['migration_start_time'] = time();
-				$this->insert_migration($name, $state);
 			}
 		}
 
@@ -361,14 +350,7 @@ class phpbb_db_migrator
 			}
 		}
 
-		$insert = $state;
-		$insert['migration_depends_on'] = serialize($state['migration_depends_on']);
-		$sql = 'UPDATE ' . $this->migrations_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $insert) . "
-			WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
-		$this->db->sql_query($sql);
-
-		$this->migration_state[$name] = $state;
+		$this->set_migration_state($name, $state);
 
 		return true;
 	}
@@ -434,20 +416,13 @@ class phpbb_db_migrator
 			}
 			else
 			{
-				$result = $this->process_data_step($migration->revert_data(), $state['migration_data_state'], false);
+				$result = $this->process_data_step($migration->revert_data(), '', false);
 
 				$state['migration_data_state'] = ($result === true) ? '' : $result;
 				$state['migration_data_done'] = ($result === true) ? false : true;
 			}
 
-			$insert = $state;
-			$insert['migration_depends_on'] = serialize($state['migration_depends_on']);
-			$sql = 'UPDATE ' . $this->migrations_table . '
-				SET ' . $this->db->sql_build_array('UPDATE', $insert) . "
-				WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
-			$this->db->sql_query($sql);
-
-			$this->migration_state[$name] = $state;
+			$this->set_migration_state($name, $state);
 		}
 		else
 		{
@@ -660,21 +635,31 @@ class phpbb_db_migrator
 	}
 
 	/**
-	* Insert migration row into the database
+	* Insert/Update migration row into the database
 	*
 	* @param string $name Name of the migration
 	* @param array $state
 	* @return null
 	*/
-	protected function insert_migration($name, $state)
+	protected function set_migration_state($name, $state)
 	{
 		$migration_row = $state;
-		$migration_row['migration_name'] = $name;
 		$migration_row['migration_depends_on'] = serialize($state['migration_depends_on']);
 
-		$sql = 'INSERT INTO ' . $this->migrations_table . '
-			' . $this->db->sql_build_array('INSERT', $migration_row);
-		$this->db->sql_query($sql);
+		if (isset($this->migration_state[$name]))
+		{
+			$sql = 'UPDATE ' . $this->migrations_table . '
+				SET ' . $this->db->sql_build_array('UPDATE', $migration_row) . "
+				WHERE migration_name = '" . $this->db->sql_escape($name) . "'";
+			$this->db->sql_query($sql);
+		}
+		else
+		{
+			$migration_row['migration_name'] = $name;
+			$sql = 'INSERT INTO ' . $this->migrations_table . '
+				' . $this->db->sql_build_array('INSERT', $migration_row);
+			$this->db->sql_query($sql);
+		}
 
 		$this->migration_state[$name] = $state;
 	}