From c546d17b4b87c58522d8f7cdf8a9d000f16179b9 Mon Sep 17 00:00:00 2001
From: Ice <ice@tcoa.co.uk>
Date: Sat, 9 Aug 2008 12:53:05 +0000
Subject: [PATCH] Added append_sid() where possible

---
 root/portal/block/attachments.php                             | 1 +
 root/portal/block/search.php                                  | 2 +-
 root/styles/prosilver/template/portal/block/attachments.html  | 2 +-
 root/styles/subsilver2/template/portal/block/attachments.html | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/root/portal/block/attachments.php b/root/portal/block/attachments.php
index 593e9945..800523e1 100644
--- a/root/portal/block/attachments.php
+++ b/root/portal/block/attachments.php
@@ -84,6 +84,7 @@ if( $attach_forums === TRUE )
 			'POST_IDS'			=> (!empty($post_ids[$row['attach_id']])) ? $post_ids[$row['attach_id']] : '',
 			'POST_MSG_ID'		=> $row['post_msg_id'], // grab post ID to redirect to post
 			'U_FILE'			=> append_sid($phpbb_root_path . 'download/file.' . $phpEx, 'id=' . $row['attach_id']),
+			'U_TOPIC'			=> append_sid($phpbb_root_path . 'viewtopic.'.$phpEx, 'p='.$row['post_msg_id'].'#p'.$row['post_msg_id']),
 		));
 	}
 	$db->sql_freeresult($result);
diff --git a/root/portal/block/search.php b/root/portal/block/search.php
index 03716f47..4166fac5 100644
--- a/root/portal/block/search.php
+++ b/root/portal/block/search.php
@@ -22,7 +22,7 @@ if (!defined('IN_PORTAL'))
 
 $template->assign_vars(array(
 	'S_DISPLAY_PORTALSEARCH' => true,
-	'S_SEARCH_ACTION'	=> "{$phpbb_root_path}search.$phpEx",
+	'S_SEARCH_ACTION'	=> append_sid("{$phpbb_root_path}search.$phpEx"),
 	
 ));
 
diff --git a/root/styles/prosilver/template/portal/block/attachments.html b/root/styles/prosilver/template/portal/block/attachments.html
index 0183b3ea..82dd4785 100644
--- a/root/styles/prosilver/template/portal/block/attachments.html
+++ b/root/styles/prosilver/template/portal/block/attachments.html
@@ -6,7 +6,7 @@
              <!-- IF .attach -->
              <span style="float:left;"><strong>{L_FILENAME}</strong></span><br />
                 <!-- BEGIN attach -->
-                <span style="float:left;" class="portal-gensmall"><img src="portal/images/icon_topic_attach.gif" alt="" />&nbsp;<a href="viewtopic.php?p={attach.POST_MSG_ID}#p{attach.POST_MSG_ID}" ><strong>{attach.REAL_FILENAME}</strong></a></span><br style="clear:both" />
+                <span style="float:left;" class="portal-gensmall"><img src="portal/images/icon_topic_attach.gif" alt="" />&nbsp;<a href="{attach.U_TOPIC}" ><strong>{attach.REAL_FILENAME}</strong></a></span><br style="clear:both" />
              <!-- <span style="float:right;padding-right:10px;" class="portal-gensmall">{attach.FILESIZE}</span><br style="clear:both" /> -->
              <span style="float:left;padding-right:10px;">{L_FILESIZE}:</span><span style="float:right;padding-right:10px;" class="portal-gensmall"><strong>{attach.FILESIZE}</strong></span><br style="clear:both" />
              <span style="float:left;padding-right:10px;">{L_DOWNLOADS}:</span><span style="float:right;padding-right:10px;" class="portal-gensmall"><strong>{attach.DOWNLOAD_COUNT}</strong></span><br style="clear:both" />
diff --git a/root/styles/subsilver2/template/portal/block/attachments.html b/root/styles/subsilver2/template/portal/block/attachments.html
index 4277a73c..d0f91da4 100644
--- a/root/styles/subsilver2/template/portal/block/attachments.html
+++ b/root/styles/subsilver2/template/portal/block/attachments.html
@@ -9,7 +9,7 @@
              <span style="float:left;"><strong>{L_FILENAME}</strong></span>
              <span style="float:right;padding-right:10px;"><strong>{L_FILESIZE}</strong></span><br />
                 <!-- BEGIN attach -->
-                <span style="float:left;" class="gensmall"><img src="portal/images/icon_topic_attach.gif" alt="" />&nbsp;<a href="viewtopic.php?p={attach.POST_MSG_ID}#p{attach.POST_MSG_ID}" ><strong>{attach.REAL_FILENAME}</strong></a></span><br style="clear:both" />
+                <span style="float:left;" class="gensmall"><img src="portal/images/icon_topic_attach.gif" alt="" />&nbsp;<a href="{attach.U_TOPIC}" ><strong>{attach.REAL_FILENAME}</strong></a></span><br style="clear:both" />
              <span style="float:left;">{L_FILESIZE}:</span><span style="float:right;" class="gensmall"><strong>{attach.FILESIZE}</strong></span><br style="clear:both" />
              <span style="float:left;">{L_DOWNLOADS}:</span><span style="float:right;" class="gensmall"><strong>{attach.DOWNLOAD_COUNT}</strong></span><br style="clear:both" />
              <hr />