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

[feature/attach-dl] Modified SQL query format and used sql_in_set

Browse source 
PHPBB3-11042
This commit is contained in:
Fyorl 2012-08-04 13:57:26 +01:00
parent ee7d9614c0
commit bbdbff1ab3
1 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
phpBB/download/file.php
View file

@ -173,13 +173,11 @@ if ($download_id)
if ($topic_id) if ($topic_id)
{ {
$sql = " $sql = 'SELECT attach_id, in_message, post_msg_id, extension, is_orphan, a.poster_id, filetime
SELECT attach_id, in_message, post_msg_id, extension, is_orphan, a.poster_id, filetime FROM ' . POSTS_TABLE . ' p, ' . ATTACHMENTS_TABLE . " a
FROM " . POSTS_TABLE . " p, " . ATTACHMENTS_TABLE . " a
WHERE p.topic_id = $topic_id WHERE p.topic_id = $topic_id
AND p.post_attachment = 1 AND p.post_attachment = 1
AND a.post_msg_id = p.post_id AND a.post_msg_id = p.post_id";
";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
@ -192,11 +190,9 @@ if ($topic_id)
if ($post_id) if ($post_id)
{ {
$sql = " $sql = 'SELECT attach_id, in_message, post_msg_id, extension, is_orphan, poster_id, filetime
SELECT attach_id, in_message, post_msg_id, extension, is_orphan, poster_id, filetime FROM ' . ATTACHMENTS_TABLE . "
FROM " . ATTACHMENTS_TABLE . " WHERE post_msg_id = $post_id";
WHERE post_msg_id = $post_id
";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
@ -249,12 +245,10 @@ else
if ($topic_id) if ($topic_id)
{ {
$sql = " $sql = 'SELECT t.forum_id, f.forum_password, f.parent_id
SELECT t.forum_id, f.forum_password, f.parent_id FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
WHERE t.topic_id = $topic_id WHERE t.topic_id = $topic_id
AND t.forum_id = f.forum_id AND t.forum_id = f.forum_id";
";
} }
$result = $db->sql_query_limit($sql, 1); $result = $db->sql_query_limit($sql, 1);
@ -370,13 +364,10 @@ if ($attachments)
{ {
$attach_ids[] = $attach['attach_id']; $attach_ids[] = $attach['attach_id'];
} }
$attach_ids = implode(',', $attach_ids);
$sql = " $sql = 'SELECT attach_id, is_orphan, in_message, post_msg_id, extension, physical_filename, real_filename, mimetype, filesize, filetime
SELECT attach_id, is_orphan, in_message, post_msg_id, extension, physical_filename, real_filename, mimetype, filesize, filetime FROM ' . ATTACHMENTS_TABLE . '
FROM " . ATTACHMENTS_TABLE . " WHERE ' . $db->sql_in_set('attach_id', $attach_ids);
WHERE attach_id IN ($attach_ids)
";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$attachments = array(); $attachments = array();
@ -452,11 +443,9 @@ if ($attachment)
if ($attachments) if ($attachments)
{ {
$sql = " $sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
UPDATE " . ATTACHMENTS_TABLE . "
SET download_count = download_count + 1 SET download_count = download_count + 1
WHERE attach_id IN ($attach_ids) WHERE ' . $db->sql_in_set('attach_id', $attach_ids);
";
$db->sql_query($sql); $db->sql_query($sql);
if (!in_array($archive, compress::methods())) if (!in_array($archive, compress::methods()))