From 2297465c60d778ba4e4026ba8771972aa149e1d7 Mon Sep 17 00:00:00 2001
From: James Atkinson <thefinn@users.sourceforge.net>
Date: Sat, 3 Nov 2001 01:12:54 +0000
Subject: [PATCH] Some updates to modcp to show the topic type and correct
 folder icons

git-svn-id: file:///svn/phpbb/trunk@1259 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/modcp.php                          | 34 ++++++++++++++++--------
 phpBB/templates/subSilver/modcp_body.tpl |  2 +-
 phpBB/viewforum.php                      |  3 ++-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/phpBB/modcp.php b/phpBB/modcp.php
index 5e113f93ca..69051bb411 100644
--- a/phpBB/modcp.php
+++ b/phpBB/modcp.php
@@ -995,7 +995,7 @@ switch($mode)
 			WHERE t.forum_id = $forum_id
 				AND t.topic_poster = u.user_id
 				AND p.post_id = t.topic_last_post_id
-				AND t.topic_type <> " . TOPIC_MOVED . "
+				AND t.topic_status <> " . TOPIC_MOVED . "
 			ORDER BY t.topic_type DESC, p.post_time DESC
 			LIMIT $start, " . $board_config['topics_per_page'];
 
@@ -1029,29 +1029,41 @@ switch($mode)
 			}
 			else
 			{
-				$folder_image = "<img src=\"" . $images['folder'] . "\">";
+				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'];
-
-			if( $topic_rowset[$i]['topic_type'] == POST_STICKY )
-			{
-				$topic_type = $lang['Topic_Sticky'] . " ";
-			}
-			else if( $topic_rowset[$i]['topic_type'] == POST_ANNOUNCE )
+			$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 = "";
+				$topic_type = "";		
 			}
-
+	
 			if( $topic_rowset[$i]['topic_vote'] )
 			{
 				$topic_type .= $lang['Topic_Poll'] . " ";
 			}
-
+	
 			$topic_title = $topic_rowset[$i]['topic_title'];
 			if( count($orig_word) )
 			{
diff --git a/phpBB/templates/subSilver/modcp_body.tpl b/phpBB/templates/subSilver/modcp_body.tpl
index 372d746152..5087fa980b 100644
--- a/phpBB/templates/subSilver/modcp_body.tpl
+++ b/phpBB/templates/subSilver/modcp_body.tpl
@@ -23,7 +23,7 @@
 	<!-- BEGIN topicrow -->
 	<tr> 
 	  <td class="row1" align="center" valign="middle">{topicrow.FOLDER_IMG}</td>
-	  <td class="row1">&nbsp;<span class="topictitle"><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a></span></td>
+	  <td class="row1">&nbsp;<span class="topictitle">{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a></span></td>
 	  <td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td>
 	  <td class="row1" align="center" valign="middle"><span class="postdetails">{topicrow.LAST_POST}</span></td>
 	  <td class="row2" align="center" valign="middle"> 
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index e119af7dcf..592143bdb2 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -431,7 +431,8 @@ if($total_topics)
 		}
 		else
 		{
-			$topic_type = "";		}
+			$topic_type = "";		
+		}
 
 		if( $topic_rowset[$i]['topic_vote'] )
 		{