18 files changed, 1966 insertions, 326 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 68af41ab20..7a3c73e987 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -239,6 +239,7 @@ define('LOG_TABLE',					$table_prefix . 'log');
 define('LOGIN_ATTEMPT_TABLE',		$table_prefix . 'login_attempts');
 define('MODERATOR_CACHE_TABLE',		$table_prefix . 'moderator_cache');
 define('MODULES_TABLE',				$table_prefix . 'modules');
+define('NOTIFICATIONS_TABLE',		$table_prefix . 'notifications');
 define('POLL_OPTIONS_TABLE',		$table_prefix . 'poll_options');
 define('POLL_VOTES_TABLE',			$table_prefix . 'poll_votes');
 define('POSTS_TABLE',				$table_prefix . 'posts');
@@ -272,6 +273,7 @@ define('TOPICS_POSTED_TABLE',		$table_prefix . 'topics_posted');
 define('TOPICS_TRACK_TABLE',		$table_prefix . 'topics_track');
 define('TOPICS_WATCH_TABLE',		$table_prefix . 'topics_watch');
 define('USER_GROUP_TABLE',			$table_prefix . 'user_group');
+define('USER_NOTIFICATIONS_TABLE',	$table_prefix . 'user_notifications');
 define('USERS_TABLE',				$table_prefix . 'users');
 define('WARNINGS_TABLE',			$table_prefix . 'warnings');
 define('WORDS_TABLE',				$table_prefix . 'words');
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 834f57a38b..3d3dd1f5bc 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1285,15 +1285,20 @@ function phpbb_timezone_select($user, $default = '', $truncate = false)
 function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $user_id = 0)
 {
 	global $db, $user, $config;
-	global $request;
+	global $request, $phpbb_container;
 
 	if ($mode == 'all')
 	{
 		if ($forum_id === false || !sizeof($forum_id))
 		{
+			// Mark all forums read (index page)
+
+			// Mark all topic notifications read for this user
+			$notifications = $phpbb_container->get('notifications');
+			$notifications->mark_notifications_read('topic', false, $user->data['user_id'], $post_time);
+
 			if ($config['load_db_lastread'] && $user->data['is_registered'])
 			{
-				// Mark all forums read (index page)
 				$db->sql_query('DELETE FROM ' . TOPICS_TRACK_TABLE . " WHERE user_id = {$user->data['user_id']}");
 				$db->sql_query('DELETE FROM ' . FORUMS_TRACK_TABLE . " WHERE user_id = {$user->data['user_id']}");
 				$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_lastmark = ' . time() . " WHERE user_id = {$user->data['user_id']}");
@@ -1330,6 +1335,10 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 			$forum_id = array($forum_id);
 		}
 
+		// Mark topic notifications read for this user in this forum
+		$notifications = $phpbb_container->get('notifications');
+		$notifications->mark_notifications_read_by_parent('topic', $forum_id, $user->data['user_id'], $post_time);
+
 		// Add 0 to forums array to mark global announcements correctly
 		// $forum_id[] = 0;
 
@@ -1424,6 +1433,11 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $
 			return;
 		}
 
+		// Mark post notifications read for this user in this topic
+		$notifications = $phpbb_container->get('notifications');
+		$notifications->mark_notifications_read_by_parent('post', $topic_id, $user->data['user_id'], $post_time);
+		$notifications->mark_notifications_read_by_parent('quote', $topic_id, $user->data['user_id'], $post_time);
+
 		if ($config['load_db_lastread'] && $user->data['is_registered'])
 		{
 			$sql = 'UPDATE ' . TOPICS_TRACK_TABLE . '
@@ -4778,7 +4792,7 @@ function phpbb_http_login($param)
 function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum')
 {
 	global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path;
-	global $phpbb_dispatcher;
+	global $phpbb_dispatcher, $phpbb_container;
 
 	if (defined('HEADER_INC'))
 	{
@@ -5092,6 +5106,13 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
 		'A_COOKIE_SETTINGS'		=> addslashes('; path=' . $config['cookie_path'] . ((!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']) . ((!$config['cookie_secure']) ? '' : '; secure')),
 	));
 
+	// Output the notifications
+	$phpbb_notifications = $phpbb_container->get('notifications');
+	foreach ($phpbb_notifications->load_notifications() as $notification)
+	{
+		$template->assign_block_vars('notifications', $notification->prepare_for_display());
+	}
+
 	// application/xhtml+xml not used because of IE
 	header('Content-type: text/html; charset=UTF-8');
 
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 5e2ee8c8f6..6845ae14e3 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -619,6 +619,7 @@ function move_posts($post_ids, $topic_id, $auto_sync = true)
 function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_sync = true, $call_delete_posts = true)
 {
 	global $db, $config;
+	global $phpbb_container;
 
 	$approved_topics = 0;
 	$forum_ids = $topic_ids = array();
@@ -715,6 +716,10 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 		set_config_count('num_topics', $approved_topics * (-1), true);
 	}
 
+	// Delete notifications
+	$notifications = $phpbb_container->get('notifications');
+	$notifications->delete_notifications('topic', $topic_ids);
+
 	return $return;
 }
 
@@ -724,6 +729,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_s
 function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync = true, $post_count_sync = true, $call_delete_topics = true)
 {
 	global $db, $config, $phpbb_root_path, $phpEx, $auth, $user;
+	global $phpbb_container;
 
 	if ($where_type === 'range')
 	{
@@ -892,6 +898,10 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
 		delete_topics('topic_id', $remove_topics, $auto_sync, $post_count_sync, false);
 	}
 
+	// Delete notifications
+	$notifications = $phpbb_container->get('notifications');
+	$notifications->delete_notifications('post', $post_ids);
+
 	return sizeof($post_ids);
 }
 
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 8328b9ee7a..84cb47867e 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1319,10 +1319,11 @@ function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank
 * @param string $avatar_height Height of users avatar
 * @param string $alt Optional language string for alt tag within image, can be a language key or text
 * @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
+* @param string $custom_css Custom CSS class to apply to the image
 *
 * @return string Avatar image
 */
-function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false)
+function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false, $custom_css = '')
 {
 	global $user, $config, $phpbb_root_path, $phpEx;
 	global $phpbb_dispatcher;
@@ -1343,7 +1344,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
 	* @var	string	overwrite_avatar	If set, this string will be the avatar
 	* @since 3.1-A1
 	*/
-	$vars = array('avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'alt', 'ignore_config', 'overwrite_avatar');
+	$vars = array('avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'alt', 'ignore_config', 'overwrite_avatar', 'custom_css');
 	extract($phpbb_dispatcher->trigger_event('core.user_get_avatar', compact($vars)));
 
 	if ($overwrite_avatar)
@@ -1385,7 +1386,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
 	}
 
 	$avatar_img .= $avatar;
-	return '<img src="' . (str_replace(' ', '%20', $avatar_img)) . '" width="' . $avatar_width . '" height="' . $avatar_height . '" alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />';
+	return '<img src="' . (str_replace(' ', '%20', $avatar_img)) . '" width="' . $avatar_width . '" height="' . $avatar_height . '" alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" ' . ($custom_css ? 'class="' . $custom_css . '"' : '') . '/>';
 }
 
 /**
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index c50395a5df..26d9b81896 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -61,7 +61,7 @@ function generate_smilies($mode, $forum_id)
 			'body' => 'posting_smilies.html')
 		);
 
-		generate_pagination(append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&amp;f=' . $forum_id), $smiley_count, $config['smilies_per_page'], $start);	
+		generate_pagination(append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&amp;f=' . $forum_id), $smiley_count, $config['smilies_per_page'], $start);
 	}
 
 	$display_link = false;
@@ -1173,237 +1173,6 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 	return true;
 }
 
-/**
-* User Notification
-*/
-function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id, $topic_id, $post_id)
-{
-	global $db, $user, $config, $phpbb_root_path, $phpEx, $auth;
-
-	$topic_notification = ($mode == 'reply' || $mode == 'quote') ? true : false;
-	$forum_notification = ($mode == 'post') ? true : false;
-
-	if (!$topic_notification && !$forum_notification)
-	{
-		trigger_error('NO_MODE');
-	}
-
-	if (($topic_notification && !$config['allow_topic_notify']) || ($forum_notification && !$config['allow_forum_notify']))
-	{
-		return;
-	}
-
-	$topic_title = ($topic_notification) ? $topic_title : $subject;
-	$topic_title = censor_text($topic_title);
-
-	// Exclude guests, current user and banned users from notifications
-	if (!function_exists('phpbb_get_banned_user_ids'))
-	{
-		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-	}
-	$sql_ignore_users = phpbb_get_banned_user_ids();
-	$sql_ignore_users[ANONYMOUS] = ANONYMOUS;
-	$sql_ignore_users[$user->data['user_id']] = $user->data['user_id'];
-
-	$notify_rows = array();
-
-	// -- get forum_userids	|| topic_userids
-	$sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber
-		FROM ' . (($topic_notification) ? TOPICS_WATCH_TABLE : FORUMS_WATCH_TABLE) . ' w, ' . USERS_TABLE . ' u
-		WHERE w.' . (($topic_notification) ? 'topic_id' : 'forum_id') . ' = ' . (($topic_notification) ? $topic_id : $forum_id) . '
-			AND ' . $db->sql_in_set('w.user_id', $sql_ignore_users, true) . '
-			AND w.notify_status = ' . NOTIFY_YES . '
-			AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
-			AND u.user_id = w.user_id';
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$notify_user_id = (int) $row['user_id'];
-		$notify_rows[$notify_user_id] = array(
-			'user_id'		=> $notify_user_id,
-			'username'		=> $row['username'],
-			'user_email'	=> $row['user_email'],
-			'user_jabber'	=> $row['user_jabber'],
-			'user_lang'		=> $row['user_lang'],
-			'notify_type'	=> ($topic_notification) ? 'topic' : 'forum',
-			'template'		=> ($topic_notification) ? 'topic_notify' : 'newtopic_notify',
-			'method'		=> $row['user_notify_type'],
-			'allowed'		=> false
-		);
-
-		// Add users who have been already notified to ignore list
-		$sql_ignore_users[$notify_user_id] = $notify_user_id;
-	}
-	$db->sql_freeresult($result);
-
-	// forum notification is sent to those not already receiving topic notifications
-	if ($topic_notification)
-	{
-		$sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber
-			FROM ' . FORUMS_WATCH_TABLE . ' fw, ' . USERS_TABLE . " u
-			WHERE fw.forum_id = $forum_id
-				AND " . $db->sql_in_set('fw.user_id', $sql_ignore_users, true) . '
-				AND fw.notify_status = ' . NOTIFY_YES . '
-				AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
-				AND u.user_id = fw.user_id';
-		$result = $db->sql_query($sql);
-
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$notify_user_id = (int) $row['user_id'];
-			$notify_rows[$notify_user_id] = array(
-				'user_id'		=> $notify_user_id,
-				'username'		=> $row['username'],
-				'user_email'	=> $row['user_email'],
-				'user_jabber'	=> $row['user_jabber'],
-				'user_lang'		=> $row['user_lang'],
-				'notify_type'	=> 'forum',
-				'template'		=> 'forum_notify',
-				'method'		=> $row['user_notify_type'],
-				'allowed'		=> false
-			);
-		}
-		$db->sql_freeresult($result);
-	}
-
-	if (!sizeof($notify_rows))
-	{
-		return;
-	}
-
-	// Make sure users are allowed to read the forum
-	foreach ($auth->acl_get_list(array_keys($notify_rows), 'f_read', $forum_id) as $forum_id => $forum_ary)
-	{
-		foreach ($forum_ary as $auth_option => $user_ary)
-		{
-			foreach ($user_ary as $user_id)
-			{
-				$notify_rows[$user_id]['allowed'] = true;
-			}
-		}
-	}
-
-	// Now, we have to do a little step before really sending, we need to distinguish our users a little bit. ;)
-	$msg_users = $delete_ids = $update_notification = array();
-	foreach ($notify_rows as $user_id => $row)
-	{
-		if (!$row['allowed'] || !trim($row['user_email']))
-		{
-			$delete_ids[$row['notify_type']][] = $row['user_id'];
-		}
-		else
-		{
-			$msg_users[] = $row;
-			$update_notification[$row['notify_type']][] = $row['user_id'];
-
-			/*
-			* We also update the forums watch table for this user when we are
-			* sending out a topic notification to prevent sending out another
-			* notification in case this user is also subscribed to the forum
-			* this topic was posted in.
-			* Since an UPDATE query is used, this has no effect on users only
-			* subscribed to the topic (i.e. no row is created) and should not
-			* be a performance issue.
-			*/
-			if ($row['notify_type'] === 'topic')
-			{
-				$update_notification['forum'][] = $row['user_id'];
-			}
-		}
-	}
-	unset($notify_rows);
-
-	// Now, we are able to really send out notifications
-	if (sizeof($msg_users))
-	{
-		include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-		$messenger = new messenger();
-
-		$msg_list_ary = array();
-		foreach ($msg_users as $row)
-		{
-			$pos = (!isset($msg_list_ary[$row['template']])) ? 0 : sizeof($msg_list_ary[$row['template']]);
-
-			$msg_list_ary[$row['template']][$pos]['method']	= $row['method'];
-			$msg_list_ary[$row['template']][$pos]['email']	= $row['user_email'];
-			$msg_list_ary[$row['template']][$pos]['jabber']	= $row['user_jabber'];
-			$msg_list_ary[$row['template']][$pos]['name']	= $row['username'];
-			$msg_list_ary[$row['template']][$pos]['lang']	= $row['user_lang'];
-			$msg_list_ary[$row['template']][$pos]['user_id']= $row['user_id'];
-		}
-		unset($msg_users);
-
-		foreach ($msg_list_ary as $email_template => $email_list)
-		{
-			foreach ($email_list as $addr)
-			{
-				$messenger->template($email_template, $addr['lang']);
-
-				$messenger->to($addr['email'], $addr['name']);
-				$messenger->im($addr['jabber'], $addr['name']);
-
-				$messenger->assign_vars(array(
-					'USERNAME'		=> htmlspecialchars_decode($addr['name']),
-					'TOPIC_TITLE'	=> htmlspecialchars_decode($topic_title),
-					'FORUM_NAME'	=> htmlspecialchars_decode($forum_name),
-
-					'U_FORUM'				=> generate_board_url() . "/viewforum.$phpEx?f=$forum_id",
-					'U_TOPIC'				=> generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id",
-					'U_NEWEST_POST'			=> generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id&p=$post_id&e=$post_id",
-					'U_STOP_WATCHING_TOPIC'	=> generate_board_url() . "/viewtopic.$phpEx?uid={$addr['user_id']}&f=$forum_id&t=$topic_id&unwatch=topic",
-					'U_STOP_WATCHING_FORUM'	=> generate_board_url() . "/viewforum.$phpEx?uid={$addr['user_id']}&f=$forum_id&unwatch=forum",
-				));
-
-				$messenger->send($addr['method']);
-			}
-		}
-		unset($msg_list_ary);
-
-		$messenger->save_queue();
-	}
-
-	// Handle the DB updates
-	$db->sql_transaction('begin');
-
-	if (!empty($update_notification['topic']))
-	{
-		$sql = 'UPDATE ' . TOPICS_WATCH_TABLE . '
-			SET notify_status = ' . NOTIFY_NO . "
-			WHERE topic_id = $topic_id
-				AND " . $db->sql_in_set('user_id', $update_notification['topic']);
-		$db->sql_query($sql);
-	}
-
-	if (!empty($update_notification['forum']))
-	{
-		$sql = 'UPDATE ' . FORUMS_WATCH_TABLE . '
-			SET notify_status = ' . NOTIFY_NO . "
-			WHERE forum_id = $forum_id
-				AND " . $db->sql_in_set('user_id', $update_notification['forum']);
-		$db->sql_query($sql);
-	}
-
-	// Now delete the user_ids not authorised to receive notifications on this topic/forum
-	if (!empty($delete_ids['topic']))
-	{
-		$sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . "
-			WHERE topic_id = $topic_id
-				AND " . $db->sql_in_set('user_id', $delete_ids['topic']);
-		$db->sql_query($sql);
-	}
-
-	if (!empty($delete_ids['forum']))
-	{
-		$sql = 'DELETE FROM ' . FORUMS_WATCH_TABLE . "
-			WHERE forum_id = $forum_id
-				AND " . $db->sql_in_set('user_id', $delete_ids['forum']);
-		$db->sql_query($sql);
-	}
-
-	$db->sql_transaction('commit');
-}
-
 //
 // Post handling functions
 //
@@ -1640,6 +1409,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data)
 function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true, $update_search_index = true)
 {
 	global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path;
+	global $phpbb_container;
 
 	// We do not handle erasing posts here
 	if ($mode == 'delete')
@@ -2450,9 +2220,47 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	}
 
 	// Send Notifications
-	if (($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_approval)
+	if ($post_approval)
 	{
-		user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id']);
+		$notifications = $phpbb_container->get('notifications');
+
+		switch ($mode)
+		{
+			case 'post' :
+				$notifications->add_notifications('topic', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
+				$notifications->add_notifications('quote', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
+			break;
+
+			case 'reply' :
+			case 'quote' :
+				$notifications->add_notifications('post', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
+				$notifications->add_notifications('quote', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
+			break;
+
+			case 'edit_topic' :
+			case 'edit_first_post' :
+			case 'edit' :
+			case 'edit_last_post' :
+				$notifications->update_notifications('topic', array_merge($data, array(
+					'post_username'		=> $username,
+					'topic_title'		=> $subject,
+				)));
+				$notifications->update_notifications('post', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
+				$notifications->update_notifications('quote', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
+			break;
+		}
 	}
 
 	$params = $add_anchor = '';
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 9e055a319f..88c5bd8e2a 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -982,6 +982,7 @@ function handle_mark_actions($user_id, $mark_action)
 function delete_pm($user_id, $msg_ids, $folder_id)
 {
 	global $db, $user, $phpbb_root_path, $phpEx;
+	global $phpbb_container;
 
 	$user_id	= (int) $user_id;
 	$folder_id	= (int) $folder_id;
@@ -1093,6 +1094,10 @@ function delete_pm($user_id, $msg_ids, $folder_id)
 		$user->data['user_unread_privmsg'] -= $num_unread;
 	}
 
+	// Delete Notifications
+	$phpbb_notifications = $phpbb_container->get('notifications');
+	$phpbb_notifications->delete_notifications('pm', array_keys($delete_rows));
+
 	// Now we have to check which messages we can delete completely
 	$sql = 'SELECT msg_id
 		FROM ' . PRIVMSGS_TO_TABLE . '
@@ -1543,6 +1548,7 @@ function get_folder_status($folder_id, $folder)
 function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 {
 	global $db, $auth, $config, $phpEx, $template, $user, $phpbb_root_path;
+	global $phpbb_container;
 
 	// We do not handle erasing pms here
 	if ($mode == 'delete')
@@ -1842,95 +1848,23 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true)
 	$db->sql_transaction('commit');
 
 	// Send Notifications
-	if ($mode != 'edit')
-	{
-		pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message'], $data['msg_id']);
-	}
-
-	return $data['msg_id'];
-}
-
-/**
-* PM Notification
-*/
-function pm_notification($mode, $author, $recipients, $subject, $message, $msg_id)
-{
-	global $db, $user, $config, $phpbb_root_path, $phpEx, $auth;
-
-	$subject = censor_text($subject);
-
-	// Exclude guests, current user and banned users from notifications
-	unset($recipients[ANONYMOUS], $recipients[$user->data['user_id']]);
-
-	if (!sizeof($recipients))
-	{
-		return;
-	}
-
-	if (!function_exists('phpbb_get_banned_user_ids'))
-	{
-		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-	}
-	$banned_users = phpbb_get_banned_user_ids(array_keys($recipients));
-	$recipients = array_diff(array_keys($recipients), $banned_users);
-
-	if (!sizeof($recipients))
-	{
-		return;
-	}
-
-	$sql = 'SELECT user_id, username, user_email, user_lang, user_notify_pm, user_notify_type, user_jabber
-		FROM ' . USERS_TABLE . '
-		WHERE ' . $db->sql_in_set('user_id', $recipients);
-	$result = $db->sql_query($sql);
+	$phpbb_notifications = $phpbb_container->get('notifications');
 
-	$msg_list_ary = array();
-	while ($row = $db->sql_fetchrow($result))
-	{
-		if ($row['user_notify_pm'] == 1 && trim($row['user_email']))
-		{
-			$msg_list_ary[] = array(
-				'method'	=> $row['user_notify_type'],
-				'email'		=> $row['user_email'],
-				'jabber'	=> $row['user_jabber'],
-				'name'		=> $row['username'],
-				'lang'		=> $row['user_lang']
-			);
-		}
-	}
-	$db->sql_freeresult($result);
+	$pm_data = array_merge($data, array(
+		'message_subject'		=> $subject,
+		'recipients'			=> $recipients,
+	));
 
-	if (!sizeof($msg_list_ary))
+	if ($mode == 'edit')
 	{
-		return;
+		$phpbb_notifications->update_notifications('pm', $pm_data);
 	}
-
-	include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
-	$messenger = new messenger();
-
-	foreach ($msg_list_ary as $pos => $addr)
+	else
 	{
-		$messenger->template('privmsg_notify', $addr['lang']);
-
-		$messenger->to($addr['email'], $addr['name']);
-		$messenger->im($addr['jabber'], $addr['name']);
-
-		$messenger->assign_vars(array(
-			'SUBJECT'		=> htmlspecialchars_decode($subject),
-			'AUTHOR_NAME'	=> htmlspecialchars_decode($author),
-			'USERNAME'		=> htmlspecialchars_decode($addr['name']),
-
-			'U_INBOX'			=> generate_board_url() . "/ucp.$phpEx?i=pm&folder=inbox",
-			'U_VIEW_MESSAGE'	=> generate_board_url() . "/ucp.$phpEx?i=pm&mode=view&p=$msg_id",
-		));
-
-		$messenger->send($addr['method']);
+		$phpbb_notifications->add_notifications('pm', $pm_data);
 	}
-	unset($msg_list_ary);
 
-	$messenger->save_queue();
-
-	unset($messenger);
+	return $data['msg_id'];
 }
 
 /**
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index b44685b8a3..1d9a2dfedc 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -421,7 +421,7 @@ class mcp_queue
 
 				$base_url = $this->u_action . "&amp;f=$forum_id&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir";
 				phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total, $config['topics_per_page'], $start);
-				
+
 				// Now display the page
 				$template->assign_vars(array(
 					'L_DISPLAY_ITEMS'		=> ($mode == 'unapproved_posts') ? $user->lang['DISPLAY_POSTS'] : $user->lang['DISPLAY_TOPICS'],
@@ -451,7 +451,7 @@ function approve_post($post_id_list, $id, $mode)
 {
 	global $db, $template, $user, $config;
 	global $phpEx, $phpbb_root_path;
-	global $request;
+	global $request, $phpbb_container;
 
 	if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
 	{
@@ -634,17 +634,19 @@ function approve_post($post_id_list, $id, $mode)
 		// Send out normal user notifications
 		$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
 
+		$notifications = $phpbb_container->get('notifications');
+
 		foreach ($post_info as $post_id => $post_data)
 		{
 			if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id'])
 			{
 				// Forum Notifications
-				user_notification('post', $post_data['topic_title'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
+				$notifications->add_notifications('topic', $post_data);
 			}
 			else
 			{
 				// Topic Notifications
-				user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id);
+				$notifications->add_notifications('post', $post_data);
 			}
 		}
 
diff --git a/phpBB/includes/notifications/method/base.php b/phpBB/includes/notifications/method/base.php
new file mode 100644
index 0000000000..b860fcffda
--- /dev/null
+++ b/phpBB/includes/notifications/method/base.php
@@ -0,0 +1,92 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications method class
+* @package notifications
+*/
+abstract class phpbb_notifications_method_base implements phpbb_notifications_method_interface
+{
+	protected $phpbb_container;
+	protected $service;
+	protected $db;
+	protected $user;
+	protected $phpbb_root_path;
+	protected $php_ext;
+
+	/**
+	* Desired notifications
+	* unique by (type, type_id, user_id, method)
+	* if multiple methods are desired, multiple rows will exist.
+	*
+	* method of "none" will over-ride any other options
+	*
+	* item_type
+	* item_id
+	* user_id
+	* method
+	* 	none (will never receive notifications)
+	* 	standard (listed in notifications window
+	* 	popup?
+	* 	email
+	* 	jabber
+	*	sms?
+	*/
+
+	/**
+	* Queue of messages to be sent
+	*
+	* @var array
+	*/
+	protected $queue = array();
+
+	public function __construct(ContainerBuilder $phpbb_container)
+	{
+		// phpBB Container
+		$this->phpbb_container = $phpbb_container;
+
+		// Service
+		$this->service = $phpbb_container->get('notifications');
+
+		// Some common things we're going to use
+		$this->db = $phpbb_container->get('dbal.conn');
+		$this->user = $phpbb_container->get('user');
+
+		$this->phpbb_root_path = $phpbb_container->getParameter('core.root_path');
+		$this->php_ext = $phpbb_container->getParameter('core.php_ext');
+	}
+
+	/**
+	* Add a notification to the queue
+	*
+	* @param phpbb_notifications_type_interface $notification
+	*/
+	public function add_to_queue(phpbb_notifications_type_interface $notification)
+	{
+		$this->queue[] = $notification;
+	}
+
+	/**
+	* Empty the queue
+	*/
+	protected function empty_queue()
+	{
+		$this->queue = array();
+	}
+}
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
new file mode 100644
index 0000000000..1bcea13d92
--- /dev/null
+++ b/phpBB/includes/notifications/method/email.php
@@ -0,0 +1,108 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Email notification method class
+* This class handles sending emails for notifications
+*
+* @package notifications
+*/
+class phpbb_notifications_method_email extends phpbb_notifications_method_base
+{
+	/**
+	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
+	*
+	* @var mixed
+	*/
+	protected $notify_method = NOTIFY_EMAIL;
+
+	/**
+	* Is this method available for the user?
+	* This is checked on the notifications options
+	*/
+	public function is_available()
+	{
+		// Email is always available
+		return true;
+	}
+
+	public function notify()
+	{
+		if (!sizeof($this->queue))
+		{
+			return;
+		}
+
+		// Load all users we want to notify (we need their email address)
+		$user_ids = $users = array();
+		foreach ($this->queue as $notification)
+		{
+			$user_ids[] = $notification->user_id;
+		}
+
+		// We do not send emails to banned users
+		if (!function_exists('phpbb_get_banned_user_ids'))
+		{
+			include($this->phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $this->phpbb_container->getParameter('core.php_ext'));
+		}
+		$banned_users = phpbb_get_banned_user_ids($user_ids);
+
+		// Load all the users we need
+		$this->service->load_users($user_ids);
+
+		// Load the messenger
+		if (!class_exists('messenger'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
+		}
+		$messenger = new messenger();
+		$board_url = generate_board_url();
+
+		// Time to go through the queue and send emails
+		foreach ($this->queue as $notification)
+		{
+			$user = $this->service->get_user($notification->user_id);
+
+			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
+			{
+				continue;
+			}
+
+			$messenger->template('notification', $user['user_lang']);
+
+			$messenger->to($user['user_email'], $user['username']);
+
+			$messenger->assign_vars(array(
+				'USERNAME'			=> $user['username'],
+
+				'MESSAGE'			=> htmlspecialchars_decode($notification->get_title()),
+
+				'U_VIEW_MESSAGE'	=> $notification->get_full_url(),
+
+				'U_UNSUBSCRIBE'		=> $notification->get_unsubscribe_url(),
+			));
+
+			$messenger->send($this->notify_method);
+		}
+
+		// Save the queue in the messenger class (has to be called or these emails could be lost?)
+		$messenger->save_queue();
+
+		// We're done, empty the queue
+		$this->empty_queue();
+	}
+}
diff --git a/phpBB/includes/notifications/method/interface.php b/phpBB/includes/notifications/method/interface.php
new file mode 100644
index 0000000000..820cf4fc12
--- /dev/null
+++ b/phpBB/includes/notifications/method/interface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications method interface
+* @package notifications
+*/
+interface phpbb_notifications_method_interface
+{
+	public function is_available();
+
+	public function notify();
+}
diff --git a/phpBB/includes/notifications/method/jabber.php b/phpBB/includes/notifications/method/jabber.php
new file mode 100644
index 0000000000..738400a50e
--- /dev/null
+++ b/phpBB/includes/notifications/method/jabber.php
@@ -0,0 +1,62 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Jabber notification method class
+* This class handles sending Jabber messages for notifications
+*
+* @package notifications
+*/
+class phpbb_notifications_method_jabber extends phpbb_notifications_method_email
+{
+	/**
+	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
+	*
+	* @var mixed
+	*/
+	protected $notify_method = NOTIFY_IM;
+
+	/**
+	* Is this method available for the user?
+	* This is checked on the notifications options
+	*/
+	public function is_available()
+	{
+		return ($this->global_available() && $this->phpbb_container->get('user')->data['jabber']);
+	}
+
+	/**
+	* Is this method available at all?
+	* This is checked before notifications are sent
+	*/
+	public function global_available()
+	{
+		$config = $this->phpbb_container->get('config');
+
+		return ($config['jab_enable'] && @extension_loaded('xml'));
+	}
+
+	public function notify()
+	{
+		if (!$this->global_available())
+		{
+			return;
+		}
+
+		return parent::notify();
+	}
+}
diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notifications/service.php
new file mode 100644
index 0000000000..8be8ae2a95
--- /dev/null
+++ b/phpBB/includes/notifications/service.php
@@ -0,0 +1,369 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Notifications service class
+* @package notifications
+*/
+class phpbb_notifications_service
+{
+	protected $phpbb_container;
+	protected $db;
+
+	/**
+	* Users loaded from the DB
+	*
+	* @var array Array of user data that we've loaded from the DB
+	*/
+	protected $users = array();
+
+	public function __construct(ContainerBuilder $phpbb_container)
+	{
+		$this->phpbb_container = $phpbb_container;
+
+		// Some common things we're going to use
+		$this->db = $phpbb_container->get('dbal.conn');
+	}
+
+	/**
+	* Load the user's notifications
+	*
+	* @param array $options Optional options to control what notifications are loaded
+	*				user_id		User id to load notifications for (Default: $user->data['user_id'])
+	*				order_by	Order by (Default: time)
+	*				order_dir	Order direction (Default: DESC)
+	* 				limit		Number of notifications to load (Default: 5)
+	* 				start		Notifications offset (Default: 0)
+	*/
+	public function load_notifications($options = array())
+	{
+		$user = $this->phpbb_container->get('user');
+
+		// Merge default options
+		$options = array_merge(array(
+			'user_id'		=> $user->data['user_id'],
+			'order_by'		=> 'time',
+			'order_dir'		=> 'DESC',
+			'limit'			=> 5,
+			'start'			=> 0,
+		), $options);
+
+		$notifications = $user_ids = array();
+		$load_special = array();
+
+		$sql = 'SELECT *
+			FROM ' . NOTIFICATIONS_TABLE . '
+			WHERE user_id = ' . (int) $options['user_id'] . '
+				ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
+		$result = $this->db->sql_query_limit($sql, $options['limit'], $options['start']);
+
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$item_type_class_name = $this->get_item_type_class_name($row['item_type'], true);
+
+			$notification = new $item_type_class_name($this->phpbb_container, $row);
+
+			// Array of user_ids to query all at once
+			$user_ids = array_merge($user_ids, $notification->users_to_query());
+
+			// Some notification types also require querying additional tables themselves
+			if (!isset($load_special[$row['item_type']]))
+			{
+				$load_special[$row['item_type']] = array();
+			}
+			$load_special[$row['item_type']] = array_merge($load_special[$row['item_type']], $notification->get_load_special());
+
+			$notifications[] = $notification;
+		}
+		$this->db->sql_freeresult($result);
+
+		$this->load_users($user_ids);
+
+		// Allow each type to load it's own special items
+		foreach ($load_special as $item_type => $data)
+		{
+			$item_type_class_name = $this->get_item_type_class_name($item_type, true);
+
+			$item_type_class_name::load_special($this->phpbb_container, $data, $notifications);
+		}
+
+		return $notifications;
+	}
+
+	/**
+	* Mark notifications read
+	*
+	* @param string $item_type item type
+	* @param bool|int|array $item_id Item id or array of item ids. False to mark read for all item ids
+	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
+	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
+	*/
+	public function mark_notifications_read($item_type, $item_id, $user_id, $time = false)
+	{
+		$time = ($time) ?: time();
+
+		$this->get_item_type_class_name($item_type);
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+			SET unread = 0
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND time <= " . $time .
+				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '') .
+				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Mark notifications read from a parent identifier
+	*
+	* @param string $item_type item type
+	* @param bool|int|array $item_parent_id Item parent id or array of item parent ids. False to mark read for all item parent ids
+	* @param bool|int|array $user_id User id or array of user ids. False to mark read for all user ids
+	* @param bool|int $time Time at which to mark all notifications prior to as read. False to mark all as read. (Default: False)
+	*/
+	public function mark_notifications_read_by_parent($item_type, $item_parent_id, $user_id, $time = false)
+	{
+		$time = ($time) ?: time();
+
+		$item_type_class_name = $this->get_item_type_class_name($item_type);
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . "
+			SET unread = 0
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND time <= " . $time .
+				(($item_parent_id !== false) ? ' AND ' . (is_array($item_parent_id) ? $this->db->sql_in_set('item_parent_id', $item_parent_id) : 'item_parent_id = ' . (int) $item_parent_id) : '') .
+				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '');
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Add a notification
+	*
+	* @param string $item_type Type identifier
+	* @param array $data Data specific for this type that will be inserted
+	*/
+	public function add_notifications($item_type, $data)
+	{
+		$item_type_class_name = $this->get_item_type_class_name($item_type);
+
+		$item_id = $item_type_class_name::get_item_id($data);
+
+		// find out which users want to receive this type of notification
+		$notify_users = $item_type_class_name::find_users_for_notification($this->phpbb_container, $data);
+
+		$this->add_notifications_for_users($item_type, $data, $notify_users);
+	}
+
+	/**
+	* Add a notification for specific users
+	*
+	* @param string $item_type Type identifier
+	* @param array $data Data specific for this type that will be inserted
+	* @param array $notify_users User list to notify
+	*/
+	public function add_notifications_for_users($item_type, $data, $notify_users)
+	{
+		$item_type_class_name = $this->get_item_type_class_name($item_type);
+
+		$item_id = $item_type_class_name::get_item_id($data);
+
+		$user_ids = array();
+		$notification_objects = $notification_methods = array();
+		$new_rows = array();
+
+		// Never send notifications to the anonymous user or the current user!
+		unset($notify_users[ANONYMOUS], $notify_users[$this->phpbb_container->get('user')->data['user_id']]);
+
+		// Make sure not to send new notifications to users who've already been notified about this item
+		// This may happen when an item was added, but now new users are able to see the item
+		// todo Users should not receive notifications from multiple events from the same item (ex: for a topic reply with a quote including your username)
+		//		Probably should be handled within each type?
+		$sql = 'SELECT user_id
+			FROM ' . NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND item_id = " . (int) $item_id;
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			unset($notify_users[$row['user_id']]);
+		}
+		$this->db->sql_freeresult($result);
+
+		if (!sizeof($notify_users))
+		{
+			return;
+		}
+
+		// Go through each user so we can insert a row in the DB and then notify them by their desired means
+		foreach ($notify_users as $user => $methods)
+		{
+			$notification = new $item_type_class_name($this->phpbb_container);
+
+			$notification->user_id = (int) $user;
+
+			// Store the creation array in our new rows that will be inserted later
+			$new_rows[] = $notification->create_insert_array($data);
+
+			// Users are needed to send notifications
+			$user_ids = array_merge($user_ids, $notification->users_to_query());
+
+			foreach ($methods as $method)
+			{
+				// setup the notification methods and add the notification to the queue
+				if ($method) // blank means we just insert it as a notification, but do not notify them by any other means
+				{
+					if (!isset($notification_methods[$method]))
+					{
+						$method_class_name = 'phpbb_notifications_method_' . $method;
+						$notification_methods[$method] = new $method_class_name($this->phpbb_container);
+					}
+
+					$notification_methods[$method]->add_to_queue($notification);
+				}
+			}
+		}
+
+		// insert into the db
+		$this->db->sql_multi_insert(NOTIFICATIONS_TABLE, $new_rows);
+
+		// We need to load all of the users to send notifications
+		$this->load_users($user_ids);
+
+		// run the queue for each method to send notifications
+		foreach ($notification_methods as $method)
+		{
+			$method->notify();
+		}
+	}
+
+	/**
+	* Update a notification
+	*
+	* @param string $item_type Type identifier
+	* @param array $data Data specific for this type that will be updated
+	*/
+	public function update_notifications($item_type, $data)
+	{
+		$item_type_class_name = $this->get_item_type_class_name($item_type);
+
+		// Allow the notifications class to over-ride the update_notifications functionality
+		if (method_exists($item_type_class_name, 'update_notifications'))
+		{
+			// Return False to over-ride the rest of the update
+			if ($item_type_class_name::update_notifications($this->phpbb_container, $data) === false)
+			{
+				return;
+			}
+		}
+
+		$item_id = $item_type_class_name::get_item_id($data);
+
+		$notification = new $item_type_class_name($this->phpbb_container);
+		$update_array = $notification->create_update_array($data);
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+			SET ' . $this->db->sql_build_array('UPDATE', $update_array) . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND item_id = " . (int) $item_id;
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Delete a notification
+	*
+	* @param string $item_type Type identifier
+	* @param int|array $item_id Identifier within the type (or array of ids)
+	* @param array $data Data specific for this type that will be updated
+	*/
+	public function delete_notifications($item_type, $item_id)
+	{
+		$this->get_item_type_class_name($item_type);
+
+		$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND " . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id);
+		$this->db->sql_query($sql);
+	}
+
+	public function add_subscription($item_type, $item_id, $method = '')
+	{
+		$this->get_item_type_class_name($item_type);
+
+		$sql = 'INSERT INTO ' . USER_NOTIFICATIONS_TABLE . ' ' .
+			$this->db->sql_build_array('INSERT', array(
+				'item_type'		=> $item_type,
+				'item_id'		=> (int) $item_id,
+				'user_id'		=> $this->phpbb_container->get('user')->data['user_id'],
+				'method'		=> $method,
+			));
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	* Load user helper
+	*
+	* @param array $user_ids
+	*/
+	public function load_users($user_ids)
+	{
+		// Load the users
+		$user_ids = array_unique($user_ids);
+
+		// Do not load users we already have in $this->users
+		$user_ids = array_diff($user_ids, array_keys($this->users));
+
+		if (sizeof($user_ids))
+		{
+			$sql = 'SELECT *
+				FROM ' . USERS_TABLE . '
+				WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$this->users[$row['user_id']] = $row;
+			}
+			$this->db->sql_freeresult($result);
+		}
+	}
+
+	/**
+	* Get a user row from our users cache
+	*
+	* @param int $user_id
+	* @return array
+	*/
+	public function get_user($user_id)
+	{
+		return $this->users[$user_id];
+	}
+
+	/**
+	* Helper to get the notifications item type class name and clean it if unsafe
+	*/
+	private function get_item_type_class_name(&$item_type, $safe = false)
+	{
+		if (!$safe)
+		{
+			$item_type = preg_replace('#[^a-z]#', '', $item_type);
+		}
+
+		return 'phpbb_notifications_type_' . $item_type;
+	}
+}
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notifications/type/base.php
new file mode 100644
index 0000000000..daca3b43cb
--- /dev/null
+++ b/phpBB/includes/notifications/type/base.php
@@ -0,0 +1,327 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications class
+* @package notifications
+*/
+abstract class phpbb_notifications_type_base implements phpbb_notifications_type_interface
+{
+	protected $phpbb_container;
+	protected $service;
+	protected $db;
+	protected $phpbb_root_path;
+	protected $php_ext;
+
+	/**
+	* Array of user data containing information needed to output the notifications to the template
+	*
+	* @var array
+	*/
+	protected $users = array();
+
+	/**
+	* Indentification data
+	* item_type
+	* item_id
+	* item_parent_id // Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
+	* user_id
+	* unread
+	*
+	* time
+	* data (special serialized field that each notification type can use to store stuff)
+	*
+	* @var array $data Notification row from the database
+	* 		This must be private, all interaction should use __get(), __set(), get_data(), set_data()
+	*/
+	private $data = array();
+
+	public function __construct(ContainerBuilder $phpbb_container, $data = array())
+	{
+		// phpBB Container
+		$this->phpbb_container = $phpbb_container;
+
+		// Service
+		$this->service = $phpbb_container->get('notifications');
+
+		// Some common things we're going to use
+		$this->db = $phpbb_container->get('dbal.conn');
+
+		$this->phpbb_root_path = $phpbb_container->getParameter('core.root_path');
+		$this->php_ext = $phpbb_container->getParameter('core.php_ext');
+
+		// The row from the database (unless this is a new notification we're going to add)
+		$this->data = $data;
+		$this->data['data'] = (isset($this->data['data'])) ? unserialize($this->data['data']) : array();
+	}
+
+	public function __get($name)
+	{
+		return $this->data[$name];
+	}
+
+	public function __set($name, $value)
+	{
+		$this->data[$name] = $value;
+	}
+
+	/**
+	* Get special data (only important for the classes that extend this)
+	*
+	* @param string $name Name of the variable to get
+	*
+	* @return mixed
+	*/
+	protected function get_data($name)
+	{
+		return (isset($this->data['data'][$name])) ? $this->data['data'][$name] : null;
+	}
+
+	/**
+	* Set special data (only important for the classes that extend this)
+	*
+	* @param string $name Name of the variable to set
+	* @param mixed $value Value to set to the variable
+	*/
+	protected function set_data($name, $value)
+	{
+		$this->data['data'][$name] = $value;
+	}
+
+	/**
+	* Prepare to output the notification to the template
+	*/
+	public function prepare_for_display()
+	{
+		$user = $this->phpbb_container->get('user');
+
+		return array(
+			'AVATAR'			=> $this->get_avatar(),
+
+			'FORMATTED_TITLE'	=> $this->get_formatted_title(),
+			'TITLE'				=> $this->get_title(),
+
+			'URL'				=> $this->get_url(),
+			'TIME'	   			=> $user->format_date($this->time),
+
+			'UNREAD'			=> $this->unread,
+		);
+	}
+
+	/**
+	* Mark this item read
+	*
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	public function mark_read($return = true)
+	{
+		return $this->mark(false, $return);
+	}
+
+	/**
+	* Mark this item unread
+	*
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	public function mark_unread($return = true)
+	{
+		return $this->mark(true, $return);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $type_data Data unique to this notification type
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($type_data)
+	{
+		// Defaults
+		$data = array_merge(array(
+			'item_id'				=> static::get_item_id($type_data),
+			'item_type'	   			=> $this->get_item_type(),
+			'item_parent_id'		=> static::get_item_parent_id($type_data),
+
+			'time'					=> time(),
+			'unread'				=> true,
+
+			'data'					=> array(),
+		), $this->data);
+
+		$data['data'] = serialize($data['data']);
+
+		return $data;
+	}
+
+	/**
+	* Function for preparing the data for update in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $type_data Data unique to this notification type
+	*
+	* @return array Array of data ready to be updated in the database
+	*/
+	public function create_update_array($type_data)
+	{
+		$data = $this->create_insert_array($type_data);
+
+		// Unset data unique to each row
+		unset(
+			$data['notification_id'],
+			$data['unread'],
+			$data['user_id']
+		);
+
+		return $data;
+	}
+
+	/**
+	* -------------- Fall back functions -------------------
+	*/
+
+	/**
+	* Get the formatted title of this notification (fall-back)
+	*
+	* @return string
+	*/
+	public function get_formatted_title()
+	{
+		return $this->get_title();
+	}
+
+	/**
+	* URL to unsubscribe to this notification (fall-back)
+	*
+	* @param string|bool $method Method name to unsubscribe from (email|jabber|etc), False to unsubscribe from all notifications for this item
+	*/
+	public function get_unsubscribe_url($method = false)
+	{
+		return false;
+	}
+
+	/**
+	* Get the user's avatar (fall-back)
+	*/
+	public function get_avatar()
+	{
+		return '';
+	}
+
+	/**
+	* Get the special items to load (fall-back)
+	*/
+	public function get_load_special()
+	{
+		return array();
+	}
+
+	/**
+	* Load the special items (fall-back)
+	*/
+	public static function load_special(ContainerBuilder $phpbb_container, $data, $notifications)
+	{
+		return;
+	}
+
+	/**
+	* -------------- Helper functions -------------------
+	*/
+
+	/**
+	* Find the users who want to receive notifications (helper)
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $item_id The item_id to search for
+	*
+	* @return array
+	*/
+	protected static function _find_users_for_notification(ContainerBuilder $phpbb_container, $item_id)
+	{
+		$db = $phpbb_container->get('dbal.conn');
+
+		$rowset = array();
+
+		$sql = 'SELECT *
+			FROM ' . USER_NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . static::get_item_type() . "'
+				AND item_id = " . (int) $item_id;
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			if (!isset($rowset[$row['user_id']]))
+			{
+				$rowset[$row['user_id']] = array();
+			}
+
+			$rowset[$row['user_id']][] = $row['method'];
+		}
+		$db->sql_freeresult($result);
+
+		return $rowset;
+	}
+
+	/**
+	* Get avatar helper
+	*
+	* @param int $user_id
+	* @return string
+	*/
+	protected function _get_avatar($user_id)
+	{
+		$user = $this->service->get_user($user_id);
+
+		if (!function_exists('get_user_avatar'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+		}
+
+		return get_user_avatar($user['user_avatar'], $user['user_avatar_type'], $user['user_avatar_width'], $user['user_avatar_height'], $user['username'], false, 'notifications-avatar');
+	}
+
+	/**
+	* Mark this item read/unread helper
+	*
+	* @param bool $unread Unread (True/False) (Default: False)
+	* @param bool $return True to return a string containing the SQL code to update this item, False to execute it (Default: False)
+	* @return string
+	*/
+	protected function mark($unread = true, $return = false)
+	{
+		$where = array(
+			'item_type = ' . $this->db->sql_escape($this->item_type),
+			'item_id = ' . (int) $this->item_id,
+			'user_id = ' . (int) $this->user_id,
+		);
+		$where = implode(' AND ' . $where);
+
+		if ($return)
+		{
+			return $where;
+		}
+
+		$sql = 'UPDATE ' . NOTIFICATIONS_TABLE . '
+			SET unread = ' . (bool) $unread . '
+			WHERE ' . $where;
+		$this->db->sql_query($sql);
+	}
+}
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notifications/type/interface.php
new file mode 100644
index 0000000000..c1c0eb0b0c
--- /dev/null
+++ b/phpBB/includes/notifications/type/interface.php
@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Base notifications interface
+* @package notifications
+*/
+interface phpbb_notifications_type_interface
+{
+	public static function get_item_type();
+
+	public static function get_item_id($type_data);
+
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $type_data);
+
+	public function get_title();
+
+	public function get_formatted_title();
+
+	public function get_url();
+
+	public function get_full_url();
+
+	public function get_unsubscribe_url($method);
+
+	public function mark_read($return);
+
+	public function mark_unread($return);
+
+	public function create_insert_array($type_data);
+
+	public function get_load_special();
+
+	public static function load_special(ContainerBuilder $phpbb_container, $data, $notifications);
+}
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
new file mode 100644
index 0000000000..89f338f3f9
--- /dev/null
+++ b/phpBB/includes/notifications/type/pm.php
@@ -0,0 +1,184 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Private message notifications class
+* This class handles notifications for private messages
+*
+* @package notifications
+*/
+class phpbb_notifications_type_pm extends phpbb_notifications_type_base
+{
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'pm';
+	}
+
+	/**
+	* Get the id of the
+	*
+	* @param array $pm The data from the private message
+	*/
+	public static function get_item_id($pm)
+	{
+		return (int) $pm['msg_id'];
+	}
+
+	/**
+	* Get the id of the parent
+	*
+	* @param array $pm The data from the pm
+	*/
+	public static function get_item_parent_id($pm)
+	{
+		// No parent
+		return 0;
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $pm Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $pm)
+	{
+		$service = $phpbb_container->get('notifications');
+		$db = $phpbb_container->get('dbal.conn');
+		$user = $phpbb_container->get('user');
+
+		if (!sizeof($pm['recipients']))
+		{
+			return array();
+		}
+
+		$service->load_users(array_keys($pm['recipients']));
+
+		$notify_users = array();
+
+		foreach (array_keys($pm['recipients']) as $user_id)
+		{
+			$recipient = $service->get_user($user_id);
+
+			if ($recipient['user_notify_pm'])
+			{
+				$notify_users[$recipient['user_id']] = array();
+
+				if ($recipient['user_notify_type'] == NOTIFY_EMAIL || $recipient['user_notify_type'] == NOTIFY_BOTH)
+				{
+					$notify_users[$recipient['user_id']][] = 'email';
+				}
+
+				if ($recipient['user_notify_type'] == NOTIFY_IM || $recipient['user_notify_type'] == NOTIFY_BOTH)
+				{
+					$notify_users[$recipient['user_id']][] = 'jabber';
+				}
+			}
+		}
+
+		return $notify_users;
+	}
+
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('from_user_id'));
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_formatted_title()
+	{
+		$user_data = $this->service->get_user($this->get_data('from_user_id'));
+
+		$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+
+		return $this->phpbb_container->get('user')->lang('NOTIFICATION_PM', $username, $this->get_data('message_subject'));
+	}
+
+	/**
+	* Get the plain text title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		$user_data = $this->service->get_user($this->get_data('from_user_id'));
+
+		return $this->phpbb_container->get('user')->lang('NOTIFICATION_PM', $user_data['username'], $this->get_data('message_subject'));
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=pm&amp;mode=view&amp;p={$this->item_id}");
+	}
+
+	/**
+	* Get the full url to this item
+	*
+	* @return string URL
+	*/
+	public function get_full_url()
+	{
+		return generate_board_url() . "/ucp.{$this->php_ext}?i=pm&mode=view&p={$this->item_id}";
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['from_user_id']);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($pm)
+	{
+		$this->set_data('from_user_id', $pm['from_user_id']);
+
+		$this->set_data('message_subject', $pm['message_subject']);
+
+		return parent::create_insert_array($pm);
+	}
+}
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
new file mode 100644
index 0000000000..324a40888d
--- /dev/null
+++ b/phpBB/includes/notifications/type/post.php
@@ -0,0 +1,220 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post notifications class
+* This class handles notifications for replies to a topic
+*
+* @package notifications
+*/
+class phpbb_notifications_type_post extends phpbb_notifications_type_base
+{
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'post';
+	}
+
+	/**
+	* Get the id of the item
+	*
+	* @param array $post The data from the post
+	*/
+	public static function get_item_id($post)
+	{
+		return (int) $post['post_id'];
+	}
+
+	/**
+	* Get the id of the parent
+	*
+	* @param array $post The data from the post
+	*/
+	public static function get_item_parent_id($post)
+	{
+		return (int) $post['topic_id'];
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	{
+		// Let's continue to use the phpBB subscriptions system, at least for now.
+		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
+		//$users = parent::_find_users_for_notification($phpbb_container, $post['topic_id']);
+
+		$db = $phpbb_container->get('dbal.conn');
+
+		$users = array();
+
+		/* todo
+		* find what type of notification they'd like to receive
+		* make sure not to send duplicate notifications
+		*/
+		$sql = 'SELECT user_id
+			FROM ' . TOPICS_WATCH_TABLE . '
+			WHERE topic_id = ' . (int) $post['topic_id'] . '
+				AND notify_status = ' . NOTIFY_YES;
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$users[$row['user_id']] = array('');
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($users))
+		{
+			return array();
+		}
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id)
+		{
+			$notify_users[$user_id] = $users[$user_id];
+		}
+
+		return $notify_users;
+	}
+
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('poster_id'));
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_formatted_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		}
+
+		return $this->phpbb_container->get('user')->lang(
+			'NOTIFICATION_POST',
+			$username,
+			censor_text($this->get_data('topic_title'))
+		);
+	}
+
+	/**
+	* Get the title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+			$username = $user_data['username'];
+		}
+
+		return $this->phpbb_container->get('user')->lang(
+			'NOTIFICATION_POST',
+			$username,
+			censor_text($this->get_data('topic_title'))
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "p={$this->item_id}#p{$this->item_id}");
+	}
+
+	/**
+	* Get the full url to this item
+	*
+	* @return string URL
+	*/
+	public function get_full_url()
+	{
+		return generate_board_url() . "/viewtopic.{$this->php_ext}?p={$this->item_id}#p{$this->item_id}";
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['poster_id']);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('poster_id', $post['poster_id']);
+
+		$this->set_data('topic_title', $post['topic_title']);
+
+		$this->set_data('post_username', (($post['post_username'] != $this->phpbb_container->get('user')->data['username']) ? $post['post_username'] : ''));
+
+		$this->set_data('forum_name', $post['forum_name']);
+
+		return parent::create_insert_array($post);
+	}
+}
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notifications/type/quote.php
new file mode 100644
index 0000000000..11186f3685
--- /dev/null
+++ b/phpBB/includes/notifications/type/quote.php
@@ -0,0 +1,202 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Post tagging notifications class
+* This class handles notifications for tagging users in a post (ex: @EXreaction)
+*
+* @package notifications
+*/
+class phpbb_notifications_type_quote extends phpbb_notifications_type_post
+{
+	protected static $regular_expression_match = '#\[quote=&quot;(.+?)&quot;:#';
+
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'quote';
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $post)
+	{
+		$db = $phpbb_container->get('dbal.conn');
+
+		$usernames = false;
+		preg_match_all(self::$regular_expression_match, $post['message'], $usernames);
+
+		if (empty($usernames[1]))
+		{
+			return array();
+		}
+
+		$usernames[1] = array_unique($usernames[1]);
+
+		$usernames = array_map('utf8_clean_string', $usernames[1]);
+
+		$users = array();
+
+		/* todo
+		* find what type of notification they'd like to receive
+		*/
+		$sql = 'SELECT user_id
+			FROM ' . USERS_TABLE . '
+			WHERE ' . $db->sql_in_set('username_clean', $usernames);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$users[$row['user_id']] = array('');
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($users))
+		{
+			return array();
+		}
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $post['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		foreach ($auth_read[$post['forum_id']]['f_read'] as $user_id)
+		{
+			$notify_users[$user_id] = $users[$user_id];
+		}
+
+		return $notify_users;
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_formatted_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		}
+
+		return $this->phpbb_container->get('user')->lang(
+			'NOTIFICATION_QUOTE',
+			$username,
+			censor_text($this->get_data('topic_title'))
+		);
+	}
+
+	/**
+	* Get the title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+			$username = $user_data['username'];
+		}
+
+		return $this->phpbb_container->get('user')->lang(
+			'NOTIFICATION_QUOTE',
+			$username,
+			censor_text($this->get_data('topic_title'))
+		);
+	}
+
+	/**
+	* Update a notification
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $data Data specific for this type that will be updated
+	*/
+	public static function update_notifications(ContainerBuilder $phpbb_container, $post)
+	{
+		$service = $phpbb_container->get('notifications');
+		$db = $phpbb_container->get('dbal.conn');
+
+		$old_notifications = array();
+		$sql = 'SELECT user_id
+			FROM ' . NOTIFICATIONS_TABLE . "
+			WHERE item_type = '" . self::get_item_type() . "'
+				AND item_id = " . self::get_item_id($post);
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$old_notifications[] = $row['user_id'];
+		}
+		$db->sql_freeresult($result);
+
+		// Find the new users to notify
+		$notifications = self::find_users_for_notification($phpbb_container, $post);
+
+		// Find the notifications we must delete
+		$remove_notifications = array_diff($old_notifications, array_keys($notifications));
+
+		// Find the notifications we must add
+		$add_notifications = array();
+		foreach (array_diff(array_keys($notifications), $old_notifications) as $user_id)
+		{
+			$add_notifications[$user_id] = $notifications[$user_id];
+		}
+
+		// Add the necessary notifications
+		$service->add_notifications_for_users(self::get_item_type(), $post, $add_notifications);
+
+		// Remove the necessary notifications
+		if (!empty($remove_notifications))
+		{
+			$sql = 'DELETE FROM ' . NOTIFICATIONS_TABLE . "
+				WHERE item_type = '" . self::get_item_type() . "'
+					AND item_id = " . self::get_item_id($post) . '
+					AND ' . $db->sql_in_set('user_id', $remove_notifications);
+			$db->sql_query($sql);
+		}
+
+		// return true to continue with the update code in the notifications service (this will update the rest of the notifications)
+		return true;
+	}
+}
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notifications/type/topic.php
new file mode 100644
index 0000000000..0fce65a0cf
--- /dev/null
+++ b/phpBB/includes/notifications/type/topic.php
@@ -0,0 +1,222 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Topic notifications class
+* This class handles notifications for new topics
+*
+* @package notifications
+*/
+class phpbb_notifications_type_topic extends phpbb_notifications_type_base
+{
+	/**
+	* Get the type of notification this is
+	* phpbb_notifications_type_
+	*/
+	public static function get_item_type()
+	{
+		return 'topic';
+	}
+
+	/**
+	* Get the id of the item
+	*
+	* @param array $post The data from the post
+	*/
+	public static function get_item_id($post)
+	{
+		return (int) $post['topic_id'];
+	}
+
+	/**
+	* Get the id of the parent
+	*
+	* @param array $post The data from the post
+	*/
+	public static function get_item_parent_id($post)
+	{
+		return (int) $post['forum_id'];
+	}
+
+	/**
+	* Find the users who want to receive notifications
+	*
+	* @param ContainerBuilder $phpbb_container
+	* @param array $post Data from
+	*
+	* @return array
+	*/
+	public static function find_users_for_notification(ContainerBuilder $phpbb_container, $topic)
+	{
+		// Let's continue to use the phpBB subscriptions system, at least for now.
+		// It may not be the nicest thing, but it is already working and it would be significant work to replace it
+		//$users = parent::_find_users_for_notification($phpbb_container, $topic['forum_id']);
+
+		$db = $phpbb_container->get('dbal.conn');
+
+		$users = array();
+
+		/* todo
+		* find what type of notification they'd like to receive
+		* make sure not to send duplicate notifications
+		*/
+		$sql = 'SELECT user_id
+			FROM ' . FORUMS_WATCH_TABLE . '
+			WHERE forum_id = ' . (int) $topic['forum_id'] . '
+				AND notify_status = ' . NOTIFY_YES;
+		$result = $db->sql_query($sql);
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$users[$row['user_id']] = array('');
+		}
+		$db->sql_freeresult($result);
+
+		if (empty($users))
+		{
+			return array();
+		}
+
+		$auth_read = $phpbb_container->get('auth')->acl_get_list(array_keys($users), 'f_read', $topic['forum_id']);
+
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		$notify_users = array();
+
+		foreach ($auth_read[$topic['forum_id']]['f_read'] as $user_id)
+		{
+			$notify_users[$user_id] = $users[$user_id];
+		}
+
+		return $notify_users;
+	}
+
+	/**
+	* Get the user's avatar
+	*/
+	public function get_avatar()
+	{
+		return $this->_get_avatar($this->get_data('poster_id'));
+	}
+
+	/**
+	* Get the HTML formatted title of this notification
+	*
+	* @return string
+	*/
+	public function get_formatted_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+			$username = get_username_string('no_profile', $user_data['user_id'], $user_data['username'], $user_data['user_colour']);
+		}
+
+		return $this->phpbb_container->get('user')->lang(
+			'NOTIFICATION_TOPIC',
+			$username,
+			censor_text($this->get_data('topic_title')),
+			$this->get_data('forum_name')
+		);
+	}
+
+	/**
+	* Get the title of this notification
+	*
+	* @return string
+	*/
+	public function get_title()
+	{
+		if ($this->get_data('post_username'))
+		{
+			$username = $this->get_data('post_username');
+		}
+		else
+		{
+			$user_data = $this->service->get_user($this->get_data('poster_id'));
+
+			$username = $user_data['username'];
+		}
+
+		return $this->phpbb_container->get('user')->lang(
+			'NOTIFICATION_TOPIC',
+			$username,
+			censor_text($this->get_data('topic_title')),
+			$this->get_data('forum_name')
+		);
+	}
+
+	/**
+	* Get the url to this item
+	*
+	* @return string URL
+	*/
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f={$this->item_parent_id}&amp;t={$this->item_id}");
+	}
+
+	/**
+	* Get the full url to this item
+	*
+	* @return string URL
+	*/
+	public function get_full_url()
+	{
+		return generate_board_url() . "/viewtopic.{$this->php_ext}?f={$this->item_parent_id}&t={$this->item_id}";
+	}
+
+	/**
+	* Users needed to query before this notification can be displayed
+	*
+	* @return array Array of user_ids
+	*/
+	public function users_to_query()
+	{
+		return array($this->data['poster_id']);
+	}
+
+	/**
+	* Function for preparing the data for insertion in an SQL query
+	* (The service handles insertion)
+	*
+	* @param array $post Data from submit_post
+	*
+	* @return array Array of data ready to be inserted into the database
+	*/
+	public function create_insert_array($post)
+	{
+		$this->set_data('poster_id', $post['poster_id']);
+
+		$this->set_data('topic_title', $post['topic_title']);
+
+		$this->set_data('post_username', (($post['post_username'] != $this->phpbb_container->get('user')->data['username']) ? $post['post_username'] : ''));
+
+		$this->set_data('forum_name', $post['forum_name']);
+
+		return parent::create_insert_array($post);
+	}
+}