- updated topic tracking code

- additional changes (mostly bugfixes) - bart, if you update your user table with the user_lastmark field, set it to the user_lastvisit value ;) - and last but not least, introducing some bugs in ucp main front (regarding topic tracking) git-svn-id: file:///svn/phpbb/trunk@5272 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-08-30 19:49:54 +02:00 · 2005-10-19 18:00:10 +00:00
parent 719763dec2
commit b873b37607
26 changed files with 1204 additions and 724 deletions
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -37,32 +37,31 @@ if (!$forum_id)
 }

 // Grab appropriate forum data
-if (!$user->data['is_registered'])
+if ($config['load_db_lastread'] && $user->data['is_registered'])
 {
-	$sql = 'SELECT *
-		FROM ' . FORUMS_TABLE . '
-		WHERE forum_id = ' . $forum_id;
+	$sql_lastread = 'LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . '
+		AND ft.forum_id = f.forum_id)';
+	$lastread_select = ', ft.mark_time';
 }
 else
 {
-	if ($config['load_db_lastread'])
-	{
-		$sql_lastread = 'LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . '
-			AND ft.forum_id = f.forum_id)';
-		$lastread_select = ', ft.mark_time ';
-	}
-	else
-	{
-		$sql_lastread = $lastread_select = '';
-		$tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_track'])) : array();
-	}
-
-	$sql_from = ($sql_lastread) ? '((' . FORUMS_TABLE . ' f LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'] . ")) $sql_lastread)" : '(' . FORUMS_TABLE . ' f LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'] . '))';
-
-	$sql = "SELECT f.*, fw.notify_status $lastread_select
-		FROM $sql_from
-		WHERE f.forum_id = $forum_id";
+	$sql_lastread = $lastread_select = '';
+	$tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_track'])) : array();
 }
+
+if ($user->data['is_registered'])
+{
+	$sql_from = ($sql_lastread) ? '((' . FORUMS_TABLE . ' f LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'] . ")) $sql_lastread)" : '(' . FORUMS_TABLE . ' f LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'] . '))';
+	$lastread_select .= ', fw.notify_status';
+}
+else
+{
+	$sql_from = FORUMS_TABLE . ' f';
+}
+
+$sql = "SELECT f.* $lastread_select
+	FROM $sql_from
+	WHERE f.forum_id = $forum_id";
 $result = $db->sql_query($sql);

 if (!($forum_data = $db->sql_fetchrow($result)))
@@ -71,11 +70,6 @@ if (!($forum_data = $db->sql_fetchrow($result)))
 }
 $db->sql_freeresult($result);

-if (!$user->data['is_registered'] && $config['load_db_lastread'])
-{
-	$forum_data['mark_time'] = 0;
-}
-
 // Is this forum a link? ... User got here either because the
 // number of clicks is being tracked or they guessed the id
 if ($forum_data['forum_link'])
@@ -130,13 +124,13 @@ $active_forum_ary = $moderators = array();

 if ($forum_data['left_id'] != $forum_data['right_id'] - 1)
 {
-	$active_forum_ary = display_forums($forum_data);
+	list($active_forum_ary, $moderators) = display_forums($forum_data, $config['load_moderators'], $config['load_moderators']);
 }
 else
 {
 	$template->assign_var('S_HAS_SUBFORUM', false);
+	get_moderators($moderators, $forum_id);
 }
-get_moderators($moderators, $forum_id);

 // Output forum listing if it is postable
 if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16))
@@ -144,10 +138,7 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
 	// Handle marking posts
 	if ($mark_read == 'topics')
 	{
-		if ($user->data['is_registered'])
-		{
-			markread('mark', $forum_id);
-		}
+		markread('topics', $forum_id);

 		meta_refresh(3, "viewforum.$phpEx$SID&amp;f=$forum_id");

@@ -164,16 +155,7 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
 	// Do the forum Prune thang - cron type job ...
 	if ($forum_data['prune_next'] < time() && $forum_data['enable_prune'])
 	{
-		include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
-
-		if ($forum_data['prune_days'])
-		{
-			auto_prune($forum_id, 'posted', $forum_data['forum_flags'], $forum_data['prune_days'], $forum_data['prune_freq']);
-		}
-		if ($forum_data['prune_viewed'])
-		{
-			auto_prune($forum_id, 'viewed', $forum_data['forum_flags'], $forum_data['prune_viewed'], $forum_data['prune_freq']);
-		}
+		$template->assign_var('RUN_CRON_TASK', '<img src="' . $phpbb_root_path . 'cron.' . $phpEx . '?cron_type=prune_forum&amp;f=' . $forum_id . '" width="1" height="1" />');
 	}

 	// Forum rules amd subscription info
@@ -207,7 +189,7 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
 		$sql = 'SELECT COUNT(topic_id) AS num_topics
 			FROM ' . TOPICS_TABLE . "
 			WHERE forum_id = $forum_id
-				AND topic_type <> " . POST_ANNOUNCE . "
+				AND topic_type NOT IN (" . POST_ANNOUNCE . ', ' . POST_GLOBAL . ")
 				AND topic_last_post_time >= $min_post_time
 			" . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND topic_approved = 1');
 		$result = $db->sql_query($sql);
@@ -237,12 +219,14 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
 	$post_alt = ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['FORUM_LOCKED'] : $user->lang['POST_NEW_TOPIC'];

 	$template->assign_vars(array(
-		'PAGINATION'	=> generate_pagination("viewforum.$phpEx$SID&amp;f=$forum_id&amp;$u_sort_param", $topics_count, $config['topics_per_page'], $start),
+		'PAGINATION'	=> generate_pagination("{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=$forum_id&amp;$u_sort_param", $topics_count, $config['topics_per_page'], $start),
 		'PAGE_NUMBER'	=> on_page($topics_count, $config['topics_per_page'], $start),
 		'TOTAL_TOPICS'	=> ($forum_data['forum_flags'] & 16) ? false : (($topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $topics_count)),
 		'MODERATORS'	=> (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '',

 		'POST_IMG' 				=> ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->img('btn_locked', $post_alt) : $user->img('btn_post', $post_alt),
+		'NEWEST_POST_IMG'		=> $user->img('icon_post_newest', 'VIEW_NEWEST_POST'),
+		'LAST_POST_IMG' 		=> $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
 		'FOLDER_IMG' 			=> $user->img('folder', 'NO_NEW_POSTS'),
 		'FOLDER_NEW_IMG' 		=> $user->img('folder_new', 'NEW_POSTS'),
 		'FOLDER_HOT_IMG' 		=> $user->img('folder_hot', 'NO_NEW_POSTS_HOT'),
@@ -263,21 +247,21 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
 		'L_NO_TOPICS' 			=> ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['POST_FORUM_LOCKED'] : $user->lang['NO_TOPICS'],

 		'S_IS_POSTABLE'			=> ($forum_data['forum_type'] == FORUM_POST) ? true : false,
-		'S_DISPLAY_ACTIVE'		=> ($forum_data['forum_type'] == FORUM_CAT && $forum_data['forum_flags'] & 16) ? true : false,
+		'S_DISPLAY_ACTIVE'		=> ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & 16)) ? true : false,
 		'S_SELECT_SORT_DIR'		=> $s_sort_dir,
 		'S_SELECT_SORT_KEY'		=> $s_sort_key,
 		'S_SELECT_SORT_DAYS'	=> $s_limit_days,
-		'S_TOPIC_ICONS'			=> ($forum_data['forum_type'] == FORUM_CAT && $forum_data['forum_flags'] & 16) ? max($active_forum_ary['enable_icons']) : (($forum_data['enable_icons']) ? true : false),
+		'S_TOPIC_ICONS'			=> ($forum_data['forum_type'] == FORUM_CAT && sizeof($active_forum_ary) && ($forum_data['forum_flags'] & 16)) ? max($active_forum_ary['enable_icons']) : (($forum_data['enable_icons']) ? true : false),
 		'S_WATCH_FORUM_LINK'	=> $s_watching_forum['link'],
 		'S_WATCH_FORUM_TITLE'	=> $s_watching_forum['title'],
-		'S_FORUM_ACTION' 		=> "viewforum.$phpEx$SID&amp;f=$forum_id&amp;start=$start",
+		'S_FORUM_ACTION' 		=> "{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=$forum_id&amp;start=$start",
 		'S_DISPLAY_SEARCHBOX'	=> ($auth->acl_get('f_search', $forum_id)) ? true : false,
-		'S_SEARCHBOX_ACTION'	=> "search.$phpEx$SID&amp;search_forum[]=$forum_id",
+		'S_SEARCHBOX_ACTION'	=> "{$phpbb_root_path}search.$phpEx$SID&amp;search_forum[]=$forum_id",

-		'U_MCP' 			=> ($auth->acl_gets('m_', $forum_id)) ? "mcp.$phpEx?sid=$user->session_id&amp;f=$forum_id&amp;mode=forum_view" : '',
-		'U_POST_NEW_TOPIC'	=> "posting.$phpEx$SID&amp;mode=post&amp;f=$forum_id",
-		'U_VIEW_FORUM'		=> "viewforum.$phpEx$SID&amp;f=$forum_id&amp;$u_sort_param&amp;start=$start",
-		'U_MARK_TOPICS' 	=> "viewforum.$phpEx$SID&amp;f=$forum_id&amp;mark=topics")
+		'U_MCP' 			=> ($auth->acl_gets('m_', $forum_id)) ? "{$phpbb_root_path}mcp.$phpEx?sid=$user->session_id&amp;f=$forum_id&amp;mode=forum_view" : '',
+		'U_POST_NEW_TOPIC'	=> "{$phpbb_root_path}posting.$phpEx$SID&amp;mode=post&amp;f=$forum_id",
+		'U_VIEW_FORUM'		=> "{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=$forum_id&amp;$u_sort_param&amp;start=$start",
+		'U_MARK_TOPICS' 	=> "{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=$forum_id&amp;mark=topics")
 	);

 	// Grab icons
@@ -285,11 +269,28 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
 	$cache->obtain_icons($icons);

 	// Grab all topic data
-	$rowset = $announcement_list = $topic_list = array();
+	$rowset = $announcement_list = $topic_list = $global_announce_list = array();

-	$sql_from = (($config['load_db_lastread'] || $config['load_db_track']) && $user->data['is_registered']) ? '(' . TOPICS_TABLE . ' t LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . '))' : TOPICS_TABLE . ' t ';
+	$sql_from = TOPICS_TABLE . ' t ';
 	$sql_approved = ($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1';
-	$sql_select = (($config['load_db_lastread'] || $config['load_db_track']) && $user->data['is_registered']) ? ', tt.mark_type, tt.mark_time' : '';
+	$sql_select = '';
+
+	if ($user->data['is_registered'])
+	{
+		if ($config['load_db_track'])
+		{
+			$sql_from .= ' LEFT JOIN ' . TOPICS_POSTED_TABLE . ' tp ON (tp.user_id = ' . $user->data['user_id'] . ' 
+				AND t.topic_id = tp.topic_id)';
+			$sql_select .= ', tp.topic_posted';
+		}
+
+		if ($config['load_db_lastread'])
+		{
+			$sql_from .= ' LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.user_id = ' . $user->data['user_id'] . '
+				AND t.topic_id = tt.topic_id)';
+			$sql_select .= ', tt.mark_time';
+		}
+	}

 	if ($forum_data['forum_type'] == FORUM_POST)
 	{
@@ -305,6 +306,11 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
 		{
 			$rowset[$row['topic_id']] = $row;
 			$announcement_list[] = $row['topic_id'];
+
+			if ($row['topic_type'] == POST_GLOBAL)
+			{
+				$global_announce_list[$row['topic_id']] = true;
+			}
 		}
 		$db->sql_freeresult($result);
 	}
@@ -352,37 +358,34 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
 	$db->sql_freeresult($result);

 	$topic_list = ($store_reverse) ? array_merge($announcement_list, array_reverse($topic_list)) : array_merge($announcement_list, $topic_list);
+	$topic_tracking_info = $tracking_topics = array();

 	// Okay, lets dump out the page ...
 	if (sizeof($topic_list))
 	{
-		if ($config['load_db_lastread'])
+		$mark_forum_read = true;
+
+		if ($config['load_db_lastread'] && $user->data['is_registered'])
 		{
-			$mark_time_forum = $forum_data['mark_time'];
+			$topic_tracking_info = get_topic_tracking($forum_id, $topic_list, $rowset, array($forum_id => $forum_data['mark_time']), $global_announce_list);
+			$mark_time_forum = (!empty($forum_data['mark_time'])) ? $forum_data['mark_time'] : $user->data['user_lastmark'];
 		}
 		else
 		{
-			$mark_time_forum = (isset($tracking_topics[$forum_id][0])) ? base_convert($tracking_topics[$forum_id][0], 36, 10) + $config['board_startdate'] : 0;
-		}
+			$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_list, $global_announce_list);

-		$mark_forum_read = true;
+			if (!$user->data['is_registered'])
+			{
+				$user->data['user_lastmark'] = (isset($tracking_topics['l'])) ? base_convert($tracking_topics['l'], 36, 10) + $config['board_startdate'] : 0;
+			}
+			$mark_time_forum = (isset($tracking_topics['f'][$forum_id])) ? base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate'] : $user->data['user_lastmark'];
+		}

 		$s_type_switch = 0;
 		foreach ($topic_list as $topic_id)
 		{
 			$row = &$rowset[$topic_id];

-			if ($config['load_db_lastread'])
-			{
-				$mark_time_topic = ($user->data['is_registered']) ? $row['mark_time'] : 0;
-			}
-			else
-			{
-				$topic_id36 = base_convert($topic_id, 10, 36);
-				$forum_id36 = ($row['topic_type'] == POST_GLOBAL) ? 0 : $forum_id;
-				$mark_time_topic = (isset($tracking_topics[$forum_id36][$topic_id36])) ? base_convert($tracking_topics[$forum_id36][$topic_id36], 36, 10) + $config['board_startdate'] : 0;
-			}
-
 			// This will allow the style designer to output a different header
 			// or even seperate the list of announcements from sticky and normal
 			// topics
@@ -396,14 +399,14 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
 				$topic_id = $row['topic_moved_id'];
 			}

+			$unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
+
 			// Get folder img, topic status/type related informations
 			$folder_img = $folder_alt = $topic_type = '';
-			$unread_topic = topic_status($row, $replies, $mark_time_topic, $mark_time_forum, $folder_img, $folder_alt, $topic_type);
-			
-			$newest_post_img = ($unread_topic) ? "<a href=\"viewtopic.$phpEx$SID&amp;f=$forum_id&amp;t=$topic_id&amp;view=unread#unread\">" . $user->img('icon_post_newest', 'VIEW_NEWEST_POST') . '</a> ' : '';
+			topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type);

 			// Generate all the URIs ...
-			$view_topic_url = "viewtopic.$phpEx$SID&amp;f=" . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . "&amp;t=$topic_id";
+			$view_topic_url = "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f=" . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . "&amp;t=$topic_id";

 			// Send vars to template
 			$template->assign_block_vars('topicrow', array(
@@ -414,40 +417,39 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
 				'LAST_POST_TIME'	=> $user->format_date($row['topic_last_post_time']),
 				'LAST_VIEW_TIME'	=> $user->format_date($row['topic_last_view_time']),
 				'LAST_POST_AUTHOR' 	=> ($row['topic_last_poster_name'] != '') ? $row['topic_last_poster_name'] : $user->lang['GUEST'],
-				'PAGINATION' 		=> topic_generate_pagination($replies, "viewtopic.$phpEx$SID&amp;f=" . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . "&amp;t=$topic_id"),
+				'PAGINATION' 		=> topic_generate_pagination($replies, $view_topic_url),
 				'REPLIES' 			=> $replies,
 				'VIEWS' 			=> $row['topic_views'],
 				'TOPIC_TITLE' 		=> censor_text($row['topic_title']),
 				'TOPIC_TYPE' 		=> $topic_type,

-				'LAST_POST_IMG' 	=> $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
-				'NEWEST_POST_IMG' 	=> $newest_post_img,
-				'TOPIC_FOLDER_IMG' 	=> $user->img($folder_img, $folder_alt),
+				'TOPIC_FOLDER_IMG'		=> $user->img($folder_img, $folder_alt),
 				'TOPIC_FOLDER_IMG_SRC' 	=> $user->img($folder_img, $folder_alt, false, '', 'src'),
-				'TOPIC_ICON_IMG'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
+				'TOPIC_ICON_IMG'		=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
 				'TOPIC_ICON_IMG_WIDTH'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '',
 				'TOPIC_ICON_IMG_HEIGHT'	=> (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '',
-				'ATTACH_ICON_IMG'	=> ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
+				'ATTACH_ICON_IMG'		=> ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',

 				'S_TOPIC_TYPE'			=> $row['topic_type'],
-				'S_USER_POSTED'			=> (!empty($row['mark_type'])) ? true : false,
+				'S_USER_POSTED'			=> (isset($row['topic_posted']) && $row['topic_posted']) ? true : false,
 				'S_UNREAD_TOPIC'		=> $unread_topic,

 				'S_TOPIC_REPORTED'		=> (!empty($row['topic_reported']) && $auth->acl_gets('m_', $forum_id)) ? true : false,
 				'S_TOPIC_UNAPPROVED'	=> (!$row['topic_approved'] && $auth->acl_gets('m_approve', $forum_id)) ? true : false,

+				'U_NEWEST_POST'		=> $view_topic_url . '&amp;view=unread#unread',
 				'U_LAST_POST'		=> $view_topic_url . '&amp;p=' . $row['topic_last_post_id'] . '#' . $row['topic_last_post_id'],
-				'U_LAST_POST_AUTHOR'=> ($row['topic_last_poster_id'] != ANONYMOUS && $row['topic_last_poster_id']) ? "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u={$row['topic_last_poster_id']}" : '',
+				'U_LAST_POST_AUTHOR'=> ($row['topic_last_poster_id'] != ANONYMOUS && $row['topic_last_poster_id']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u={$row['topic_last_poster_id']}" : '',
 				'U_VIEW_TOPIC'		=> $view_topic_url,
-				'U_MCP_REPORT'		=> "mcp.$phpEx?sid={$user->session_id}&amp;mode=reports&amp;t=$topic_id",
-				'U_MCP_QUEUE'		=> "mcp.$phpEx?sid={$user->session_id}&amp;i=queue&amp;mode=approve_details&amp;t=$topic_id",
+				'U_MCP_REPORT'		=> "{$phpbb_root_path}mcp.$phpEx?sid={$user->session_id}&amp;mode=reports&amp;t=$topic_id",
+				'U_MCP_QUEUE'		=> "{$phpbb_root_path}mcp.$phpEx?sid={$user->session_id}&amp;i=queue&amp;mode=approve_details&amp;t=$topic_id",

 				'S_TOPIC_TYPE_SWITCH'	=> ($s_type_switch == $s_type_switch_test) ? -1 : $s_type_switch_test)
 			);

 			$s_type_switch = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0;

-			if ($mark_time_topic < $row['topic_last_post_time'] && $mark_time_forum < $row['topic_last_post_time'])
+			if ($unread_topic)
 			{
 				$mark_forum_read = false;
 			}
@@ -460,13 +462,68 @@ if ($forum_data['forum_type'] == FORUM_POST || ($forum_data['forum_flags'] & 16)
 	// on all topics (as we do in 2.0.x). It looks for unread or new topics, if it doesn't find
 	// any it updates the forum last read cookie. This requires that the user visit the forum
 	// after reading a topic
-	if ($forum_data['forum_type'] == FORUM_POST && $user->data['is_registered'] && sizeof($topic_list) && $mark_forum_read)
+	if ($forum_data['forum_type'] == FORUM_POST && sizeof($topic_list) && $mark_forum_read)
 	{
-		markread('mark', $forum_id);
+		// Make sure there are not additional topics unread
+		if ($config['load_db_lastread'] && $user->data['is_registered'])
+		{
+			if ($mark_time_forum >= $forum_data['forum_last_post_time'])
+			{
+				$row = true;
+			}
+			else
+			{
+				$sql = 'SELECT t.forum_id FROM ' . TOPICS_TABLE . ' t
+					LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.user_id = ' . $user->data['user_id'] . ' AND tt.topic_id = t.topic_id)
+					WHERE t.forum_id = ' . $forum_id . '
+						AND t.topic_last_post_time > ' . $mark_time_forum . '
+						AND tt.topic_id IS NULL
+					GROUP BY t.forum_id';
+				$result = $db->sql_query($sql);
+				$row = $db->sql_fetchrow($result);
+				$db->sql_freeresult($result);
+			}
+		}
+		else
+		{
+			// Get information from cookie
+			$row = false;
+			
+			if (!isset($tracking_topics['tf'][$forum_id]))
+			{
+				// We do not need to mark read, this has happened before. Therefore setting this to true
+				$row = true;
+			}
+			else
+			{
+				$sql = 'SELECT topic_id FROM ' . TOPICS_TABLE . '
+					WHERE forum_id = ' . $forum_id . '
+						AND topic_last_post_time > ' . $mark_time_forum;
+				$result = $db->sql_query($sql);
+				
+				$check_forum = $tracking_topics['tf'][$forum_id];
+				$unread = false;
+				while ($row = $db->sql_fetchrow($result))
+				{
+					if (!in_array(base_convert($row['topic_id'], 10, 36), array_keys($check_forum)))
+					{
+						$unread = true;
+						break;
+					}
+				}
+				$db->sql_freeresult($result);
+
+				$row = $unread;
+			}
+		}
+
+		if (!$row)
+		{
+			markread('topics', $forum_id);
+		}
 	}
 }

-
 // Dump out the page header and load viewforum template
 page_header($user->lang['VIEW_FORUM'] . ' - ' . $forum_data['forum_name']);