From 74e2a8f893a2e7a69ba129a74dd0b3c31e742e79 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 13:29:47 -0500
Subject: [ticket/11103] Post notifications

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 252 +++--------------------------------
 1 file changed, 19 insertions(+), 233 deletions(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index c50395a5df..6c5c4535a3 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')
@@ -2452,7 +2222,23 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	// Send Notifications
 	if (($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $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 'reply' :
+			case 'quote' :
+				$notifications->add_notifications('post', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
+			break;
+
+			case 'post' :
+				$notifications->add_notifications('topic', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
+			break;
+		}
 	}
 
 	$params = $add_anchor = '';
-- 
cgit v1.2.1


From e09f25d59707fc842b073fa2909cefc3d16ecbf3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 9 Sep 2012 14:55:40 -0500
Subject: [ticket/11103] Update notifications on post/topic edit

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 6c5c4535a3..64840bfa51 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2220,12 +2220,18 @@ 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)
 	{
 		$notifications = $phpbb_container->get('notifications');
 
 		switch ($mode)
 		{
+			case 'post' :
+				$notifications->add_notifications('topic', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
+			break;
+
 			case 'reply' :
 			case 'quote' :
 				$notifications->add_notifications('post', array_merge($data, array(
@@ -2233,8 +2239,15 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				)));
 			break;
 
-			case 'post' :
-				$notifications->add_notifications('topic', array_merge($data, array(
+			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,
 				)));
 			break;
-- 
cgit v1.2.1


From 207bbdf48cb05abfb611f238e4ba07131131c74d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 12 Sep 2012 23:55:29 -0500
Subject: [ticket/11103] Quote notifications

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 64840bfa51..ff0a59a4e3 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2230,6 +2230,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$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' :
@@ -2237,6 +2240,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$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' :
@@ -2250,6 +2256,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$notifications->update_notifications('post', array_merge($data, array(
 					'post_username'		=> $username,
 				)));
+				$notifications->add_notifications('quote', array_merge($data, array(
+					'post_username'		=> $username,
+				)));
 			break;
 		}
 	}
-- 
cgit v1.2.1


From 44aa773ce07d81d4585f3a24a728f9b445c4c098 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 14:55:14 -0500
Subject: [ticket/11103] Allow notification types to override update
 functionality

This is needed for quote editing because we need to check if the users
are still all quoted or notify new quotes appropriately.

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index ff0a59a4e3..26d9b81896 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2256,7 +2256,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$notifications->update_notifications('post', array_merge($data, array(
 					'post_username'		=> $username,
 				)));
-				$notifications->add_notifications('quote', array_merge($data, array(
+				$notifications->update_notifications('quote', array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
-- 
cgit v1.2.1


From ed1ec8e720a7ec3c1270cd631cc37e531f315f26 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 16:54:20 -0500
Subject: [ticket/11103] Add/Update/Mark Read functions accept an array for the
 type

This saves a lot of code in some areas (where the same data is sent, just
for different types)

Notifications for bookmarks

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 26d9b81896..56f84562f7 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2227,20 +2227,14 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		switch ($mode)
 		{
 			case 'post' :
-				$notifications->add_notifications('topic', array_merge($data, array(
-					'post_username'		=> $username,
-				)));
-				$notifications->add_notifications('quote', array_merge($data, array(
+				$notifications->add_notifications(array('topic', '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(
+				$notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
@@ -2253,10 +2247,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 					'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(
+
+				$notifications->update_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
-- 
cgit v1.2.1


From 8e977544fb6763412e45f84791de8c3eccf321c9 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 17:01:08 -0500
Subject: [ticket/11103] Normalization of $phpbb_notifications variable name

Use $phpbb_notifications instead of $notifications everywhere for
consistency and conflict prevention.

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 56f84562f7..e48a2b6bec 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2222,19 +2222,19 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	// Send Notifications
 	if ($post_approval)
 	{
-		$notifications = $phpbb_container->get('notifications');
+		$phpbb_notifications = $phpbb_container->get('notifications');
 
 		switch ($mode)
 		{
 			case 'post' :
-				$notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
+				$phpbb_notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
 
 			case 'reply' :
 			case 'quote' :
-				$notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
+				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
@@ -2243,12 +2243,12 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			case 'edit_first_post' :
 			case 'edit' :
 			case 'edit_last_post' :
-				$notifications->update_notifications('topic', array_merge($data, array(
+				$phpbb_notifications->update_notifications('topic', array_merge($data, array(
 					'post_username'		=> $username,
 					'topic_title'		=> $subject,
 				)));
 
-				$notifications->update_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
+				$phpbb_notifications->update_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
 				)));
 			break;
-- 
cgit v1.2.1


From 959c81d00e830e89fa9d583ee93bf8f166013fe0 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 14 Sep 2012 18:05:13 -0500
Subject: [ticket/11103] Use appropriate email templates to send notifications

Fixing a number of bugs

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index e48a2b6bec..fc2c5a47b6 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2229,6 +2229,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			case 'post' :
 				$phpbb_notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
 					'post_username'		=> $username,
+					'poster_id'			=> (int) $user->data['user_id'],
 				)));
 			break;
 
@@ -2236,6 +2237,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			case 'quote' :
 				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
+					'poster_id'			=> (int) $user->data['user_id'],
 				)));
 			break;
 
-- 
cgit v1.2.1


From 05b573ebf76c737f89deaefd22ce963aa910e5d1 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 13:51:02 -0500
Subject: [ticket/11103] Topic and post dis/approval notifications

Remove the formatted title function, plaintext is not needed since
email templates are used

Fix a number of bugs.

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index fc2c5a47b6..6089ef0014 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2238,6 +2238,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
 					'poster_id'			=> (int) $user->data['user_id'],
+					'post_text'			=> $data['message'],
 				)));
 			break;
 
@@ -2252,6 +2253,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 
 				$phpbb_notifications->update_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
 					'post_username'		=> $username,
+					'post_text'			=> $data['message'],
 				)));
 			break;
 		}
-- 
cgit v1.2.1


From 7454d5c2d526f237bf24825b80edf6c9f1750fc6 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Sep 2012 14:33:15 -0500
Subject: [ticket/11103] Topic/Post in queue notification

Also, bug fixes and cleanup

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 6089ef0014..4dd840ad53 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2220,10 +2220,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	}
 
 	// Send Notifications
+	$phpbb_notifications = $phpbb_container->get('notifications');
 	if ($post_approval)
 	{
-		$phpbb_notifications = $phpbb_container->get('notifications');
-
 		switch ($mode)
 		{
 			case 'post' :
@@ -2258,6 +2257,34 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			break;
 		}
 	}
+	else
+	{
+		switch ($mode)
+		{
+			case 'post' :
+				$phpbb_notifications->add_notifications(array('topic_in_queue'), array_merge($data, array(
+					'post_username'		=> $username,
+					'poster_id'			=> (int) $user->data['user_id'],
+				)));
+			break;
+
+			case 'reply' :
+			case 'quote' :
+				$phpbb_notifications->add_notifications(array('post_in_queue'), array_merge($data, array(
+					'post_username'		=> $username,
+					'poster_id'			=> (int) $user->data['user_id'],
+				)));
+			break;
+
+			case 'edit_topic' :
+			case 'edit_first_post' :
+			case 'edit' :
+			case 'edit_last_post' :
+				$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
+				$phpbb_notifications->delete_notifications(array('quote', 'bookmark', 'post'), $data['post_id']);
+			break;
+		}
+	}
 
 	$params = $add_anchor = '';
 
-- 
cgit v1.2.1


From 3897a442f7fe0107cf71adc02af999b496bfebaf Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Thu, 20 Sep 2012 10:40:18 -0500
Subject: [ticket/11103] Bug fixing

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 4dd840ad53..4ae5989fed 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2229,6 +2229,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$phpbb_notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
 					'post_username'		=> $username,
 					'poster_id'			=> (int) $user->data['user_id'],
+					'post_time'			=> $current_time,
 				)));
 			break;
 
@@ -2238,6 +2239,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 					'post_username'		=> $username,
 					'poster_id'			=> (int) $user->data['user_id'],
 					'post_text'			=> $data['message'],
+					'post_time'			=> $current_time,
 				)));
 			break;
 
@@ -2265,6 +2267,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$phpbb_notifications->add_notifications(array('topic_in_queue'), array_merge($data, array(
 					'post_username'		=> $username,
 					'poster_id'			=> (int) $user->data['user_id'],
+					'post_time'			=> $current_time,
 				)));
 			break;
 
@@ -2273,6 +2276,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 				$phpbb_notifications->add_notifications(array('post_in_queue'), array_merge($data, array(
 					'post_username'		=> $username,
 					'poster_id'			=> (int) $user->data['user_id'],
+					'post_time'			=> $current_time,
 				)));
 			break;
 
-- 
cgit v1.2.1


From aa3f6f4002094d29952d0383107af687bf7dcb15 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Tue, 25 Sep 2012 10:10:10 -0500
Subject: [ticket/11103] Fixing some bugs with the post/topic notifications

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 43 +++++++++++-------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 4ae5989fed..41bdd9f598 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2221,41 +2221,32 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 
 	// Send Notifications
 	$phpbb_notifications = $phpbb_container->get('notifications');
+	$notification_data = array_merge($data, array(
+		'topic_title'		=> (isset($data['topic_title'])) ? $data['topic_title'] : $subject,
+		'post_username'		=> $username,
+		'poster_id'			=> $poster_id,
+		'post_text'			=> $data['message'],
+		'post_time'			=> $current_time,
+		'post_subject'		=> $subject,
+	));
 	if ($post_approval)
 	{
 		switch ($mode)
 		{
 			case 'post' :
-				$phpbb_notifications->add_notifications(array('topic', 'quote'), array_merge($data, array(
-					'post_username'		=> $username,
-					'poster_id'			=> (int) $user->data['user_id'],
-					'post_time'			=> $current_time,
-				)));
+				$phpbb_notifications->add_notifications(array('topic', 'quote'), $notification_data);
 			break;
 
 			case 'reply' :
 			case 'quote' :
-				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
-					'post_username'		=> $username,
-					'poster_id'			=> (int) $user->data['user_id'],
-					'post_text'			=> $data['message'],
-					'post_time'			=> $current_time,
-				)));
+				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), $notification_data);
 			break;
 
 			case 'edit_topic' :
 			case 'edit_first_post' :
 			case 'edit' :
 			case 'edit_last_post' :
-				$phpbb_notifications->update_notifications('topic', array_merge($data, array(
-					'post_username'		=> $username,
-					'topic_title'		=> $subject,
-				)));
-
-				$phpbb_notifications->update_notifications(array('quote', 'bookmark', 'post'), array_merge($data, array(
-					'post_username'		=> $username,
-					'post_text'			=> $data['message'],
-				)));
+				$phpbb_notifications->update_notifications(array('quote', 'bookmark', 'topic', 'post'), $notification_data);
 			break;
 		}
 	}
@@ -2264,20 +2255,12 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		switch ($mode)
 		{
 			case 'post' :
-				$phpbb_notifications->add_notifications(array('topic_in_queue'), array_merge($data, array(
-					'post_username'		=> $username,
-					'poster_id'			=> (int) $user->data['user_id'],
-					'post_time'			=> $current_time,
-				)));
+				$phpbb_notifications->add_notifications(array('topic_in_queue'), $notification_data);
 			break;
 
 			case 'reply' :
 			case 'quote' :
-				$phpbb_notifications->add_notifications(array('post_in_queue'), array_merge($data, array(
-					'post_username'		=> $username,
-					'poster_id'			=> (int) $user->data['user_id'],
-					'post_time'			=> $current_time,
-				)));
+				$phpbb_notifications->add_notifications(array('post_in_queue'), $notification_data);
 			break;
 
 			case 'edit_topic' :
-- 
cgit v1.2.1


From 2a5baad61bace05ee4907f7125555777cf7b1401 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 27 Sep 2012 20:05:06 -0500
Subject: [ticket/11103] Only notify a user once for a single item

Note: The user may be notified multiple times IF they use different
notification options. e.g They are subscribed to topics they have
bookmarked by a notification and subscribed to the topic by
an email notification. In this case, they would receive two notifications.
This occurs because we do not want to omit any more direct types of
notifications (if they want an email, they should _always_ get at least one
email).

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 41bdd9f598..6262cee4ad 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2234,7 +2234,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		switch ($mode)
 		{
 			case 'post' :
-				$phpbb_notifications->add_notifications(array('topic', 'quote'), $notification_data);
+				$phpbb_notifications->add_notifications(array('quote', 'topic'), $notification_data);
 			break;
 
 			case 'reply' :
-- 
cgit v1.2.1


From b9bc65eed88bbd2dff12102909903cbf4dc9b368 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 4 Oct 2012 14:47:13 -0500
Subject: [ticket/11103] Make $phpbb_notifications a global and use it
 everywhere

Do not use phpbb_container everywhere (makes testing difficult)

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 6262cee4ad..3658757e5e 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1409,7 +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;
+	global $phpbb_notifications;
 
 	// We do not handle erasing posts here
 	if ($mode == 'delete')
@@ -2220,7 +2220,6 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	}
 
 	// Send Notifications
-	$phpbb_notifications = $phpbb_container->get('notifications');
 	$notification_data = array_merge($data, array(
 		'topic_title'		=> (isset($data['topic_title'])) ? $data['topic_title'] : $subject,
 		'post_username'		=> $username,
@@ -2229,6 +2228,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		'post_time'			=> $current_time,
 		'post_subject'		=> $subject,
 	));
+
 	if ($post_approval)
 	{
 		switch ($mode)
-- 
cgit v1.2.1


From 0d5d328c81362acdcbccffc28288505db8517616 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sun, 14 Oct 2012 12:42:18 -0500
Subject: [ticket/11103] Spacing consistency

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 3658757e5e..4deffe653b 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2233,19 +2233,19 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	{
 		switch ($mode)
 		{
-			case 'post' :
+			case 'post':
 				$phpbb_notifications->add_notifications(array('quote', 'topic'), $notification_data);
 			break;
 
-			case 'reply' :
-			case 'quote' :
+			case 'reply':
+			case 'quote':
 				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), $notification_data);
 			break;
 
-			case 'edit_topic' :
-			case 'edit_first_post' :
-			case 'edit' :
-			case 'edit_last_post' :
+			case 'edit_topic':
+			case 'edit_first_post':
+			case 'edit':
+			case 'edit_last_post':
 				$phpbb_notifications->update_notifications(array('quote', 'bookmark', 'topic', 'post'), $notification_data);
 			break;
 		}
@@ -2254,19 +2254,19 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 	{
 		switch ($mode)
 		{
-			case 'post' :
+			case 'post':
 				$phpbb_notifications->add_notifications(array('topic_in_queue'), $notification_data);
 			break;
 
-			case 'reply' :
-			case 'quote' :
+			case 'reply':
+			case 'quote':
 				$phpbb_notifications->add_notifications(array('post_in_queue'), $notification_data);
 			break;
 
-			case 'edit_topic' :
-			case 'edit_first_post' :
-			case 'edit' :
-			case 'edit_last_post' :
+			case 'edit_topic':
+			case 'edit_first_post':
+			case 'edit':
+			case 'edit_last_post':
 				$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
 				$phpbb_notifications->delete_notifications(array('quote', 'bookmark', 'post'), $data['post_id']);
 			break;
-- 
cgit v1.2.1


From 94d682f77431add84867bb0b196ad0719b293606 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 20 Oct 2012 20:54:18 -0500
Subject: [ticket/11103] Use the full class name as the item_type/method

This is going to require you recreate the db tables.

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 4deffe653b..02c31eb6cc 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2234,19 +2234,31 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		switch ($mode)
 		{
 			case 'post':
-				$phpbb_notifications->add_notifications(array('quote', 'topic'), $notification_data);
+				$phpbb_notifications->add_notifications(array(
+					'phpbb_notification_type_quote',
+					'phpbb_notification_type_topic',
+				), $notification_data);
 			break;
 
 			case 'reply':
 			case 'quote':
-				$phpbb_notifications->add_notifications(array('quote', 'bookmark', 'post'), $notification_data);
+				$phpbb_notifications->add_notifications(array(
+					'phpbb_notification_type_quote',
+					'phpbb_notification_type_bookmark',
+					'phpbb_notification_type_post',
+				), $notification_data);
 			break;
 
 			case 'edit_topic':
 			case 'edit_first_post':
 			case 'edit':
 			case 'edit_last_post':
-				$phpbb_notifications->update_notifications(array('quote', 'bookmark', 'topic', 'post'), $notification_data);
+				$phpbb_notifications->update_notifications(array(
+					'phpbb_notification_type_quote',
+					'phpbb_notification_type_bookmark',
+					'phpbb_notification_type_topic',
+					'phpbb_notification_type_post',
+				), $notification_data);
 			break;
 		}
 	}
@@ -2255,20 +2267,24 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		switch ($mode)
 		{
 			case 'post':
-				$phpbb_notifications->add_notifications(array('topic_in_queue'), $notification_data);
+				$phpbb_notifications->add_notifications('phpbb_notification_type_topic_in_queue', $notification_data);
 			break;
 
 			case 'reply':
 			case 'quote':
-				$phpbb_notifications->add_notifications(array('post_in_queue'), $notification_data);
+				$phpbb_notifications->add_notifications('phpbb_notification_type_post_in_queue', $notification_data);
 			break;
 
 			case 'edit_topic':
 			case 'edit_first_post':
 			case 'edit':
 			case 'edit_last_post':
-				$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
-				$phpbb_notifications->delete_notifications(array('quote', 'bookmark', 'post'), $data['post_id']);
+				$phpbb_notifications->delete_notifications('phpbb_notification_type_topic', $data['topic_id']);
+				$phpbb_notifications->delete_notifications(array(
+					'phpbb_notification_type_quote',
+					'phpbb_notification_type_bookmark',
+					'phpbb_notification_type_post',
+				), $data['post_id']);
 			break;
 		}
 	}
-- 
cgit v1.2.1


From a811e65147db4d5c98914d201f2e4478f31f64fc Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 29 Oct 2012 18:18:33 -0500
Subject: [ticket/11103] Revert an overwrite that occured on merging from
 develop

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 02c31eb6cc..4df199d72d 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -296,13 +296,15 @@ function posting_gen_topic_icons($mode, $icon_id)
 
 	if (sizeof($icons))
 	{
+		$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
+
 		foreach ($icons as $id => $data)
 		{
 			if ($data['display'])
 			{
 				$template->assign_block_vars('topic_icon', array(
 					'ICON_ID'		=> $id,
-					'ICON_IMG'		=> $phpbb_root_path . $config['icons_path'] . '/' . $data['img'],
+					'ICON_IMG'		=> $root_path . $config['icons_path'] . '/' . $data['img'],
 					'ICON_WIDTH'	=> $data['width'],
 					'ICON_HEIGHT'	=> $data['height'],
 
-- 
cgit v1.2.1


From 2afb8b9df873c3f9572a32ab7a62ea8ba8d8a45b Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 20 Nov 2012 18:14:48 -0600
Subject: [ticket/11103] Create user loader class, update for DIC

Create a very basic user loader class to handle querying/storing
user data in a centralized location.

Use DIC collection service for notification types/methods.

Cleanup unused dependencies.

Fix some other issues.

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 4df199d72d..8ba1fed6a7 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -2237,17 +2237,17 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		{
 			case 'post':
 				$phpbb_notifications->add_notifications(array(
-					'phpbb_notification_type_quote',
-					'phpbb_notification_type_topic',
+					'quote',
+					'topic',
 				), $notification_data);
 			break;
 
 			case 'reply':
 			case 'quote':
 				$phpbb_notifications->add_notifications(array(
-					'phpbb_notification_type_quote',
-					'phpbb_notification_type_bookmark',
-					'phpbb_notification_type_post',
+					'quote',
+					'bookmark',
+					'post',
 				), $notification_data);
 			break;
 
@@ -2256,10 +2256,10 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			case 'edit':
 			case 'edit_last_post':
 				$phpbb_notifications->update_notifications(array(
-					'phpbb_notification_type_quote',
-					'phpbb_notification_type_bookmark',
-					'phpbb_notification_type_topic',
-					'phpbb_notification_type_post',
+					'quote',
+					'bookmark',
+					'topic',
+					'post',
 				), $notification_data);
 			break;
 		}
@@ -2269,23 +2269,23 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		switch ($mode)
 		{
 			case 'post':
-				$phpbb_notifications->add_notifications('phpbb_notification_type_topic_in_queue', $notification_data);
+				$phpbb_notifications->add_notifications('topic_in_queue', $notification_data);
 			break;
 
 			case 'reply':
 			case 'quote':
-				$phpbb_notifications->add_notifications('phpbb_notification_type_post_in_queue', $notification_data);
+				$phpbb_notifications->add_notifications('post_in_queue', $notification_data);
 			break;
 
 			case 'edit_topic':
 			case 'edit_first_post':
 			case 'edit':
 			case 'edit_last_post':
-				$phpbb_notifications->delete_notifications('phpbb_notification_type_topic', $data['topic_id']);
+				$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
 				$phpbb_notifications->delete_notifications(array(
-					'phpbb_notification_type_quote',
-					'phpbb_notification_type_bookmark',
-					'phpbb_notification_type_post',
+					'quote',
+					'bookmark',
+					'post',
 				), $data['post_id']);
 			break;
 		}
-- 
cgit v1.2.1


From 249f3c8885d461ae3981dfd7b62093c2175175e3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 19:19:40 -0600
Subject: [ticket/11103] Instantiate $phpbb_notifications as needed

https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976

PHPBB3-11103
---
 phpBB/includes/functions_posting.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/functions_posting.php')

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 8ba1fed6a7..1648228af5 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1410,8 +1410,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_notifications;
+	global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path, $phpbb_container;
 
 	// We do not handle erasing posts here
 	if ($mode == 'delete')
@@ -2231,6 +2230,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		'post_subject'		=> $subject,
 	));
 
+	$phpbb_notifications = $phpbb_container->get('notification_manager');
+
 	if ($post_approval)
 	{
 		switch ($mode)
@@ -2282,6 +2283,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 			case 'edit':
 			case 'edit_last_post':
 				$phpbb_notifications->delete_notifications('topic', $data['topic_id']);
+
 				$phpbb_notifications->delete_notifications(array(
 					'quote',
 					'bookmark',
-- 
cgit v1.2.1