makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/attach-dl] Added docblock for renamed download_check_forum_auth

Browse source 
PHPBB3-11042
This commit is contained in:
Fyorl 2012-08-14 11:36:16 +01:00
parent 6da47555e0
commit e8830c3369
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/download/file.php
View file

@ -230,7 +230,7 @@ else if ($download_id)
{ {
if (!$attachment['in_message']) 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 else
{ {
@ -329,7 +329,7 @@ else
// sizeof($attachments) >= 1 // sizeof($attachments) >= 1
if (!$attachment['in_message']) 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')) if (!class_exists('compress'))

11
phpBB/includes/functions_download.php
View file

@ -614,7 +614,16 @@ function phpbb_increment_downloads($db, $ids)
$db->sql_query($sql); $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 $sql = 'SELECT t.forum_id, f.forum_password, f.parent_id
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f