From 39fd31d3aedd5d583041b1ee76bed3e7d0edcf36 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Sat, 13 Oct 2012 18:12:33 -0500
Subject: [PATCH] [ticket/11103] Trying to fix an odd issue with unread status
 on approved posts

From a recent change, when your posts/topics are approved, they will be
marked read automatically because you've read the topic/post already.

To change that I've forced the notification to be marked unread and
attempted to reset the read status on the post/topic to be unread before
the post that was approved.

This does not seem to work so well and I don't know of any way this can
really be properly fixed, so the code I was working on I've commented out.

For now, users will just need to manually mark these types of notifications
as read. I cannot think of a way for this to be fixed without running
two additional queries on every viewtopic.

PHPBB3-11103
---
 .../notification/type/approve_post.php        | 32 +++++++++++++++++++
 .../notification/type/approve_topic.php       | 30 +++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/phpBB/includes/notification/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
index dbd2e4417f..68e8352a13 100644
--- a/phpBB/includes/notification/type/approve_post.php
+++ b/phpBB/includes/notification/type/approve_post.php
@@ -114,6 +114,38 @@ class phpbb_notification_type_approve_post extends phpbb_notification_type_post
 		return $notify_users;
 	}
 
+	/**
+	* Pre create insert array function
+	* This allows you to perform certain actions, like run a query
+	* and load data, before create_insert_array() is run. The data
+	* returned from this function will be sent to create_insert_array().
+	*
+	* @param array $post Post data from submit_post
+	* @param array $notify_users Notify users list
+	* 		Formated from find_users_for_notification()
+	* @return array Whatever you want to send to create_insert_array().
+	*/
+	public function pre_create_insert_array($post, $notify_users)
+	{
+		/*if (!sizeof($notify_users))
+		{
+			return array();
+		}
+
+		// Mark the topic unread before the post
+		$sql = 'UPDATE ' . TOPICS_TRACK_TABLE . '
+			SET mark_time = ' . (int) ($post['post_time'] - 1) . '
+			WHERE topic_id = ' . (int) $post['topic_id'] . '
+				AND ' . $this->db->sql_in_set('user_id', array_keys($notify_users));
+		$this->db->sql_query($sql);*/
+
+		// In the parent class, this is used to check if the post is already
+		// read by a user and marks the notification read if it was marked read.
+		// Returning an empty array in effect, forces it to be marked as unread
+		// (and also saves a query)
+		return array();
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)
diff --git a/phpBB/includes/notification/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
index 3608bfba85..f3a94e44b8 100644
--- a/phpBB/includes/notification/type/approve_topic.php
+++ b/phpBB/includes/notification/type/approve_topic.php
@@ -114,6 +114,36 @@ class phpbb_notification_type_approve_topic extends phpbb_notification_type_topi
 		return $notify_users;
 	}
 
+	/**
+	* Pre create insert array function
+	* This allows you to perform certain actions, like run a query
+	* and load data, before create_insert_array() is run. The data
+	* returned from this function will be sent to create_insert_array().
+	*
+	* @param array $post Post data from submit_post
+	* @param array $notify_users Notify users list
+	* 		Formated from find_users_for_notification()
+	* @return array Whatever you want to send to create_insert_array().
+	*/
+	public function pre_create_insert_array($post, $notify_users)
+	{
+		/*if (!sizeof($notify_users))
+		{
+			return array();
+		}
+
+		// Mark the topic unread
+		$sql = 'DELETE FROM ' . TOPICS_TRACK_TABLE . '
+			WHERE topic_id = ' . (int) $post['topic_id'] . '
+				AND ' . $this->db->sql_in_set('user_id', array_keys($notify_users));
+		$this->db->sql_query($sql*/
+
+		// In the parent class, this is used to check if the post is already
+		// read by a user and marks the notification read if it was marked read.
+		// Returning an empty array in effect, forces it to be marked as unread
+		return array();
+	}
+
 	/**
 	* Function for preparing the data for insertion in an SQL query
 	* (The service handles insertion)