makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

oops, I completely forget that viewforum uses the new topics_marking table ... guess I need to commit all related changes after all ... pooh

Browse source 
git-svn-id: file:///svn/phpbb/trunk@3925 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-04-22 17:26:29 +00:00
parent 254e82dee5
commit 5085f051bf
2 changed files with 113 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
phpBB/includes/functions.php
View file

@ -518,7 +518,7 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $mat
return; return;
} }
// Marks a topic or form as read in the 'lastread' table. // Marks a topic or form as read
function markread($mode, $forum_id = 0, $topic_id = 0, $post_id = 0) function markread($mode, $forum_id = 0, $topic_id = 0, $post_id = 0)
{ {
global $config, $db, $user; global $config, $db, $user;
@ -534,7 +534,7 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $post_id = 0)
// Mark one forum as read. // Mark one forum as read.
// Do this by inserting a record with -$forum_id in the 'forum_id' field. // Do this by inserting a record with -$forum_id in the 'forum_id' field.
$sql = "SELECT forum_id $sql = "SELECT forum_id
FROM " . LASTREAD_TABLE . " FROM " . TOPICS_TRACK_TABLE . "
WHERE user_id = " . $user->data['user_id'] . " WHERE user_id = " . $user->data['user_id'] . "
AND forum_id = -$forum_id"; AND forum_id = -$forum_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -542,8 +542,8 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $post_id = 0)
if ($db->sql_fetchrow($result)) if ($db->sql_fetchrow($result))
{ {
// User has marked this topic as read before: Update the record // User has marked this topic as read before: Update the record
$sql = "UPDATE " . LASTREAD_TABLE . " $sql = "UPDATE " . TOPICS_TRACK_TABLE . "
SET lastread_time = " . time() . " SET mark_time = " . time() . "
WHERE user_id = " . $user->data['user_id'] . " WHERE user_id = " . $user->data['user_id'] . "
AND forum_id = -$forum_id"; AND forum_id = -$forum_id";
$db->sql_query($sql); $db->sql_query($sql);
@ -553,8 +553,8 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $post_id = 0)
// User is marking this forum for the first time. // User is marking this forum for the first time.
// Insert dummy topic_id to satisfy PRIMARY KEY (user_id, topic_id) // Insert dummy topic_id to satisfy PRIMARY KEY (user_id, topic_id)
// dummy id = -forum_id // dummy id = -forum_id
$sql = "INSERT INTO " . LASTREAD_TABLE . " $sql = "INSERT INTO " . TOPICS_TRACK_TABLE . "
(user_id, forum_id, topic_id, lastread_time) (user_id, forum_id, topic_id, mark_time)
VALUES VALUES
(" . $user->data['user_id'] . ", -$forum_id, -$forum_id, " . time() . ")"; (" . $user->data['user_id'] . ", -$forum_id, -$forum_id, " . time() . ")";
$db->sql_query($sql); $db->sql_query($sql);
@ -566,7 +566,7 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $post_id = 0)
// Select all forum_id's that are not yet in the lastread table // Select all forum_id's that are not yet in the lastread table
$sql = "SELECT f.forum_id $sql = "SELECT f.forum_id
FROM " . FORUMS_TABLE . " f FROM " . FORUMS_TABLE . " f
LEFT JOIN (" . LASTREAD_TABLE . " lr ON ( LEFT JOIN (" . TOPICS_TRACK_TABLE . " lr ON (
lr.user_id = " . $user->data['user_id'] . " lr.user_id = " . $user->data['user_id'] . "
AND f.forum_id = -lr.forum_id)) AND f.forum_id = -lr.forum_id))
WHERE lr.forum_id IS NULL"; WHERE lr.forum_id IS NULL";
@ -576,9 +576,9 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $post_id = 0)
{ {
// Some forum_id's are missing. We are not taking into account // Some forum_id's are missing. We are not taking into account
// the auth data, even forums the user can't see are marked as read. // the auth data, even forums the user can't see are marked as read.
$sql = "INSERT INTO " . LASTREAD_TABLE . " $sql = "INSERT INTO " . TOPICS_TRACK_TABLE . "
(user_id, forum_id, topic_id, lastread_time) (user_id, forum_id, topic_id, lastread_time)
VALUES\n"; VALUES";
$forum_insert = array(); $forum_insert = array();
do do
@ -596,8 +596,8 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $post_id = 0)
} }
// Mark all forums as read // Mark all forums as read
$sql = "UPDATE " . LASTREAD_TABLE . " $sql = "UPDATE " . TOPICS_TRACK_TABLE . "
SET lastread_time = " . time() . " SET mark_time = " . time() . "
WHERE user_id = " . $user->data['user_id'] . " WHERE user_id = " . $user->data['user_id'] . "
AND forum_id < 0"; AND forum_id < 0";
$db->sql_query($sql); $db->sql_query($sql);
@ -613,9 +613,9 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $post_id = 0)
// Type: // Type:
// 0 = Normal topic // 0 = Normal topic
// 1 = user made a post in this topic // 1 = user made a post in this topic
$type_update = (isset($type) && $type = 1) ? 'lastread_type = 1,' : ''; $type_update = (isset($type) && $type = 1) ? 'mark_type = 1,' : '';
$sql = "UPDATE " . LASTREAD_TABLE . " $sql = "UPDATE " . TOPICS_TRACK_TABLE . "
SET $type_update forum_id = $forum_id, lastread_time = " . time() . " SET $type_update forum_id = $forum_id, mark_time = " . time() . "
WHERE topic_id = $topic_id WHERE topic_id = $topic_id
AND user_id = " . $user->data['user_id']; AND user_id = " . $user->data['user_id'];
$db->sql_query($sql); $db->sql_query($sql);
@ -625,7 +625,7 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $post_id = 0)
// Couldn't update. Row probably doesn't exist. Insert one. // Couldn't update. Row probably doesn't exist. Insert one.
if(isset($type) && $type = 1) if(isset($type) && $type = 1)
{ {
$type_name = 'lastread_type, '; $type_name = 'mark_type, ';
$type_value = '1, '; $type_value = '1, ';
} }
else else
@ -634,8 +634,8 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $post_id = 0)
$type_value = ''; $type_value = '';
} }
$sql = "INSERT INTO " . LASTREAD_TABLE . " $sql = "INSERT INTO " . TOPICS_TRACK_TABLE . "
(user_id, topic_id, forum_id, $type_name lastread_time) (user_id, topic_id, forum_id, $type_name mark_time)
VALUES VALUES
(" . $user->data['user_id'] . ", $topic_id, $forum_id, $type_value " . time() . ")"; (" . $user->data['user_id'] . ", $topic_id, $forum_id, $type_value " . time() . ")";
$db->sql_query($sql); $db->sql_query($sql);

154
phpBB/includes/functions_display.php
View file

@ -28,34 +28,35 @@ function display_forums($root_data = '', $display_moderators = TRUE)
if (!$root_data) if (!$root_data)
{ {
$root_data = array('forum_id' => 0); $root_data = array('forum_id' => 0);
$where_sql = ''; $sql_where = '';
} }
else else
{ {
$where_sql = ' WHERE left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id']; $sql_where = ' WHERE left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id'];
} }
/* if ($user->data['user_id'] != ANONYMOUS) if ($config['load_db_lastread'] && $user->data['user_id'] != ANONYMOUS)
{ {
$lastread_select = ", lr.lastread_time"; $lastread_select = ", lr.lastread_time ";
$lastread_sql = " /* $sql_lastread = 'LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . '
LEFT JOIN " . LASTREAD_TABLE . " lr ON ( AND ft.forum_id = f.forum_id)';*/
lr.user_id = " . $user->data['user_id'] . " $sql_lastread = 'LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.user_id = ' . $user->data['user_id'] . '
AND (f.forum_id = lr.forum_id OR f.forum_id = -lr.forum_id) AND tt.forum_id IN (f.forum_id, -f.forum_id)
AND lr.lastread_time >= f.forum_last_post_time)"; AND tt.lastread_time >= f.forum_last_post_time)';
// Temp fix for index $sql_where .= ' GROUP BY f.forum_id';
//$where_sql .= ' GROUP BY f.forum_id';
} }
else else
{*/ {
$lastread_select = ''; $lastread_select = '';
$lastread_sql = ''; $lastread_sql = '';
// }
// Cookie based tracking
}
$sql = "SELECT f.* $lastread_select $sql = "SELECT f.* $lastread_select
FROM " . FORUMS_TABLE . " f FROM (" . FORUMS_TABLE . " f
$lastread_sql $sql_lastread)
$where_sql $sql_where
ORDER BY left_id"; ORDER BY left_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -111,9 +112,17 @@ function display_forums($root_data = '', $display_moderators = TRUE)
{ {
if ($row['display_on_index']) if ($row['display_on_index'])
{ {
// Subforum $subforums[$parent_id][$row['forum_id']]['forum_name'] = $row['forum_name'];
$subforums[$parent_id][$row['forum_id']] = $row['forum_name'];
} }
$subforums[$parent_id][$row['forum_id']]['unread_count'] = $row['unread_count'];
$subforums[$parent_id][$row['forum_id']]['forum_last_post_time'] = $row['forum_last_post_time'];
$subforums[$parent_id][$row['forum_id']]['forum_id'] = $row['forum_id'];
$subforums[$parent_id][$row['forum_id']]['forum_last_post_id'] = $row['forum_last_post_id'];
$subforums[$parent_id][$row['forum_id']]['forum_last_post_time'] = $row['forum_last_post_time'];
$subforums[$parent_id][$row['forum_id']]['forum_last_poster_name'] = $row['forum_last_poster_name'];
$subforums[$parent_id][$row['forum_id']]['forum_last_poster_id'] = $row['forum_last_poster_id'];
} }
} }
$db->sql_freeresult(); $db->sql_freeresult();
@ -145,71 +154,94 @@ function display_forums($root_data = '', $display_moderators = TRUE)
'FORUM_ID' => $hold['forum_id'], 'FORUM_ID' => $hold['forum_id'],
'FORUM_NAME' => $hold['forum_name'], 'FORUM_NAME' => $hold['forum_name'],
'FORUM_DESC' => $hold['forum_desc'], 'FORUM_DESC' => $hold['forum_desc'],
'U_VIEWFORUM' => 'viewforum.' . $phpEx . $SID . '&amp;f=' . $hold['forum_id'] 'U_VIEWFORUM' => 'viewforum.' . $phpEx . $SID . '&amp;f=' . $hold['forum_id'])
)); );
unset($hold); unset($hold);
} }
++$visible_forums; $visible_forums++;
$forum_id = $row['forum_id']; $forum_id = $row['forum_id'];
$unread_topics = ($user->data['user_id'] && $row['lastread_time'] < $row['forum_last_post_time'] ) ? TRUE : FALSE; //
$folder_image = ($unread_topics) ? 'forum_new' : 'forum'; $unread_topics = ($user->data['user_id'] != ANONYMOUS && $row['unread_count'] < $row['forum_last_post_time']) ? 1 : 0;
$folder_alt = ($unread_topics) ? 'NEW_POSTS' : 'NO_NEW_POSTS';
if ($row['left_id'] + 1 < $row['right_id']) //
if (isset($subforums[$forum_id]))
{ {
$alist = array();
foreach ($subforums[$forum_id] as $sub_forum_id => $subforum_row)
{
$unread_topics += ($user->data['user_id'] != ANONYMOUS && $subforum_row['unread_count'] < $subforum_row['forum_last_post_time']) ? 1 : 0;
if (!empty($subforum_row['forum_name']))
{
$alist[$sub_forum_id] = $subforum_row['forum_name'];
}
if ($subforum_row['forum_last_post_time'] > $row['forum_last_post_time'])
{
$row['forum_last_post_time'] = $subforum_row['forum_last_post_time'];
$row['forum_last_post_id'] = $subforum_row['forum_last_post_id'];
$row['forum_last_poster_name'] = $subforum_row['forum_last_poster_name'];
$row['forum_last_poster_id'] = $subforum_row['forum_last_poster_id'];
$row['forum_id_last_post'] = $subforum_row['forum_id'];
}
}
if (sizeof($alist))
{
@natsort($alist);
$links = array();
foreach ($alist as $subforum_id => $subforum_name)
{
$links[] = '<a href="viewforum.' . $phpEx . $SID . '&amp;f=' . $subforum_id . '">' . $subforum_name . '</a>';
}
$subforums_list = implode(', ', $links);
$l_subforums = (count($subforums[$forum_id]) == 1) ? $user->lang['SUBFORUM'] . ': ' : $user->lang['SUBFORUMS'] . ': ';
}
$folder_image = ($unread_topics) ? 'sub_forum_new' : 'sub_forum'; $folder_image = ($unread_topics) ? 'sub_forum_new' : 'sub_forum';
$folder_alt = ($unread_topics) ? 'NEW_POSTS' : 'NO_NEW_POSTS';
} }
elseif ($row['forum_status'] == ITEM_LOCKED) else
{
$folder_image = ($unread_topics) ? 'forum_new' : 'forum';
$row['forum_id_last_post'] = $row['forum_id'];
$subforums_list = '';
$l_subforums = '';
}
//
if ($row['forum_status'] == ITEM_LOCKED)
{ {
$folder_image = 'forum_locked'; $folder_image = 'forum_locked';
$folder_alt = 'FORUM_LOCKED'; $folder_alt = 'FORUM_LOCKED';
} }
else else
{ {
$folder_image = ($unread_topics) ? 'forum_new' : 'forum';
$folder_alt = ($unread_topics) ? 'NEW_POSTS' : 'NO_NEW_POSTS'; $folder_alt = ($unread_topics) ? 'NEW_POSTS' : 'NO_NEW_POSTS';
} }
//
if ($row['forum_last_post_id']) if ($row['forum_last_post_id'])
{ {
$last_post = $user->format_date($row['forum_last_post_time']) . '<br />'; $last_post_time = $user->format_date($row['forum_last_post_time']);
$last_post .= ($row['forum_last_poster_id'] == ANONYMOUS) ? (($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] . ' ' : $user->lang['GUEST'] . ' ') : "<a href=\"memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['forum_last_poster_id'] . '">' . $row['forum_last_poster_name'] . '</a> '; $last_poster = ($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] : $user->lang['GUEST'];
$last_poster_url = ($row['forum_last_poster_id'] == ANONYMOUS) ? '' : "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['forum_last_poster_id'];
$last_post .= '<a href="viewtopic.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'] . '&amp;p=' . $row['forum_last_post_id'] . '#' . $row['forum_last_post_id'] . '">' . $user->img('icon_post_latest', 'VIEW_LATEST_POST') . '</a>'; $last_post_url = "viewtopic.$phpEx$SID&amp;f=" . $row['forum_id_last_post'] . '&amp;p=' . $row['forum_last_post_id'] . '#' . $row['forum_last_post_id'];
} }
else else
{ {
$last_post = $user->lang['No_Posts']; $last_post = $user->lang['NO_POSTS'];
}
if (isset($subforums[$forum_id]))
{
$alist = array();
foreach ($subforums[$forum_id] as $sub_forum_id => $forum_name)
{
$alist[$sub_forum_id] = $forum_name;
}
natsort($alist);
$links = array();
foreach ($alist as $subforum_id => $subforum_name)
{
$links[] = '<a href="viewforum.' . $phpEx . $SID . '&amp;f=' . $subforum_id . '">' . $subforum_name . '</a>';
}
$subforums_list = implode(', ', $links);
$l_subforums = (count($subforums[$forum_id]) == 1) ? $user->lang['SUBFORUM'] . ': ' : $user->lang['SUBFORUMS'] . ': ';
}
else
{
$subforums_list = '';
$l_subforums = '';
} }
//
$l_moderator = $moderators_list = ''; $l_moderator = $moderators_list = '';
if ($display_moderators && !empty($forum_moderators[$forum_id])) if ($display_moderators && !empty($forum_moderators[$forum_id]))
{ {
@ -220,13 +252,16 @@ function display_forums($root_data = '', $display_moderators = TRUE)
$template->assign_block_vars('forumrow', array( $template->assign_block_vars('forumrow', array(
'S_IS_CAT' => FALSE, 'S_IS_CAT' => FALSE,
'FORUM_IMG' => $row['forum_image'],
'LAST_POST_IMG' => $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
'FORUM_FOLDER_IMG' => $user->img($folder_image, $folder_alt), 'FORUM_FOLDER_IMG' => $user->img($folder_image, $folder_alt),
'FORUM_NAME' => $row['forum_name'], 'FORUM_NAME' => $row['forum_name'],
'FORUM_DESC' => $row['forum_desc'], 'FORUM_DESC' => $row['forum_desc'],
'FORUM_IMG' => $row['forum_image'],
'POSTS' => $row['forum_posts'], 'POSTS' => $row['forum_posts'],
'TOPICS' => $row['forum_topics'], 'TOPICS' => $row['forum_topics'],
'LAST_POST_TIME' => $last_post_time,
'LAST_POSTER' => $last_poster,
'LAST_POST' => $last_post, 'LAST_POST' => $last_post,
'MODERATORS' => $moderators_list, 'MODERATORS' => $moderators_list,
'SUBFORUMS' => $subforums_list, 'SUBFORUMS' => $subforums_list,
@ -235,6 +270,8 @@ function display_forums($root_data = '', $display_moderators = TRUE)
'L_MODERATOR_STR' => $l_moderator, 'L_MODERATOR_STR' => $l_moderator,
'L_FORUM_FOLDER_ALT'=> $folder_alt, 'L_FORUM_FOLDER_ALT'=> $folder_alt,
'U_LAST_POSTER' => $last_poster_url,
'U_LAST_POST' => $last_post_url,
'U_VIEWFORUM' => 'viewforum.' . $phpEx . $SID . '&amp;f=' . $row['forum_id']) 'U_VIEWFORUM' => 'viewforum.' . $phpEx . $SID . '&amp;f=' . $row['forum_id'])
); );
} }
@ -244,4 +281,5 @@ function display_forums($root_data = '', $display_moderators = TRUE)
'L_SUBFORUM' => ($visible_forums == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS']) 'L_SUBFORUM' => ($visible_forums == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS'])
); );
} }
?> ?>