diff options
| -rw-r--r-- | phpBB/download/file.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_download.php | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index cd365767c2..1aeaceb824 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -230,7 +230,7 @@ else if ($download_id) { if (!$attachment['in_message']) { - phpbb_download_handle_passworded_forum($db, $auth, $attachment['topic_id']); + phpbb_download_check_forum_auth($db, $auth, $attachment['topic_id']); } else { @@ -329,7 +329,7 @@ else // sizeof($attachments) >= 1 if (!$attachment['in_message']) { - phpbb_download_handle_passworded_forum($db, $auth, $attachment['topic_id']); + phpbb_download_check_forum_auth($db, $auth, $attachment['topic_id']); } if (!class_exists('compress')) diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index 4299ed47c5..22f217909c 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -614,7 +614,16 @@ function phpbb_increment_downloads($db, $ids) $db->sql_query($sql); } -function phpbb_download_handle_passworded_forum($db, $auth, $topic_id) +/** +* Checks that the user has permission to download attachments from the forum +* +* @param dbal $db The database object +* @param phpbb_auth $auth The authentication object +* @param int $topic_id The id of the topic that we are downloading from +* +* @return null +*/ +function phpbb_download_check_forum_auth($db, $auth, $topic_id) { $sql = 'SELECT t.forum_id, f.forum_password, f.parent_id FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f |