2 files changed, 27 insertions, 47 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 5db57c3f9c..db71052707 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -230,29 +230,7 @@ else if ($download_id)
 	{
 		if (!$attachment['in_message'])
 		{
-			$sql = 'SELECT p.forum_id, f.forum_password, f.parent_id
-				FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f
-				WHERE p.post_id = ' . $attachment['post_msg_id'] . '
-				AND p.forum_id = f.forum_id';
-			$result = $db->sql_query_limit($sql, 1);
-			$row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-
-			$f_download = $auth->acl_get('f_download', $row['forum_id']);
-
-			if ($auth->acl_get('u_download') && $f_download)
-			{
-				if ($row && $row['forum_password'])
-				{
-					// Do something else ... ?
-					login_forum_box($row);
-				}
-			}
-			else
-			{
-				send_status_line(403, 'Forbidden');
-				trigger_error('SORRY_AUTH_VIEW_ATTACH');
-			}
+			phpbb_download_handle_passworded_forum($db, $auth, $attachment['topic_id']);
 		}
 		else
 		{
@@ -350,30 +328,7 @@ else
 {
 	// sizeof($attachments) >= 1
 
-	$sql = 'SELECT t.forum_id, f.forum_password, f.parent_id
-		FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
-		WHERE t.topic_id = " . (int) $attachment['topic_id'] . "
-			AND t.forum_id = f.forum_id";
-	$result = $db->sql_query_limit($sql, 1);
-	$row = $db->sql_fetchrow($result);
-	$db->sql_freeresult($result);
-
-	$f_download = $auth->acl_get('f_download', $row['forum_id']);
-
-	if ($auth->acl_get('u_download') && $f_download)
-	{
-		if ($row && $row['forum_password'])
-		{
-			// Do something else ... ?
-			login_forum_box($row);
-		}
-	}
-	else
-	{
-		send_status_line(403, 'Forbidden');
-		trigger_error('SORRY_AUTH_VIEW_ATTACH');
-	}
-
+	phpbb_download_handle_passworded_forum($db, $auth, $attachment['topic_id']);
 	phpbb_increment_downloads($db, $attachment_ids);
 
 	if (!class_exists('compress'))
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php
index b01712357d..4299ed47c5 100644
--- a/phpBB/includes/functions_download.php
+++ b/phpBB/includes/functions_download.php
@@ -613,3 +613,28 @@ function phpbb_increment_downloads($db, $ids)
 		WHERE ' . $db->sql_in_set('attach_id', $ids);
 	$db->sql_query($sql);
 }
+
+function phpbb_download_handle_passworded_forum($db, $auth, $topic_id)
+{
+	$sql = 'SELECT t.forum_id, f.forum_password, f.parent_id
+		FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
+		WHERE t.topic_id = " . (int) $topic_id . "
+			AND t.forum_id = f.forum_id";
+	$result = $db->sql_query_limit($sql, 1);
+	$row = $db->sql_fetchrow($result);
+	$db->sql_freeresult($result);
+
+	if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']))
+	{
+		if ($row && $row['forum_password'])
+		{
+			// Do something else ... ?
+			login_forum_box($row);
+		}
+	}
+	else
+	{
+		send_status_line(403, 'Forbidden');
+		trigger_error('SORRY_AUTH_VIEW_ATTACH');
+	}
+}