6 files changed, 92 insertions, 61 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 7a3c73e987..b8bf517d75 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('NOTIFICATION_TYPES_TABLE',	$table_prefix . 'notification_types');
 define('NOTIFICATIONS_TABLE',		$table_prefix . 'notifications');
 define('POLL_OPTIONS_TABLE',		$table_prefix . 'poll_options');
 define('POLL_VOTES_TABLE',			$table_prefix . 'poll_votes');
diff --git a/phpBB/includes/notification/manager.php b/phpBB/includes/notification/manager.php
index a5e1b09754..63db3e6e9a 100644
--- a/phpBB/includes/notification/manager.php
+++ b/phpBB/includes/notification/manager.php
@@ -46,12 +46,15 @@ class phpbb_notification_manager
 	protected $php_ext = null;
 
 	/** @var string */
+	protected $notification_types_table = null;
+
+	/** @var string */
 	protected $notifications_table = null;
 
 	/** @var string */
 	protected $user_notifications_table = null;
 
-	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, phpbb_db_driver $db, $user, $phpbb_root_path, $php_ext, $notifications_table, $user_notifications_table)
+	public function __construct($notification_types, $notification_methods, $phpbb_container, phpbb_user_loader $user_loader, phpbb_db_driver $db, $user, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
 	{
 		$this->notification_types = $notification_types;
 		$this->notification_methods = $notification_methods;
@@ -64,6 +67,7 @@ class phpbb_notification_manager
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 
+		$this->notification_types_table = $notification_types_table;
 		$this->notifications_table = $notifications_table;
 		$this->user_notifications_table = $user_notifications_table;
 	}
@@ -121,11 +125,12 @@ class phpbb_notification_manager
 		if ($options['count_unread'])
 		{
 			// Get the total number of unread notifications
-			$sql = 'SELECT COUNT(*) AS unread_count
-				FROM ' . $this->notifications_table . '
-				WHERE user_id = ' . (int) $options['user_id'] . '
-					AND unread = 1
-					AND is_enabled = 1';
+			$sql = 'SELECT COUNT(n.notification_id) AS unread_count
+				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+				WHERE n.user_id = ' . (int) $options['user_id'] . '
+					AND n.unread = 1
+					AND nt.notification_type = n.item_type
+					AND nt.notification_type_enabled = 1';
 			$result = $this->db->sql_query($sql);
 			$unread_count = (int) $this->db->sql_fetchfield('unread_count', $result);
 			$this->db->sql_freeresult($result);
@@ -134,10 +139,11 @@ class phpbb_notification_manager
 		if ($options['count_total'])
 		{
 			// Get the total number of notifications
-			$sql = 'SELECT COUNT(*) AS total_count
-				FROM ' . $this->notifications_table . '
-				WHERE user_id = ' . (int) $options['user_id'] . '
-					AND is_enabled = 1';
+			$sql = 'SELECT COUNT(n.notification_id) AS total_count
+				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+				WHERE n.user_id = ' . (int) $options['user_id'] . '
+					AND nt.notification_type = n.item_type
+					AND nt.notification_type_enabled = 1';
 			$result = $this->db->sql_query($sql);
 			$total_count = (int) $this->db->sql_fetchfield('total_count', $result);
 			$this->db->sql_freeresult($result);
@@ -148,12 +154,13 @@ class phpbb_notification_manager
 			$rowset = array();
 
 			// Get the main notifications
-			$sql = 'SELECT *
-				FROM ' . $this->notifications_table . '
-				WHERE user_id = ' . (int) $options['user_id'] .
-					(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('notification_id', $options['notification_id']) : ' AND notification_id = ' . (int) $options['notification_id']) : '') . '
-			 		AND is_enabled = 1
-				ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
+			$sql = 'SELECT n.*
+				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+				WHERE n.user_id = ' . (int) $options['user_id'] .
+					(($options['notification_id']) ? ((is_array($options['notification_id'])) ? ' AND ' . $this->db->sql_in_set('n.notification_id', $options['notification_id']) : ' AND n.notification_id = ' . (int) $options['notification_id']) : '') . '
+					AND nt.notification_type = n.item_type
+					AND nt.notification_type_enabled = 1
+				ORDER BY n.' . $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))
@@ -165,13 +172,14 @@ class phpbb_notification_manager
 			// Get all unread notifications
 			if ($unread_count && $options['all_unread'] && !empty($rowset))
 			{
-				$sql = 'SELECT *
-					FROM ' . $this->notifications_table . '
-					WHERE user_id = ' . (int) $options['user_id'] . '
-						AND unread = 1
-						AND ' . $this->db->sql_in_set('notification_id', array_keys($rowset), true) . '
-						AND is_enabled = 1
-					ORDER BY ' . $this->db->sql_escape($options['order_by']) . ' ' . $this->db->sql_escape($options['order_dir']);
+				$sql = 'SELECT n.*
+				FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . ' nt
+					WHERE n.user_id = ' . (int) $options['user_id'] . '
+						AND n.unread = 1
+						AND ' . $this->db->sql_in_set('n.notification_id', array_keys($rowset), true) . '
+						AND nt.notification_type = n.item_type
+						AND nt.notification_type_enabled = 1
+					ORDER BY n.' . $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))
@@ -345,6 +353,23 @@ class phpbb_notification_manager
 			return;
 		}
 
+		$sql = 'SELECT notification_type
+			FROM ' . $this->notification_types_table . "
+			WHERE notification_type = '" . $this->db->sql_escape($item_type) . "'";
+		$result = $this->db->sql_query($sql);
+
+		if ($this->db->sql_fetchrow($result) === false)
+		{
+			// Does not exist in the database, must add the item type
+			$sql = 'INSERT INTO ' . $this->notification_types_table . ' ' . $this->db->sql_build_array('INSERT', array(
+				'notification_type'				=> $item_type,
+				'notification_type_enabled'		=> 1,
+			));
+			$this->db->sql_query($sql);
+		}
+
+		$this->db->sql_freeresult($result);
+
 		$item_id = $this->get_item_type_class($item_type)->get_item_id($data);
 
 		$user_ids = array();
@@ -356,11 +381,12 @@ class phpbb_notification_manager
 
 		// 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
-		$sql = 'SELECT user_id
-			FROM ' . $this->notifications_table . "
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'
-				AND item_id = " . (int) $item_id . '
-				AND is_enabled = 1';
+		$sql = 'SELECT n.user_id
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
+			WHERE n.item_type = '" . $this->db->sql_escape($item_type) . "'
+				AND n.item_id = " . (int) $item_id . '
+				AND nt.notification_type = n.item_type
+				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
@@ -717,9 +743,9 @@ class phpbb_notification_manager
 	*/
 	public function disable_notifications($item_type)
 	{
-		$sql = 'UPDATE ' . $this->notifications_table . "
-			SET is_enabled = 0
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'";
+		$sql = 'UPDATE ' . $this->notification_types_table . "
+			SET notification_type_enabled = 0
+			WHERE notification_type = '" . $this->db->sql_escape($item_type) . "'";
 		$this->db->sql_query($sql);
 	}
 
@@ -736,6 +762,10 @@ class phpbb_notification_manager
 		$sql = 'DELETE FROM ' . $this->notifications_table . "
 			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'";
 		$this->db->sql_query($sql);
+
+		$sql = 'DELETE FROM ' . $this->notification_types_table . "
+			WHERE notification_type = '" . $this->db->sql_escape($item_type) . "'";
+		$this->db->sql_query($sql);
 	}
 
 	/**
@@ -749,9 +779,9 @@ class phpbb_notification_manager
 	*/
 	public function enable_notifications($item_type)
 	{
-		$sql = 'UPDATE ' . $this->notifications_table . "
-			SET is_enabled = 1
-			WHERE item_type = '" . $this->db->sql_escape($item_type) . "'";
+		$sql = 'UPDATE ' . $this->notification_types_table . "
+			SET notification_type_enabled = 1
+			WHERE notification_type = '" . $this->db->sql_escape($item_type) . "'";
 		$this->db->sql_query($sql);
 	}
 
diff --git a/phpBB/includes/notification/type/base.php b/phpBB/includes/notification/type/base.php
index 31792de04c..effa57e3a3 100644
--- a/phpBB/includes/notification/type/base.php
+++ b/phpBB/includes/notification/type/base.php
@@ -72,10 +72,6 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* item_parent_id	- Parent item id (ex: for topic => forum_id, for post => topic_id, etc)
 	* user_id
 	* unread
-	* is_enabled		- EXTENSION AUTHORS TAKE NOTE! This is to prevent errors with notifications from extensions!
-	* 					- Set is_enabled to 0 for all your notifications when your extension is disabled so they are ignored and do not cause errors.
-	* 					- When your extension is enabled again, set is_enabled to 1 and your notifications will be working again.
-	*
 	* time
 	* data (special serialized field that each notification type can use to store stuff)
 	*
diff --git a/phpBB/includes/notification/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
index a17d8f5db7..750bd3b6cb 100644
--- a/phpBB/includes/notification/type/bookmark.php
+++ b/phpBB/includes/notification/type/bookmark.php
@@ -101,12 +101,13 @@ class phpbb_notification_type_bookmark extends phpbb_notification_type_post
 
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
-		$sql = 'SELECT *
-			FROM ' . $this->notifications_table . "
-			WHERE item_type = '" . $this->get_type() . "'
-				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
-				AND unread = 1
-				AND is_enabled = 1';
+		$sql = 'SELECT n.*
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
+			WHERE n.item_type = '" . $this->get_type() . "'
+				AND n.item_parent_id = " . (int) self::get_item_parent_id($post) . '
+				AND n.unread = 1
+				AND nt.notification_type = n.item_type
+				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
diff --git a/phpBB/includes/notification/type/post.php b/phpBB/includes/notification/type/post.php
index 0646282c94..0a42029f18 100644
--- a/phpBB/includes/notification/type/post.php
+++ b/phpBB/includes/notification/type/post.php
@@ -122,12 +122,13 @@ class phpbb_notification_type_post extends phpbb_notification_type_base
 
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
-		$sql = 'SELECT *
-			FROM ' . $this->notifications_table . "
-			WHERE item_type = '" . $this->get_type() . "'
-				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
-				AND unread = 1
-				AND is_enabled = 1';
+		$sql = 'SELECT n.*
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
+			WHERE n.item_type = '" . $this->get_type() . "'
+				AND n.item_parent_id = " . (int) self::get_item_parent_id($post) . '
+				AND n.unread = 1
+				AND nt.notification_type = n.item_type
+				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
diff --git a/phpBB/includes/notification/type/quote.php b/phpBB/includes/notification/type/quote.php
index 1796343a0e..b3a347f98c 100644
--- a/phpBB/includes/notification/type/quote.php
+++ b/phpBB/includes/notification/type/quote.php
@@ -120,12 +120,13 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 
 		// Try to find the users who already have been notified about replies and have not read the topic since and just update their notifications
 		$update_notifications = array();
-		$sql = 'SELECT *
-			FROM ' . $this->notifications_table . "
-			WHERE item_type = '" . $this->get_type() . "'
-				AND item_parent_id = " . (int) self::get_item_parent_id($post) . '
-				AND unread = 1
-				AND is_enabled = 1';
+		$sql = 'SELECT n.*
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
+			WHERE n.item_type = '" . $this->get_type() . "'
+				AND n.item_parent_id = " . (int) self::get_item_parent_id($post) . '
+				AND n.unread = 1
+				AND nt.notification_type = n.item_type
+				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{
@@ -151,11 +152,12 @@ class phpbb_notification_type_quote extends phpbb_notification_type_post
 	public function update_notifications($post)
 	{
 		$old_notifications = array();
-		$sql = 'SELECT user_id
-			FROM ' . $this->notifications_table . "
-			WHERE item_type = '" . $this->get_type() . "'
-				AND item_id = " . self::get_item_id($post) . '
-				AND is_enabled = 1';
+		$sql = 'SELECT n.user_id
+			FROM ' . $this->notifications_table . ' n, ' . $this->notification_types_table . " nt
+			WHERE n.item_type = '" . $this->get_type() . "'
+				AND n.item_id = " . self::get_item_id($post) . '
+				AND nt.notification_type = n.item_type
+				AND nt.notification_type_enabled = 1';
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
 		{