Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 viewforum.php,1.120,1.121
|
From: Paul S. O. <ps...@us...> - 2002-01-27 01:56:08
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv31815
Modified Files:
viewforum.php
Log Message:
Fix unread marker after own post, change moderator listing method to that of index
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -r1.120 -r1.121
*** viewforum.php 2002/01/14 23:24:53 1.120
--- viewforum.php 2002/01/27 01:56:05 1.121
***************
*** 132,137 ****
$tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array();
! if( count($tracking_forums) == 150 && empty($tracking_forums['' . $forum_id . '']) )
{
asort($tracking_forums);
--- 132,138 ----
$tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array();
+ $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array();
! if( ( count($tracking_forums) + count($tracking_topics) ) >= 150 && empty($tracking_forums['' . $forum_id . '']) )
{
asort($tracking_forums);
***************
*** 159,167 ****
//
-
$tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : "";
$tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : "";
-
//
// Do the forum Prune
--- 160,166 ----
***************
*** 180,231 ****
//
! // Obtain list of moderators of this forum
//
! $sql = "SELECT g.group_name, g.group_id, g.group_single_user, u.user_id, u.username
! FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
! WHERE aa.forum_id = $forum_id
! AND aa.auth_mod = " . TRUE . "
! AND ug.group_id = aa.group_id
! AND g.group_id = aa.group_id
! AND u.user_id = ug.user_id";
! if( !$result_mods = $db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql);
}
! if( $total_mods = $db->sql_numrows($result_mods) )
{
! $mods_rowset = $db->sql_fetchrowset($result_mods);
!
! $forum_moderators = "";
!
! for($i = 0; $i < $total_mods; $i++)
! {
! if( $mods_rowset[$i]['group_single_user'] )
! {
! $mod_url = "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $mods_rowset[$i]['user_id'];
! $mod_name = $mods_rowset[$i]['username'];
! }
! else
! {
! $mod_url = "groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $mods_rowset[$i]['group_id'];
! $mod_name = $mods_rowset[$i]['group_name'];
! }
!
! if( !strstr($forum_moderators, $mod_name) )
! {
! if( $i > 0 )
! {
! $forum_moderators .= ", ";
! }
! $forum_moderators .= "<a href=\"" . append_sid($mod_url) . "\">$mod_name</a>";
! }
! }
}
! else
{
! $forum_moderators = $lang['None'];
}
//
--- 179,227 ----
//
! // Obtain list of moderators of each forum
! // First users, then groups ... broken into two queries
//
! $sql = "SELECT u.user_id, u.username
! FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
! WHERE aa.forum_id = $forum_id
! AND aa.auth_mod = " . TRUE . "
! AND g.group_single_user = 1
! AND ug.group_id = aa.group_id
! AND g.group_id = aa.group_id
! AND u.user_id = ug.user_id
! GROUP BY u.user_id, u.username
! ORDER BY u.user_id";
! if(!$result = $db->sql_query($sql))
{
! message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql);
}
! $moderators = array();
! while( $row = $db->sql_fetchrow($result) )
{
! $moderators[] = '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '">' . $row['username'] . '</a>';
! }
! $sql = "SELECT g.group_id, g.group_name
! FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g
! WHERE aa.forum_id = $forum_id
! AND aa.auth_mod = " . TRUE . "
! AND g.group_single_user = 0
! AND ug.group_id = aa.group_id
! AND g.group_id = aa.group_id
! GROUP BY g.group_id, g.group_name
! ORDER BY g.group_id";
! if(!$result = $db->sql_query($sql))
! {
! message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql);
}
!
! while( $row = $db->sql_fetchrow($result) )
{
! $moderators[] = '<a href="' . append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $row['group_id']) . '">' . $row['group_name'] . '</a>';
}
+
+ $forum_moderators = ( count($moderators) ) ? implode(", ", $moderators) : $lang['None'];
+ unset($moderators);
//
***************
*** 537,546 ****
if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
{
-
$unread_topics = true;
if( !empty($tracking_topics['' . $topic_id . '']) )
{
! if( $tracking_topics['' . $topic_id . ''] > $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
--- 533,541 ----
if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f_all"]) )
{
$unread_topics = true;
if( !empty($tracking_topics['' . $topic_id . '']) )
{
! if( $tracking_topics['' . $topic_id . ''] >= $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
***************
*** 550,554 ****
if( !empty($tracking_forums['' . $forum_id . '']) )
{
! if( $tracking_forums['' . $forum_id . ''] > $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
--- 545,549 ----
if( !empty($tracking_forums['' . $forum_id . '']) )
{
! if( $tracking_forums['' . $forum_id . ''] >= $topic_rowset[$i]['post_time'] )
{
$unread_topics = false;
***************
*** 558,562 ****
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;
--- 553,557 ----
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;
|
