re-use include...

git-svn-id: file:///svn/phpbb/trunk@3813 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/download.php

@@ -50,8 +50,8 @@ $allow_deny_order = ALLOWED_DENIED;
 
 //
 // Allowed Syntax:
-// Full Domain Name -> www.opentools.de
+// Full Domain Name -> www.phpbb.com
-// Partial Domain Names -> opentools.de
+// Partial Domain Names -> phpbb.com
 //
 $sites = array(
 	$config['server_name'], // This is your domain

phpBB/language/en/lang_main.php

@@ -481,6 +481,9 @@ $lang = array(
 	'DOWNLOAD'				=> 'Download',
 	'FILESIZE'				=> 'Filesize',
 	'FILE_NOT_FOUND_404'	=> '<b>404 File Not Found:</b> The File <i>%s</i> does not exist.',
+	'DOWNLOADED'			=> 'Downloaded',
+	'VIEWED'				=> 'Viewed',
+	'DOWNLOAD_NUMBER'		=> '%d Time(s)', // replace %d with count
 
 	'User_control_panel' => 'User Control Panel',
 	'UCP_Main' => 'Control Panel',

phpBB/templates/subSilver/viewtopic_attach_body.html

@@ -1,6 +1,6 @@
 <br /><br />
 <!-- BEGIN attachment -->
-<hr /><br />
+<hr />
 	<!-- IF postrow.attachment.IS_DENIED -->
 		<span class="postbody">[{postrow.attachment.L_DENIED}]</span><br /><br />
 	<!-- ENDIF -->
@@ -18,21 +18,19 @@
 		<param name="Loop" value="0"> 
 		<embed type="application/x-mplayer2" pluginspage="http://www.microsoft.com/windows95/downloads/contents/wurecommended/s_wufeatured/mediaplayer/default.asp" src="{postrow.attachment.U_DOWNLOAD_LINK}" name=MediaPlayer2 showcontrols=1 showdisplay=0 showstatusbar=1 autosize=1 autostart=0 visible=1 animationatstart=0 loop=0></embed> 
 		</object>
-		<br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
+		<br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
 	<!-- ELSEIF postrow.attachment.IS_IMAGE -->
 		<span class="postbody">{postrow.attachment.COMMENT}<br />
 		<img src="{postrow.attachment.U_DOWNLOAD_LINK}" alt="{postrow.attachment.DOWNLOAD_NAME}" /></span>
-		<br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
+		<br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
 	<!-- ELSEIF postrow.attachment.IS_THUMBNAIL -->
 		<span class="postbody">{postrow.attachment.COMMENT}<br />
 		<a href="{postrow.attachment.U_DOWNLOAD_LINK}" target="_blank"><img src="{postrow.attachment.IMG_THUMB_SRC}" alt="{postrow.attachment.DOWNLOAD_NAME}" border="0" /></a></span>
-		<br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
+		<br /><span class="gensmall">{postrow.attachment.DOWNLOAD_NAME} - {postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
 	<!-- ELSE -->
 		<span class="postbody">{postrow.attachment.COMMENT}</span><br />
 		<span class="postbody">{postrow.attachment.UPLOAD_IMG}
 		<a href="{postrow.attachment.U_DOWNLOAD_LINK}" target="_blank">{postrow.attachment.DOWNLOAD_NAME}</a> - {postrow.attachment.FILESIZE} {postrow.attachment.SIZE_VAR}<br /></span>
-		<span class="gensmall">{postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
+		<span class="gensmall">{postrow.attachment.L_DOWNLOADED_VIEWED} {postrow.attachment.L_DOWNLOAD_COUNT}</span><br /><br />
 	<!-- ENDIF -->
-
-	{postrow.attachment.HELLO}
 <!-- END attachment -->

phpBB/templates/subSilver/viewtopic_body.html

@@ -128,7 +128,7 @@
 			</tr>
 			<!-- ENDIF -->
 			<tr>
-				<td><span class="postbody">{postrow.MESSAGE}<!-- IF postrow.S_HAS_ATTACHMENTS --></span><!-- MERGE_INCLUDE viewtopic_attach_body.html --><span class="postbody"><!-- ENDIF -->{postrow.SIGNATURE}</span><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td>
+				<td><span class="postbody">{postrow.MESSAGE}<!-- IF postrow.S_HAS_ATTACHMENTS --></span><!-- INCLUDE viewtopic_attach_body.html --><span class="postbody"><!-- ENDIF -->{postrow.SIGNATURE}</span><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td>
 			</tr>
 		</table></td>
 	</tr>

phpBB/viewtopic.php

@@ -1156,13 +1156,11 @@ else
 // so go ahead and reset post_attach flags
 if ( (sizeof($attach_list)) && (count($attachments) == 0) )
 {
-	echo "DELETE THOSE STUFF";
-/*
 	$sql = "UPDATE " . POSTS_TABLE . " 
 		SET post_attachment = 0 
 		WHERE post_id IN (" . implode(', ', $attach_list) . ")";
 	$db->sql_query($sql);
-*/
+
 	// We need to update the topic indicator too if the 
 	// complete topic is now without an attachment
 }