[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.113,1.114

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv18037

Modified Files:
	viewforum.php 
Log Message:
Re-jiggle some unread/read/newest topic stuff

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -r1.113 -r1.114
*** viewforum.php	2001/12/16 13:38:10	1.113
--- viewforum.php	2001/12/16 13:47:16	1.114
***************
*** 516,570 ****
  			if( $userdata['session_logged_in'] )
  			{
! 				if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) || 
! 					isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) || 
! 					isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
  				{
  
! 					$unread_topics = true;
  
! 					if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) )
! 					{
! 						if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"] > $topic_rowset[$i]['post_time'] )
  						{
! 							$unread_topics = false;
  						}
- 					}
  
! 					if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) )
! 					{
! 						if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"] > $topic_rowset[$i]['post_time'] )
  						{
! 							$unread_topics = false;
  						}
- 					}
  
! 					if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
! 					{
! 						if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"] > $topic_rowset[$i]['post_time'] )
  						{
! 							$unread_topics = false;
  						}
- 					}
  
! 					if( $unread_topics )
! 					{
! 						$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
  
! 						$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
  					}
  					else
  					{
! 						$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
  
! 						$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />";
! 						$newest_post_img = "";
  					}
- 
- 				}
- 				else if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] ) 
- 				{
- 					$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
- 
- 					$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
  				}
  				else 
--- 516,572 ----
  			if( $userdata['session_logged_in'] )
  			{
! 				if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] ) 
  				{
+ 					if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) || 
+ 						isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) || 
+ 						isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
+ 					{
  
! 						$unread_topics = true;
  
! 						if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) )
  						{
! 							if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"] > $topic_rowset[$i]['post_time'] )
! 							{
! 								$unread_topics = false;
! 							}
  						}
  
! 						if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) )
  						{
! 							if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"] > $topic_rowset[$i]['post_time'] )
! 							{
! 								$unread_topics = false;
! 							}
  						}
  
! 						if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
  						{
! 							if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"] > $topic_rowset[$i]['post_time'] )
! 							{
! 								$unread_topics = false;
! 							}
  						}
  
! 						if( $unread_topics )
! 						{
! 							$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
  
! 							$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
! 						}
! 						else
! 						{
! 							$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
! 
! 							$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />";
! 							$newest_post_img = "";
! 						}
  					}
  					else
  					{
! 						$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" title=\"" . $lang['New_posts'] . "\" />";
  
! 						$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_post'] . "\" title=\"" . $lang['View_newest_post'] . "\" border=\"0\" /></a> ";
  					}
  				}
  				else