2 files changed, 106 insertions, 64 deletions
diff --git a/phpBB/includes/db/migration/data/310/notifications.php b/phpBB/includes/db/migration/data/310/notifications.php
index 82bfd4cb2d..17c939d95a 100644
--- a/phpBB/includes/db/migration/data/310/notifications.php
+++ b/phpBB/includes/db/migration/data/310/notifications.php
@@ -91,70 +91,6 @@ class phpbb_db_migration_data_310_notifications extends phpbb_db_migration
 				),
 			)),
 			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/data/310/notifications3.php b/phpBB/includes/db/migration/data/310/notifications3.php
new file mode 100644
index 0000000000..22839dbd7b
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/notifications3.php
@@ -0,0 +1,106 @@
+<?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_notifications3 extends phpbb_db_migration
+{
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_notifications2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'convert_notifications'))),
+		);
+	}
+
+	public function convert_notifications()
+	{
+		$insert_table = $this->table_prefix . 'user_notifications';
+		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $insert_table);
+
+		$this->perform_conversion($insert_buffer, $insert_table);
+	}
+
+	/**
+	* Perform the conversion (separate for testability)
+	*/
+	public function perform_conversion($insert_buffer, $insert_table)
+	{
+		$sql = 'DELETE FROM ' . $insert_table;
+		$this->db->sql_query($sql);
+
+		$sql = 'SELECT user_id, user_notify_type, user_notify_pm
+			FROM ' . USERS_TABLE;
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$notification_methods = array();
+
+			// In-board notification
+			$notification_methods[] = '';
+
+			if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH)
+			{
+				$notification_methods[] = 'email';
+			}
+
+			if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH)
+			{
+				$notification_methods[] = 'jabber';
+			}
+
+			// Notifications for  posts
+			foreach (array('post', 'topic') as $item_type)
+			{
+				$this->add_method_rows(
+					$insert_buffer,
+					$item_type,
+					0,
+					$row['user_id'],
+					$notification_methods
+				);
+			}
+
+			if ($row['user_notify_pm'])
+			{
+				// Notifications for private messages
+				// User either gets all methods or no method
+				$this->add_method_rows(
+					$insert_buffer,
+					'pm',
+					0,
+					$row['user_id'],
+					$notification_methods
+				);
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		$insert_buffer->flush();
+	}
+
+	protected function add_method_rows(phpbb_db_sql_insert_buffer $insert_buffer, $item_type, $item_id, $user_id, array $methods)
+	{
+		$row_base = array(
+			'item_type'		=> $item_type,
+			'item_id'		=> (int) $item_id,
+			'user_id'		=> (int) $user_id,
+			'notify'		=> 1
+		);
+
+		foreach ($methods as $method)
+		{
+			$row_base['method'] = $method;
+			$insert_buffer->insert($row_base);
+		}
+	}
+}