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] Get rid of unnecessary if block. Refactor switch block.

Browse source 
PHPBB3-11042
This commit is contained in:
Andreas Fischer 2012-08-07 17:03:46 +02:00
parent 3de4a7e78d
commit 8d914e05ae
1 changed files with 28 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
phpBB/download/file.php
View file

@ -151,41 +151,20 @@ if (!$config['allow_attachments'] && !$config['allow_pm_attach'])
trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED'); trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED');
} }
$attachments = $attachment_ids = array(); if ($download_id)
if ($download_id || $post_id || $topic_id)
{ {
$sql = 'SELECT a.attach_id, a.in_message, a.post_msg_id, a.extension, a.is_orphan, a.poster_id, a.filetime // Attachment id (only 1 attachment)
FROM ' . ATTACHMENTS_TABLE . ' a $sql_where = "a.attach_id = $download_id";
WHERE '; }
else if ($post_id)
switch (true) {
{ // Post id or private message id (multiple attachments)
default: $sql_where = "a.post_msg_id = $post_id";
case $download_id: }
// Attachment id (only 1 attachment) else if ($topic_id)
$sql .= "a.attach_id = $download_id"; {
break; // Topic id (multiple attachments)
$sql_where = "a.topic_id = $topic_id";
case $post_id:
// Post id or private message id (multiple attachments)
$sql .= "a.post_msg_id = $post_id";
break;
case $topic_id:
// Topic id (multiple attachments)
$sql .= "a.topic_id = $topic_id";
break;
}
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$attachment_id = (int) $row['attach_id'];
$attachment_ids[$attachment_id] = $attachment_id;
$attachments[$attachment_id] = $row;
}
$db->sql_freeresult($result);
} }
else else
{ {
@ -193,6 +172,21 @@ else
trigger_error('NO_ATTACHMENT_SELECTED'); trigger_error('NO_ATTACHMENT_SELECTED');
} }
$sql = 'SELECT a.attach_id, a.in_message, a.post_msg_id, a.extension, a.is_orphan, a.poster_id, a.filetime
FROM ' . ATTACHMENTS_TABLE . " a
WHERE $sql_where";
$result = $db->sql_query($sql);
$attachments = $attachment_ids = array();
while ($row = $db->sql_fetchrow($result))
{
$attachment_id = (int) $row['attach_id'];
$attachment_ids[$attachment_id] = $attachment_id;
$attachments[$attachment_id] = $row;
}
$db->sql_freeresult($result);
if (empty($attachments)) if (empty($attachments))
{ {
send_status_line(404, 'Not Found'); send_status_line(404, 'Not Found');