root/portal/block/announcements.php

@@ -22,7 +22,6 @@ $template->assign_vars(array(
 	'NEWEST_POST_IMG'			=> $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'),
 	'READ_POST_IMG'				=> $user->img('icon_topic_latest', 'VIEW_NEWEST_POST'),
 	'GOTO_PAGE_IMG'				=> $user->img('icon_post_target', 'GOTO_PAGE'),
-	'S_DISPLAY_NEWS'			=> true,
 	'S_DISPLAY_ANNOUNCEMENTS'	=> true,
 ));
 	
@@ -240,6 +239,7 @@ $fetch_news = phpbb_fetch_posts($portal_config['portal_global_announcements_foru
 				if ($portal_config['portal_number_of_announcements'] <> 0 && $portal_config['portal_announcements_archive'])
 				{
 					$template->assign_vars(array(
+						'S_TOPIC_ICONS'			=> $fetch_news['topic_icons'],
 						'AP_PAGINATION'			=> $pagination,
 						'TOTAL_ANNOUNCEMENTS'	=> ($total_announcements == 1) ? $user->lang['VIEW_LATEST_ANNOUNCEMENT'] : sprintf($user->lang['VIEW_LATEST_ANNOUNCEMENTS'], $total_announcements),
 						'AP_PAGE_NUMBER'		=> on_page($total_announcements, $portal_config['portal_number_of_announcements'], $start))
@@ -304,6 +304,7 @@ $fetch_news = phpbb_fetch_posts($portal_config['portal_global_announcements_foru
 			if ($portal_config['portal_number_of_announcements'] <> 0 && $portal_config['portal_announcements_archive'])
 			{
 				$template->assign_vars(array(
+					'S_TOPIC_ICONS'			=> $fetch_news['topic_icons'],
 					'AP_PAGINATION'			=> $pagination,
 					'TOTAL_ANNOUNCEMENTS'	=> ($total_announcements == 1) ? $user->lang['VIEW_LATEST_ANNOUNCEMENT'] : sprintf($user->lang['VIEW_LATEST_ANNOUNCEMENTS'], $total_announcements),
 					'AP_PAGE_NUMBER'		=> on_page($total_announcements, $portal_config['portal_number_of_announcements'], $start))

root/portal/block/news.php

@@ -26,7 +26,6 @@ $template->assign_vars(array(
 	'GOTO_PAGE_IMG'				=> $user->img('icon_post_target', 'GOTO_PAGE'),
 	'S_NEWEST_OR_FIRST'			=> ( $portal_config['portal_news_show_last'] ) ? $user->lang['JUMP_NEWEST'] : $user->lang['JUMP_FIRST'],
 	'POSTED_BY_TEXT'			=> ( $portal_config['portal_news_show_last'] ) ? $user->lang['LAST_POST'] : $user->lang['POSTED'],
-	'S_TOPIC_ICONS'				=> true,
 	'S_DISPLAY_NEWS'			=> true,
 ));
 
@@ -228,6 +227,7 @@ $fetch_news = phpbb_fetch_posts($portal_config['portal_news_forum'], $portal_con
 				if ($portal_config['portal_number_of_news'] <> 0 && $portal_config['portal_news_archive'])
 				{
 					$template->assign_vars(array(
+						'S_TOPIC_ICONS'		=> $fetch_news['topic_icons'],
 						'NP_PAGINATION'		=> $pagination,
 						'TOTAL_NEWS'		=> ($total_news == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $total_news),
 						'NP_PAGE_NUMBER'	=> on_page($total_news, $portal_config['portal_number_of_news'], $start))
@@ -293,6 +293,7 @@ $fetch_news = phpbb_fetch_posts($portal_config['portal_news_forum'], $portal_con
 			{
 				$template->assign_vars(array(
 					'NP_PAGINATION'		=> $pagination,
+					'S_TOPIC_ICONS'		=> $fetch_news['topic_icons'],
 					'TOTAL_NEWS'		=> ($total_news == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $total_news),
 					'NP_PAGE_NUMBER'	=> on_page($total_news, $portal_config['portal_number_of_news'], $start))
 				);

root/portal/includes/functions.php

@@ -82,6 +82,8 @@ function phpbb_fetch_posts($forum_from, $permissions, $number_of_posts, $text_le
 	$forum_from = ( strpos($forum_from, ',') !== FALSE ) ? explode(',', $forum_from) : (($forum_from != '') ? array($forum_from) : array());
 
 	$str_where = '';
+	
+	$topic_icons = array();
 
 	if( $permissions == TRUE )
 	{
@@ -209,7 +211,8 @@ function phpbb_fetch_posts($forum_from, $permissions, $number_of_posts, $text_le
 			p.enable_magic_url,
 			p.bbcode_bitfield,
 			p.bbcode_uid,
-			f.forum_name',
+			f.forum_name,
+			f.enable_icons',
 			
 		'FROM' => array(
 			TOPICS_TABLE => 't',
@@ -314,6 +317,8 @@ function phpbb_fetch_posts($forum_from, $permissions, $number_of_posts, $text_le
 			$global_f = $row['forum_id'];
 		}
 		
+		$topic_icons[] = $row['enable_icons'];
+		
 		$posts[$i] = array_merge($posts[$i], array(
 			'post_text'				=> ap_validate($message),
 			'topic_id'				=> $row['topic_id'],
@@ -345,6 +350,8 @@ function phpbb_fetch_posts($forum_from, $permissions, $number_of_posts, $text_le
 		$i++;
 	}
 	
+	$posts['topic_icons'] = max($topic_icons);
+	
 	if( $global_f < 1 )
 	{
 		return array();

root/styles/prosilver/template/portal/block/announcements.html

@@ -16,7 +16,7 @@
 				<!-- ELSE -->
 				<div class="post <!-- IF announcements_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
 					<div class="inner"><span class="portal-corners-top-inner"><span></span></span>
-						<h4 class="first"><a name="a{announcements_row.A_ID}"></a><!-- IF announcements_row.S_UNREAD_INFO --><a href="{announcements_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{announcements_row.U_VIEW_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {announcements_row.ATTACH_ICON_IMG} <!-- IF announcements_row.S_POLL --> <strong>{L_POLL}: </strong><!-- ENDIF --><!-- IF announcements_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{announcements_row.TOPIC_ICON_IMG}" width="{announcements_row.TOPIC_ICON_IMG_WIDTH}" height="{announcements_row.TOPIC_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{announcements_row.U_VIEW_COMMENTS}"><strong>{announcements_row.TITLE}</strong></a></h4>
+						<h4 class="first"><a name="a{announcements_row.A_ID}"></a><!-- IF announcements_row.S_UNREAD_INFO --><a href="{announcements_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{announcements_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {announcements_row.ATTACH_ICON_IMG} <!-- IF announcements_row.S_POLL --> <strong>{L_POLL}: </strong><!-- ENDIF --><!-- IF announcements_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{announcements_row.TOPIC_ICON_IMG}" width="{announcements_row.TOPIC_ICON_IMG_WIDTH}" height="{announcements_row.TOPIC_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{announcements_row.U_VIEW_COMMENTS}"><strong>{announcements_row.TITLE}</strong></a></h4>
 						<!-- IF announcements_row.PAGINATION --><strong class="pagination"><span>{announcements_row.PAGINATION}</span></strong><!-- ENDIF -->
 						<ul class="linklist">
 							<li>{L_POSTED} {L_POST_BY_AUTHOR}: {announcements_row.POSTER_FULL} {L_POSTED_ON_DATE}: {announcements_row.TIME}</li>

root/styles/prosilver/template/portal/block/announcements_compact.html

@@ -54,7 +54,7 @@
 				</dt>
 				<dd class="posts">{announcements_row.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
 				<dd class="views">{announcements_row.TOPIC_VIEWS} <dfn>{L_VIEWS}</dfn></dd>
-				<dd class="lastpost"><span><dfn>{L_LAST_POST}</dfn><!-- IF announcements_row.S_UNREAD_INFO --><a href="{announcements_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{announcements_row.U_VIEW_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} {announcements_row.USERNAME_FULL_LAST}<br />
+				<dd class="lastpost"><span><dfn>{L_LAST_POST}</dfn><!-- IF announcements_row.S_UNREAD_INFO --><a href="{announcements_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{announcements_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} {announcements_row.USERNAME_FULL_LAST}<br />
 				{L_POSTED_ON_DATE} {announcements_row.LAST_POST_TIME}</span>
 				</dd>
 			</dl>

root/styles/prosilver/template/portal/block/news.html

@@ -16,7 +16,7 @@
 				<!-- ELSE -->
 				<div class="post <!-- IF news_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
 					<div class="inner"><span class="portal-corners-top-inner"><span></span></span>
-						<h4 class="first"><a name="n{news_row.N_ID}"></a><!-- IF news_row.S_UNREAD_INFO --><a href="{news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news_row.U_VIEW_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {news_row.ATTACH_ICON_IMG} <!-- IF news_row.S_POLL --><strong>{L_POLL}: </strong><!-- ENDIF --><!-- IF news_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{news_row.TOPIC_ICON_IMG}" width="{news_row.TOPIC_ICON_IMG_WIDTH}" height="{news_row.TOPIC_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{news_row.U_LAST_COMMENTS}"><strong>{news_row.TITLE}</strong></a></h4>
+						<h4 class="first"><a name="n{news_row.N_ID}"></a><!-- IF news_row.S_UNREAD_INFO --><a href="{news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {news_row.ATTACH_ICON_IMG} <!-- IF news_row.S_POLL --><strong>{L_POLL}: </strong><!-- ENDIF --><!-- IF news_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{news_row.TOPIC_ICON_IMG}" width="{news_row.TOPIC_ICON_IMG_WIDTH}" height="{news_row.TOPIC_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{news_row.U_LAST_COMMENTS}"><strong>{news_row.TITLE}</strong></a></h4>
 						<!-- IF news_row.PAGINATION --><strong class="pagination"><span>{news_row.PAGINATION}</span></strong><!-- ENDIF -->
 						<ul class="linklist">
 							<li>{POSTED_BY_TEXT} {L_POST_BY_AUTHOR}: {news_row.POSTER_FULL} {L_POSTED_ON_DATE} {news_row.TIME}</li>

root/styles/prosilver/template/portal/block/news_compact.html

@@ -49,7 +49,7 @@
 				</dt>
 				<dd class="posts">{news_row.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
 				<dd class="views">{news_row.TOPIC_VIEWS} <dfn>{L_VIEWS}</dfn></dd>
-				<dd class="lastpost"><span><dfn>{L_LAST_POST}</dfn><!-- IF news_row.S_UNREAD_INFO --><a href="{news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news_row.U_VIEW_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} {news_row.USERNAME_FULL_LAST}<br />
+				<dd class="lastpost"><span><dfn>{L_LAST_POST}</dfn><!-- IF news_row.S_UNREAD_INFO --><a href="{news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} {news_row.USERNAME_FULL_LAST}<br />
 				{L_POSTED_ON_DATE} {news_row.LAST_POST_TIME}</span>
 				</dd>
 			</dl>

root/styles/subsilver2/template/portal/block/announcements.html

@@ -13,7 +13,7 @@
 				<tr>
 					<td class="cat">
 					<a name="a{announcements_row.A_ID}"></a>
-						<!-- IF announcements_row.S_UNREAD_INFO --><a href="{announcements_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{announcements_row.U_VIEW_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {announcements_row.ATTACH_ICON_IMG}<!-- IF announcements_row.S_POLL --> <strong>{L_POLL}: </strong><!-- ENDIF --><!-- IF announcements_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{announcements_row.TOPIC_ICON_IMG}" width="{announcements_row.TOPIC_ICON_IMG_WIDTH}" height="{announcements_row.TOPIC_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{announcements_row.U_VIEW_COMMENTS}"><strong>{announcements_row.TITLE}</strong></a>
+						<!-- IF announcements_row.S_UNREAD_INFO --><a href="{announcements_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{announcements_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {announcements_row.ATTACH_ICON_IMG}<!-- IF announcements_row.S_POLL --> <strong>{L_POLL}: </strong><!-- ENDIF --><!-- IF announcements_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{announcements_row.TOPIC_ICON_IMG}" width="{announcements_row.TOPIC_ICON_IMG_WIDTH}" height="{announcements_row.TOPIC_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{announcements_row.U_VIEW_COMMENTS}"><strong>{announcements_row.TITLE}</strong></a>
 					</td>
 				</tr>
 				<tr class="row<!-- IF announcements_row.S_ROW_COUNT is odd -->1<!-- ELSE -->2<!-- ENDIF -->">

root/styles/subsilver2/template/portal/block/announcements_compact.html

@@ -39,7 +39,7 @@
 				<td class="row1" width="50" align="center"><p class="topicdetails">{announcements_row.REPLIES}</p></td>
 				<td class="row2" width="50" align="center"><p class="topicdetails">{announcements_row.TOPIC_VIEWS}</p></td>
 				<td class="row1" width="140" align="center">
-					<p class="topicdetails"><!-- IF announcements_row.S_UNREAD_INFO --><a href="{announcements_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{announcements_row.U_VIEW_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF -->
+					<p class="topicdetails"><!-- IF announcements_row.S_UNREAD_INFO --><a href="{announcements_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{announcements_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF -->
 					{POSTED_BY_TEXT} {L_POST_BY_AUTHOR}: {announcements_row.USERNAME_FULL_LAST}
 					</p>
 					<p class="topicdetails" style="white-space: nowrap;">{L_POSTED_ON_DATE} {announcements_row.LAST_POST_TIME}</p>

root/styles/subsilver2/template/portal/block/news.html

@@ -13,7 +13,7 @@
 				<tr>
 					<td class="cat">
 					<a name="n{news_row.N_ID}"></a>
-						<!-- IF news_row.S_UNREAD_INFO --><a href="{news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news_row.U_VIEW_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {news_row.ATTACH_ICON_IMG} <!-- IF news_row.S_POLL --><strong>{L_POLL}: </strong><!-- ENDIF --><!-- IF news_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{news_row.TOPIC_ICON_IMG}" width="{news_row.TOPIC_ICON_IMG_WIDTH}" height="{news_row.TOPIC_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{news_row.U_LAST_COMMENTS}"><strong>{news_row.TITLE}</strong></a></td>
+						<!-- IF news_row.S_UNREAD_INFO --><a href="{news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {news_row.ATTACH_ICON_IMG} <!-- IF news_row.S_POLL --><strong>{L_POLL}: </strong><!-- ENDIF --><!-- IF news_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{news_row.TOPIC_ICON_IMG}" width="{news_row.TOPIC_ICON_IMG_WIDTH}" height="{news_row.TOPIC_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{news_row.U_LAST_COMMENTS}"><strong>{news_row.TITLE}</strong></a></td>
 				</tr>
 				<tr class="row<!-- IF news_row.S_ROW_COUNT is odd -->1<!-- ELSE -->2<!-- ENDIF -->">
 					<td style="padding:5px 5px 5px 5px;">

root/styles/subsilver2/template/portal/block/news_compact.html

@@ -37,7 +37,7 @@
 				<td class="row1" width="50" align="center"><p class="topicdetails">{news_row.REPLIES}</p></td>
 				<td class="row2" width="50" align="center"><p class="topicdetails">{news_row.TOPIC_VIEWS}</p></td>
 				<td class="row1" width="140" align="center">
-					<p class="topicdetails"><!-- IF news_row.S_UNREAD_INFO --><a href="{news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news_row.U_VIEW_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF -->
+					<p class="topicdetails"><!-- IF news_row.S_UNREAD_INFO --><a href="{news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF -->
 					{POSTED_BY_TEXT} {L_POST_BY_AUTHOR}: {news_row.USERNAME_FULL_LAST}
 					</p>
 					<p class="topicdetails" style="white-space: nowrap;">{L_POSTED_ON_DATE} {news_row.LAST_POST_TIME}</p>