aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-10-01 23:22:18 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-10-01 23:22:18 +0000
commita711e6d677257b64574fb5c377dfbde7127da3c3 (patch)
tree7f0af4764382a88e96fa9fdb35794932de104e46 /phpBB/viewforum.php
parent09dc77b5813c43d5754d346b6a024d9650ae6a0b (diff)
downloadforums-a711e6d677257b64574fb5c377dfbde7127da3c3.tar
forums-a711e6d677257b64574fb5c377dfbde7127da3c3.tar.gz
forums-a711e6d677257b64574fb5c377dfbde7127da3c3.tar.bz2
forums-a711e6d677257b64574fb5c377dfbde7127da3c3.tar.xz
forums-a711e6d677257b64574fb5c377dfbde7127da3c3.zip
Changes related to private messaging + some bug fixes
git-svn-id: file:///svn/phpbb/trunk@1111 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php26
1 files changed, 15 insertions, 11 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 31a15b232c..86e131322a 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -281,7 +281,7 @@ $sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as i
AND t.topic_poster = u.user_id
AND p.post_id = t.topic_last_post_id
AND p.poster_id = u2.user_id
- AND t.topic_type <> " . POST_ANNOUNCE . "
+ AND t.topic_type <> " . POST_ANNOUNCE . "
$limit_topics_time
ORDER BY t.topic_type DESC, p.post_time DESC
LIMIT $start, ".$board_config['topics_per_page'];
@@ -522,16 +522,29 @@ if($total_topics)
if( empty($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) && $topic_rowset[$i]['post_time'] > $userdata['session_last_visit'] )
{
$folder_image = "<img src=\"$folder_new\" alt=\"" . $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_posts'] . "\" border=\"0\" /></a> ";
}
else
{
if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
{
- $folder_image = ($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $topic_rowset[$i]['post_time'] ) ? "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />" : "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />";
+ if( $HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $topic_rowset[$i]['post_time'] )
+ {
+ $folder_image = "<img src=\"$folder_new\" alt=\"" . $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_posts'] . "\" border=\"0\" /></a> ";
+ }
+ else
+ {
+ $folder_image = "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />";
+ $newest_post_img = "";
+ }
}
else
{
$folder_image = "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />";
+ $newest_post_img = "";
}
}
}
@@ -541,15 +554,6 @@ if($total_topics)
$topic_poster = $topic_rowset[$i]['username'];
$topic_poster_profile_url = append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $topic_rowset[$i]['user_id']);
- if($topic_rowset[$i]['post_time'] >= $userdata['session_last_visit'])
- {
- $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_posts'] . "\" border=\"0\" /></a> ";
- }
- else
- {
- $newest_post_img = "";
- }
-
$last_post_time = create_date($board_config['default_dateformat'], $topic_rowset[$i]['post_time'], $board_config['board_timezone']);
$last_post = $last_post_time . "<br />" . $lang['by'] . " ";