Merge pull request #1951 from prototech/ticket/12032

[ticket/12032] Do not inherit read status in certain notifications.
author: Nathan Guse <nathaniel.guse@gmail.com> 2014-01-17 17:52:49 -0800
committer: Nathan Guse <nathaniel.guse@gmail.com> 2014-01-17 17:52:49 -0800
commit: 8eb9f1542cf02209e2991d0abd5cbf876fdec5bf (patch)
tree: 2b6c8c63ecd4f7de3a814d95217c76a0334db4a0
parent: 670a9a1aea49ac4b39966025be9fd28062567fa2 (diff)
parent: 4bb05c74e5651bab98ce3a38e2b65f79d9ccfb11 (diff)
download: forums-8eb9f1542cf02209e2991d0abd5cbf876fdec5bf.tar
forums-8eb9f1542cf02209e2991d0abd5cbf876fdec5bf.tar.gz
forums-8eb9f1542cf02209e2991d0abd5cbf876fdec5bf.tar.bz2
forums-8eb9f1542cf02209e2991d0abd5cbf876fdec5bf.tar.xz
forums-8eb9f1542cf02209e2991d0abd5cbf876fdec5bf.zip
8 files changed, 60 insertions, 4 deletions
diff --git a/phpBB/phpbb/notification/type/approve_post.php b/phpBB/phpbb/notification/type/approve_post.php
index 51a9a704b0..e51ff12b3e 100644
--- a/phpBB/phpbb/notification/type/approve_post.php
+++ b/phpBB/phpbb/notification/type/approve_post.php
@@ -35,6 +35,13 @@ class approve_post extends \phpbb\notification\type\post
 	protected $language_key = 'NOTIFICATION_POST_APPROVED';
 
 	/**
+	* Inherit notification read status from post.
+	*
+	* @var bool
+	*/
+	protected $inherit_read_status = false;
+
+	/**
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
diff --git a/phpBB/phpbb/notification/type/approve_topic.php b/phpBB/phpbb/notification/type/approve_topic.php
index 6229800c68..11a240e03d 100644
--- a/phpBB/phpbb/notification/type/approve_topic.php
+++ b/phpBB/phpbb/notification/type/approve_topic.php
@@ -35,6 +35,13 @@ class approve_topic extends \phpbb\notification\type\topic
 	protected $language_key = 'NOTIFICATION_TOPIC_APPROVED';
 
 	/**
+	* Inherit notification read status from topic.
+	*
+	* @var bool
+	*/
+	protected $inherit_read_status = false;
+
+	/**
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
diff --git a/phpBB/phpbb/notification/type/disapprove_post.php b/phpBB/phpbb/notification/type/disapprove_post.php
index 411d4195c7..70de2a3e10 100644
--- a/phpBB/phpbb/notification/type/disapprove_post.php
+++ b/phpBB/phpbb/notification/type/disapprove_post.php
@@ -35,6 +35,13 @@ class disapprove_post extends \phpbb\notification\type\approve_post
 	protected $language_key = 'NOTIFICATION_POST_DISAPPROVED';
 
 	/**
+	* Inherit notification read status from post.
+	*
+	* @var bool
+	*/
+	protected $inherit_read_status = false;
+
+	/**
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
diff --git a/phpBB/phpbb/notification/type/disapprove_topic.php b/phpBB/phpbb/notification/type/disapprove_topic.php
index 19e9d468ce..d39201d928 100644
--- a/phpBB/phpbb/notification/type/disapprove_topic.php
+++ b/phpBB/phpbb/notification/type/disapprove_topic.php
@@ -35,6 +35,13 @@ class disapprove_topic extends \phpbb\notification\type\approve_topic
 	protected $language_key = 'NOTIFICATION_TOPIC_DISAPPROVED';
 
 	/**
+	* Inherit notification read status from topic.
+	*
+	* @var bool
+	*/
+	protected $inherit_read_status = false;
+
+	/**
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php
index c2854c17af..bc42c4422b 100644
--- a/phpBB/phpbb/notification/type/post.php
+++ b/phpBB/phpbb/notification/type/post.php
@@ -35,6 +35,13 @@ class post extends \phpbb\notification\type\base
 	protected $language_key = 'NOTIFICATION_POST';
 
 	/**
+	* Inherit notification read status from post.
+	*
+	* @var bool
+	*/
+	protected $inherit_read_status = true;
+
+	/**
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
@@ -315,7 +322,7 @@ class post extends \phpbb\notification\type\base
 	*/
 	public function pre_create_insert_array($post, $notify_users)
 	{
-		if (!sizeof($notify_users))
+		if (!sizeof($notify_users) || !$this->inherit_read_status)
 		{
 			return array();
 		}
@@ -360,7 +367,7 @@ class post extends \phpbb\notification\type\base
 
 		// Topics can be "read" before they are public (while awaiting approval).
 		// Make sure that if the user has read the topic, it's marked as read in the notification
-		if (isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time)
+		if ($this->inherit_read_status && isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time)
 		{
 			$this->notification_read = true;
 		}
diff --git a/phpBB/phpbb/notification/type/report_post.php b/phpBB/phpbb/notification/type/report_post.php
index 89b497efa6..9bf035b91e 100644
--- a/phpBB/phpbb/notification/type/report_post.php
+++ b/phpBB/phpbb/notification/type/report_post.php
@@ -35,6 +35,13 @@ class report_post extends \phpbb\notification\type\post_in_queue
 	protected $language_key = 'NOTIFICATION_REPORT_POST';
 
 	/**
+	* Inherit notification read status from post.
+	*
+	* @var bool
+	*/
+	protected $inherit_read_status = false;
+
+	/**
 	* Permission to check for (in find_users_for_notification)
 	*
 	* @var string Permission name
diff --git a/phpBB/phpbb/notification/type/report_post_closed.php b/phpBB/phpbb/notification/type/report_post_closed.php
index 5874d48e31..fff45612b3 100644
--- a/phpBB/phpbb/notification/type/report_post_closed.php
+++ b/phpBB/phpbb/notification/type/report_post_closed.php
@@ -41,6 +41,13 @@ class report_post_closed extends \phpbb\notification\type\post
 	*/
 	protected $language_key = 'NOTIFICATION_REPORT_CLOSED';
 
+	/**
+	* Inherit notification read status from post.
+	*
+	* @var bool
+	*/
+	protected $inherit_read_status = false;
+
 	public function is_available()
 	{
 		return false;
diff --git a/phpBB/phpbb/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php
index 6198881d8d..98f086a50b 100644
--- a/phpBB/phpbb/notification/type/topic.php
+++ b/phpBB/phpbb/notification/type/topic.php
@@ -35,6 +35,13 @@ class topic extends \phpbb\notification\type\base
 	protected $language_key = 'NOTIFICATION_TOPIC';
 
 	/**
+	* Inherit notification read status from topic.
+	*
+	* @var bool
+	*/
+	protected $inherit_read_status = true;
+
+	/**
 	* Notification option data (for outputting to the user)
 	*
 	* @var bool|array False if the service should use it's default data
@@ -220,7 +227,7 @@ class topic extends \phpbb\notification\type\base
 	*/
 	public function pre_create_insert_array($post, $notify_users)
 	{
-		if (!sizeof($notify_users))
+		if (!sizeof($notify_users) || !$this->inherit_read_status)
 		{
 			return array();
 		}
@@ -261,7 +268,7 @@ class topic extends \phpbb\notification\type\base
 
 		// Topics can be "read" before they are public (while awaiting approval).
 		// Make sure that if the user has read the topic, it's marked as read in the notification
-		if (isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time)
+		if ($this->inherit_read_status && isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time)
 		{
 			$this->notification_read = true;
 		}
author	Nathan Guse <nathaniel.guse@gmail.com>	2014-01-17 17:52:49 -0800
committer	Nathan Guse <nathaniel.guse@gmail.com>	2014-01-17 17:52:49 -0800
commit	8eb9f1542cf02209e2991d0abd5cbf876fdec5bf (patch)
tree	2b6c8c63ecd4f7de3a814d95217c76a0334db4a0
parent	670a9a1aea49ac4b39966025be9fd28062567fa2 (diff)
parent	4bb05c74e5651bab98ce3a38e2b65f79d9ccfb11 (diff)
download	forums-8eb9f1542cf02209e2991d0abd5cbf876fdec5bf.tar forums-8eb9f1542cf02209e2991d0abd5cbf876fdec5bf.tar.gz forums-8eb9f1542cf02209e2991d0abd5cbf876fdec5bf.tar.bz2 forums-8eb9f1542cf02209e2991d0abd5cbf876fdec5bf.tar.xz forums-8eb9f1542cf02209e2991d0abd5cbf876fdec5bf.zip