2 files changed, 71 insertions, 1 deletions
diff --git a/phpBB/includes/notifications/method/base.php b/phpBB/includes/notifications/method/base.php
index dbf851a059..98c06509c6 100644
--- a/phpBB/includes/notifications/method/base.php
+++ b/phpBB/includes/notifications/method/base.php
@@ -26,6 +26,8 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me
 	protected $phpbb_container;
 	protected $db;
 	protected $user;
+	protected $phpbb_root_path;
+	protected $php_ext;
 
 	/**
 	* Queue of messages to be sent
@@ -42,6 +44,9 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me
 		// 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');
 	}
 
 	/**
@@ -65,7 +70,11 @@ abstract class phpbb_notifications_method_base implements phpbb_notifications_me
 			$this->notify($notification);
 		}
 
-		// Empty queue
+		$this->empty_queue();
+	}
+
+	protected function empty_queue()
+	{
 		$this->queue = array();
 	}
 }
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index 0c3cb4bd85..725ede7913 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -33,4 +33,65 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
 	{
 		// email the user
 	}
+
+	public function run_queue()
+	{
+		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;
+		}
+
+		$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))
+		{
+			$users[$row['user_id']] = $row;
+		}
+		$this->db->sql_freeresult($result);
+
+		// 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)
+		{
+			$notification->users($users);
+
+			$user = $notification->get_user();
+
+			$messenger->template('privmsg_notify', $user['user_lang']);
+
+			$messenger->to($user['user_email'], $user['username']);
+
+			$messenger->assign_vars(array(
+				'SUBJECT'		=> htmlspecialchars_decode($notification->get_title()),
+				'AUTHOR_NAME'	=> '',
+				'USERNAME'		=> htmlspecialchars_decode($user['username']),
+
+				'U_INBOX'			=> $board_url . "/ucp.{$this->php_ext}?i=pm&folder=inbox",
+				'U_VIEW_MESSAGE'	=> $board_url . "/ucp.{$this->php_ext}?i=pm&mode=view&p={$notification->get_item_id()}",
+			));
+
+			$messenger->send($addr['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();
+	}
 }