9 files changed, 145 insertions, 103 deletions
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index ff83d4bb37..9eceeb753a 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -256,6 +256,7 @@ class phpbb_notification_manager
 			SET notification_read = 1
 			WHERE notification_time <= " . (int) $time .
 				(($item_type !== false) ? ' AND ' . (is_array($item_type) ? $this->db->sql_in_set('item_type', $item_type) : " item_type = '" . $this->db->sql_escape($item_type) . "'") : '') .
+				(($user_id !== false) ? ' AND ' . (is_array($user_id) ? $this->db->sql_in_set('user_id', $user_id) : 'user_id = ' . (int) $user_id) : '') .
 				(($item_id !== false) ? ' AND ' . (is_array($item_id) ? $this->db->sql_in_set('item_id', $item_id) : 'item_id = ' . (int) $item_id) : '');
 		$this->db->sql_query($sql);
 	}
@@ -389,7 +390,6 @@ class phpbb_notification_manager
 
 		$user_ids = array();
 		$notification_objects = $notification_methods = array();
-		$new_rows = array();
 
 		// Never send notifications to the anonymous user!
 		unset($notify_users[ANONYMOUS]);
@@ -419,6 +419,8 @@ class phpbb_notification_manager
 		$pre_create_data = $notification->pre_create_insert_array($data, $notify_users);
 		unset($notification);
 
+		$insert_buffer = new phpbb_db_sql_insert_buffer($this->db, $this->notifications_table);
+
 		// 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)
 		{
@@ -426,8 +428,8 @@ class phpbb_notification_manager
 
 			$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, $pre_create_data);
+			// Insert notification row using buffer.
+			$insert_buffer->insert($notification->create_insert_array($data, $pre_create_data));
 
 			// Users are needed to send notifications
 			$user_ids = array_merge($user_ids, $notification->users_to_query());
@@ -447,8 +449,7 @@ class phpbb_notification_manager
 			}
 		}
 
-		// insert into the db
-		$this->db->sql_multi_insert($this->notifications_table, $new_rows);
+		$insert_buffer->flush();
 
 		// We need to load all of the users to send notifications
 		$this->user_loader->load_users($user_ids);
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index 4a7fea6df3..44666b1422 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notification_method_email extends phpbb_notification_method_base
+class phpbb_notification_method_email extends phpbb_notification_method_messenger_base
 {
 	/**
 	* Get notification method name
@@ -34,20 +34,6 @@ class phpbb_notification_method_email extends phpbb_notification_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;
-
-	/**
-	* Base directory to prepend to the email template name
-	*
-	* @var string
-	*/
-	protected $email_template_base_dir = '';
-
-	/**
 	* Is this method available for the user?
 	* This is checked on the notifications options
 	*/
@@ -61,68 +47,6 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 	*/
 	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_root_path . 'includes/functions_user.' . $this->php_ext);
-		}
-		$banned_users = phpbb_get_banned_user_ids($user_ids);
-
-		// Load all the users we need
-		$this->user_loader->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)
-		{
-			if ($notification->get_email_template() === false)
-			{
-				continue;
-			}
-
-			$user = $this->user_loader->get_user($notification->user_id);
-
-			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
-			{
-				continue;
-			}
-
-			$messenger->template($this->email_template_base_dir . $notification->get_email_template(), $user['user_lang']);
-
-			$messenger->to($user['user_email'], $user['username']);
-
-			$messenger->assign_vars(array_merge(array(
-				'USERNAME'						=> $user['username'],
-
-				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications',
-			), $notification->get_email_template_variables()));
-
-			$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();
+		return $this->notify_using_messenger(NOTIFY_EMAIL);
 	}
 }
diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
index 863846b8a5..debffa8ce5 100644
--- a/phpBB/includes/notification/method/jabber.php
+++ b/phpBB/includes/notification/method/jabber.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notification_method_jabber extends phpbb_notification_method_email
+class phpbb_notification_method_jabber extends phpbb_notification_method_messenger_base
 {
 	/**
 	* Get notification method name
@@ -34,20 +34,6 @@ class phpbb_notification_method_jabber extends phpbb_notification_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;
-
-	/**
-	* Base directory to prepend to the email template name
-	*
-	* @var string
-	*/
-	protected $email_template_base_dir = 'short/';
-
-	/**
 	* Is this method available for the user?
 	* This is checked on the notifications options
 	*/
@@ -72,6 +58,6 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
 			return;
 		}
 
-		return parent::notify();
+		return $this->notify_using_messenger(NOTIFY_IM, 'short/');
 	}
 }
diff --git a/phpBB/includes/notification/method/messenger_base.php b/phpBB/includes/notification/method/messenger_base.php
new file mode 100644
index 0000000000..2f9073e80b
--- /dev/null
+++ b/phpBB/includes/notification/method/messenger_base.php
@@ -0,0 +1,100 @@
+<?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;
+}
+
+/**
+* Abstract notification method handling email and jabber notifications
+* using the phpBB messenger.
+*
+* @package notifications
+*/
+abstract class phpbb_notification_method_messenger_base extends phpbb_notification_method_base
+{
+	/**
+	* Notify using phpBB messenger
+	*
+	* @param int $notify_method				Notify method for messenger (e.g. NOTIFY_IM)
+	* @param string $template_dir_prefix	Base directory to prepend to the email template name
+	*
+	* @return null
+	*/
+	protected function notify_using_messenger($notify_method, $template_dir_prefix = '')
+	{
+		if (empty($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_root_path . 'includes/functions_user.' . $this->php_ext);
+		}
+		$banned_users = phpbb_get_banned_user_ids($user_ids);
+
+		// Load all the users we need
+		$this->user_loader->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)
+		{
+			if ($notification->get_email_template() === false)
+			{
+				continue;
+			}
+
+			$user = $this->user_loader->get_user($notification->user_id);
+
+			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
+			{
+				continue;
+			}
+
+			$messenger->template($template_dir_prefix . $notification->get_email_template(), $user['user_lang']);
+
+			$messenger->to($user['user_email'], $user['username']);
+
+			$messenger->assign_vars(array_merge(array(
+				'USERNAME'						=> $user['username'],
+
+				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications',
+			), $notification->get_email_template_variables()));
+
+			$messenger->send($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/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index 4e48a967d0..946cb9b4ed 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -89,6 +89,7 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 		{
 			return array();
 		}
+		sort($users);
 
 		$auth_read = $this->auth->acl_get_list($users, 'f_read', $post['forum_id']);
 
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index d8ffdea81d..626c13b7fd 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -106,11 +106,26 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 		}
 		$this->db->sql_freeresult($result);
 
+		$sql = 'SELECT user_id
+			FROM ' . FORUMS_WATCH_TABLE . '
+			WHERE forum_id = ' . (int) $post['forum_id'] . '
+				AND notify_status = ' . NOTIFY_YES . '
+				AND user_id <> ' . (int) $post['poster_id'];
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$users[] = $row['user_id'];
+		}
+		$this->db->sql_freeresult($result);
+
 		if (empty($users))
 		{
 			return array();
 		}
 
+		$users = array_unique($users);
+		sort($users);
+
 		$auth_read = $this->auth->acl_get_list($users, 'f_read', $post['forum_id']);
 
 		if (empty($auth_read))
diff --git a/phpBB/includes/notification/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
index 9c719205e6..bc4b15cdc3 100644
--- a/phpBB/includes/notification/type/post_in_queue.php
+++ b/phpBB/includes/notification/type/post_in_queue.php
@@ -82,7 +82,7 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 			'ignore_users'		=> array(),
 		), $options);
 
-		// 0 is for global
+		// 0 is for global moderator permissions
 		$auth_approve = $this->auth->acl_get_list(false, $this->permission, array($post['forum_id'], 0));
 
 		if (empty($auth_approve))
@@ -101,8 +101,15 @@ class phpbb_notification_type_post_in_queue extends phpbb_notification_type_post
 		{
 			$has_permission = array_unique(array_merge($has_permission, $auth_approve[0][$this->permission]));
 		}
+		sort($has_permission);
 
-		return $this->check_user_notification_options($has_permission, array_merge($options, array(
+		$auth_read = $this->auth->acl_get_list($has_permission, 'f_read', $post['forum_id']);
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		return $this->check_user_notification_options($auth_read[$post['forum_id']]['f_read'], array_merge($options, array(
 			'item_type'		=> self::$notification_option['id'],
 		)));
 	}
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 5453b267c8..e9eb7bea21 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -108,6 +108,7 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 		{
 			return array();
 		}
+		sort($users);
 
 		$auth_read = $this->auth->acl_get_list($users, 'f_read', $post['forum_id']);
 
diff --git a/phpBB/includes/notification/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
index c501434c43..f735e10c00 100644
--- a/phpBB/includes/notification/type/topic_in_queue.php
+++ b/phpBB/includes/notification/type/topic_in_queue.php
@@ -82,7 +82,7 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 			'ignore_users'		=> array(),
 		), $options);
 
-		// 0 is for global
+		// 0 is for global moderator permissions
 		$auth_approve = $this->auth->acl_get_list(false, 'm_approve', array($topic['forum_id'], 0));
 
 		if (empty($auth_approve))
@@ -101,8 +101,15 @@ class phpbb_notification_type_topic_in_queue extends phpbb_notification_type_top
 		{
 			$has_permission = array_unique(array_merge($has_permission, $auth_approve[0][$this->permission]));
 		}
+		sort($has_permission);
 
-		return $this->check_user_notification_options($has_permission, array_merge($options, array(
+		$auth_read = $this->auth->acl_get_list($has_permission, 'f_read', $topic['forum_id']);
+		if (empty($auth_read))
+		{
+			return array();
+		}
+
+		return $this->check_user_notification_options($auth_read[$topic['forum_id']]['f_read'], array_merge($options, array(
 			'item_type'		=> self::$notification_option['id'],
 		)));
 	}