aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-12-14 02:41:33 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-12-14 02:41:33 +0000
commit880013144e2c80490f9b71457a3f0104c2b3a6d2 (patch)
treef396e2bf37edb717ffb87de59f3df4c440bc94b6 /phpBB/viewforum.php
parentbef3314e50e1f38fe53cbaaf47dd09fc46d42f49 (diff)
downloadforums-880013144e2c80490f9b71457a3f0104c2b3a6d2.tar
forums-880013144e2c80490f9b71457a3f0104c2b3a6d2.tar.gz
forums-880013144e2c80490f9b71457a3f0104c2b3a6d2.tar.bz2
forums-880013144e2c80490f9b71457a3f0104c2b3a6d2.tar.xz
forums-880013144e2c80490f9b71457a3f0104c2b3a6d2.zip
Remove guest user topic tracking via cookies, update viewtopic to re-fix highlighting of search terms, add lang capability to images, various other issues, removed remote avatar size reduction
git-svn-id: file:///svn/phpbb/trunk@1566 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php118
1 files changed, 70 insertions, 48 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index b295bd6f8d..b7ed1079fd 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -112,28 +112,30 @@ if( !$is_auth['auth_read'] || !$is_auth['auth_view'] )
//
if( $mark_read == "topics" )
{
- $sql = "SELECT MAX(post_time) AS last_post
- FROM " . POSTS_TABLE . "
- WHERE forum_id = $forum_id";
- if( !$result = $db->sql_query($sql) )
- {
- message_die(GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql);
- }
-
- if( $db->sql_numrows($result) )
+ if( $userdata['session_logged_in'] )
{
- $row = $db->sql_fetchrow($result);
+ $sql = "SELECT MAX(post_time) AS last_post
+ FROM " . POSTS_TABLE . "
+ WHERE forum_id = $forum_id";
+ if( !$result = $db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql);
+ }
- if( $row['last_post'] > $userdata['session_last_visit'] )
+ if( $db->sql_numrows($result) )
{
- setcookie($board_config['cookie_name'] . "_f_$forum_id", time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
-// session_send_cookie("_f_$forum_id", time(), 0);
+ $row = $db->sql_fetchrow($result);
+
+ if( $row['last_post'] > $userdata['user_lastvisit'] )
+ {
+ setcookie($board_config['cookie_name'] . "_f_$forum_id", time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
+ }
}
- }
- $template->assign_vars(array(
- "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
- );
+ $template->assign_vars(array(
+ "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
+ );
+ }
$message = $lang['Topics_marked_read'] . "<br /><br />" . sprintf($lang['Click_return_forum'], "<a href=\"" . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">", "</a> ");
message_die(GENERAL_MESSAGE, $message);
@@ -358,6 +360,17 @@ $template->assign_vars(array(
"MODERATORS" => $forum_moderators,
"IMG_POST" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'],
+ "FOLDER_IMG" => $images['folder'],
+ "FOLDER_NEW_IMG" => $images['folder_new'],
+ "FOLDER_HOT_IMG" => $images['folder_hot'],
+ "FOLDER_HOT_NEW_IMG" => $images['folder_hot_new'],
+ "FOLDER_LOCKED_IMG" => $images['folder_locked'],
+ "FOLDER_LOCKED_NEW_IMG" => $images['folder_locked_new'],
+ "FOLDER_STICKY_IMG" => $images['folder_sticky'],
+ "FOLDER_STICKY_NEW_IMG" => $images['folder_sticky_new'],
+ "FOLDER_ANNOUNCE_IMG" => $images['folder_announce'],
+ "FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'],
+
"L_MARK_TOPICS_READ" => $lang['Mark_all_topics'],
"L_POST_NEW_TOPIC" => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'],
@@ -499,59 +512,68 @@ if( $total_topics )
}
}
- 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"]) )
+ 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;
+ $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'] )
+ if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t_$topic_id"]) )
{
- $unread_topics = false;
+ 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'] )
+ if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_$forum_id"]) )
{
- $unread_topics = false;
+ 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'] )
+ if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
{
- $unread_topics = false;
+ if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"] > $topic_rowset[$i]['post_time'] )
+ {
+ $unread_topics = false;
+ }
}
- }
- if( $unread_topics )
+ 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['session_last_visit'] )
{
$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
+ 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['session_last_visit'] )
- {
- $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
+ 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\" />";
@@ -643,4 +665,4 @@ $template->pparse("body");
//
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
-?>
+?> \ No newline at end of file
generated by cgit v1.2.1 (git 2.21.0) at 2025-01-31 09:59:14 +0000