|
From: James A. <th...@us...> - 2001-11-03 01:12:56
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv28883
Modified Files:
modcp.php viewforum.php
Log Message:
Some updates to modcp to show the topic type and correct folder icons
Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** modcp.php 2001/10/14 18:22:32 1.42
--- modcp.php 2001/11/03 01:12:53 1.43
***************
*** 996,1000 ****
AND t.topic_poster = u.user_id
AND p.post_id = t.topic_last_post_id
! AND t.topic_type <> " . TOPIC_MOVED . "
ORDER BY t.topic_type DESC, p.post_time DESC
LIMIT $start, " . $board_config['topics_per_page'];
--- 996,1000 ----
AND t.topic_poster = u.user_id
AND p.post_id = t.topic_last_post_id
! AND t.topic_status <> " . TOPIC_MOVED . "
ORDER BY t.topic_type DESC, p.post_time DESC
LIMIT $start, " . $board_config['topics_per_page'];
***************
*** 1030,1056 ****
else
{
! $folder_image = "<img src=\"" . $images['folder'] . "\">";
}
$topic_id = $topic_rowset[$i]['topic_id'];
!
! if( $topic_rowset[$i]['topic_type'] == POST_STICKY )
{
! $topic_type = $lang['Topic_Sticky'] . " ";
}
! else if( $topic_rowset[$i]['topic_type'] == POST_ANNOUNCE )
{
! $topic_type = $lang['Topic_Announcement'] . " ";
}
else
{
! $topic_type = "";
}
!
if( $topic_rowset[$i]['topic_vote'] )
{
$topic_type .= $lang['Topic_Poll'] . " ";
}
!
$topic_title = $topic_rowset[$i]['topic_title'];
if( count($orig_word) )
--- 1030,1068 ----
else
{
! if( $topic_rowset[$i]['topic_type'] == POST_ANNOUNCE )
! {
! $folder_image = "<img src=\"" . $images['folder_announce'] . "\">";
! }
! else if( $topic_rowset[$i]['topic_type'] == POST_STICKY )
! {
! $folder_image = "<img src=\"" . $images['folder_sticky'] . "\">";
! }
! else
! {
! $folder_image = "<img src=\"" . $images['folder'] . "\">";
! }
}
$topic_id = $topic_rowset[$i]['topic_id'];
! $topic_type = $topic_rowset[$i]['topic_type'];
!
! if($topic_type == POST_ANNOUNCE)
{
! $topic_type = $lang['Topic_Announcement'] . " ";
}
! else if($topic_type == POST_STICKY)
{
! $topic_type = $lang['Topic_Sticky'] . " ";
}
else
{
! $topic_type = "";
}
!
if( $topic_rowset[$i]['topic_vote'] )
{
$topic_type .= $lang['Topic_Poll'] . " ";
}
!
$topic_title = $topic_rowset[$i]['topic_title'];
if( count($orig_word) )
Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** viewforum.php 2001/10/25 23:21:11 1.95
--- viewforum.php 2001/11/03 01:12:54 1.96
***************
*** 432,436 ****
else
{
! $topic_type = ""; }
if( $topic_rowset[$i]['topic_vote'] )
--- 432,437 ----
else
{
! $topic_type = "";
! }
if( $topic_rowset[$i]['topic_vote'] )
|