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

[feature/attach-dl] Merge changes from bantu/feature/attach-dl

Browse source 
PHPBB3-11042
This commit is contained in:
Fyorl 2012-08-07 16:10:01 +01:00
commit 32f7338361
2 changed files with 137 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

187
phpBB/download/file.php
View file

@ -140,88 +140,76 @@ $archive = $request->variable('archive', '.tar');
$mode = request_var('mode', ''); $mode = request_var('mode', '');
$thumbnail = request_var('t', false); $thumbnail = request_var('t', false);
// Ensure we're only performing one operation
if ($download_id)
{
$topic_id = false;
$post_id = false;
}
if ($post_id)
{
$topic_id = false;
}
// Start session management, do not update session page. // Start session management, do not update session page.
$user->session_begin(false); $user->session_begin(false);
$auth->acl($user->data); $auth->acl($user->data);
$user->setup('viewtopic'); $user->setup('viewtopic');
if (!$download_id && !$post_id && !$topic_id)
{
send_status_line(404, 'Not Found');
trigger_error('NO_ATTACHMENT_SELECTED');
}
if (!$config['allow_attachments'] && !$config['allow_pm_attach']) if (!$config['allow_attachments'] && !$config['allow_pm_attach'])
{ {
send_status_line(404, 'Not Found'); send_status_line(404, 'Not Found');
trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED'); trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED');
} }
$attachment = ($download_id) ? array() : false;
$attachments = ($topic_id || $post_id) ? array() : false;
if ($download_id) if ($download_id)
{ {
$sql = 'SELECT attach_id, in_message, post_msg_id, extension, is_orphan, poster_id, filetime // Attachment id (only 1 attachment)
FROM ' . ATTACHMENTS_TABLE . " $sql_where = "a.attach_id = $download_id";
WHERE attach_id = $download_id";
$result = $db->sql_query_limit($sql, 1);
$attachment = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
} }
else if ($post_id)
if ($topic_id)
{ {
$sql = 'SELECT a.attach_id, a.in_message, a.post_msg_id, a.extension, a.is_orphan, a.poster_id, a.filetime // Post id or private message id (multiple attachments)
FROM ' . POSTS_TABLE . ' p, ' . ATTACHMENTS_TABLE . " a $sql_where = "a.post_msg_id = $post_id";
WHERE p.topic_id = $topic_id
AND p.post_attachment = 1
AND a.post_msg_id = p.post_id";
$result = $db->sql_query($sql);
$attachments = $db->sql_fetchrowset($result);
$db->sql_freeresult($result);
} }
else if ($topic_id)
if ($post_id)
{ {
$sql = 'SELECT attach_id, in_message, post_msg_id, extension, is_orphan, poster_id, filetime // Topic id (multiple attachments)
FROM ' . ATTACHMENTS_TABLE . " $sql_where = "a.topic_id = $topic_id";
WHERE post_msg_id = $post_id"; }
else
$result = $db->sql_query($sql); {
$attachments = $db->sql_fetchrowset($result); send_status_line(404, 'Not Found');
$db->sql_freeresult($result); trigger_error('NO_ATTACHMENT_SELECTED');
} }
if (!$attachment && !$attachments) $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))
{ {
send_status_line(404, 'Not Found'); send_status_line(404, 'Not Found');
trigger_error('ERROR_NO_ATTACHMENT'); trigger_error('ERROR_NO_ATTACHMENT');
} }
else if (!download_allowed())
if ($attachment && ((!$attachment['in_message'] && !$config['allow_attachments']) || ($attachment['in_message'] && !$config['allow_pm_attach'])))
{ {
send_status_line(403, 'Forbidden');
trigger_error($user->lang['LINKAGE_FORBIDDEN']);
}
else if ($download_id)
{
// sizeof($attachments) == 1
$attachment = current($attachments);
if (!$attachment['in_message'] && !$config['allow_attachments'] || $attachment['in_message'] && !$config['allow_pm_attach'])
{
send_status_line(404, 'Not Found'); send_status_line(404, 'Not Found');
trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED'); trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED');
} }
$row = array(); if ($attachment['is_orphan'])
{
if ($attachment && $attachment['is_orphan'])
{
// We allow admins having attachment permissions to see orphan attachments... // We allow admins having attachment permissions to see orphan attachments...
$own_attachment = ($auth->acl_get('a_attach') || $attachment['poster_id'] == $user->data['user_id']) ? true : false; $own_attachment = ($auth->acl_get('a_attach') || $attachment['poster_id'] == $user->data['user_id']) ? true : false;
@ -233,27 +221,15 @@ if ($attachment && $attachment['is_orphan'])
// Obtain all extensions... // Obtain all extensions...
$extensions = $cache->obtain_attach_extensions(true); $extensions = $cache->obtain_attach_extensions(true);
} }
else else
{
if ($attachments || ($attachment && !$attachment['in_message']))
{ {
if ($download_id || $post_id) if (!$attachment['in_message'])
{ {
$sql = 'SELECT p.forum_id, f.forum_password, f.parent_id $sql = 'SELECT p.forum_id, f.forum_password, f.parent_id
FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f
WHERE p.post_id = ' . (($attachment) ? $attachment['post_msg_id'] : $post_id) . ' WHERE p.post_id = ' . $attachment['post_msg_id'] . '
AND p.forum_id = f.forum_id'; AND p.forum_id = f.forum_id';
}
if ($topic_id)
{
$sql = 'SELECT t.forum_id, f.forum_password, f.parent_id
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
WHERE t.topic_id = $topic_id
AND t.forum_id = f.forum_id";
}
$result = $db->sql_query_limit($sql, 1); $result = $db->sql_query_limit($sql, 1);
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -276,6 +252,7 @@ else
} }
else else
{ {
// Attachment is in a private message.
$row['forum_id'] = false; $row['forum_id'] = false;
if (!$auth->acl_get('u_pm_download')) if (!$auth->acl_get('u_pm_download'))
{ {
@ -307,29 +284,51 @@ else
} }
} }
// disallowed? $extensions = array();
$extensions = $cache->obtain_attach_extensions($row['forum_id']); if (!extension_allowed($row['forum_id'], $attachment['extension'], $extensions))
if ($attachment)
{ {
$ary = array($attachment); send_status_line(404, 'Forbidden');
trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension']));
}
}
}
else
{
// sizeof($attachments) >= 1
if ($post_id)
{
$sql = 'SELECT p.forum_id, f.forum_password, f.parent_id
FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f
WHERE p.post_id = ' . (($attachment) ? $attachment['post_msg_id'] : $post_id) . '
AND p.forum_id = f.forum_id';
}
else if ($topic_id)
{
$sql = 'SELECT t.forum_id, f.forum_password, f.parent_id
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
WHERE t.topic_id = $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 else
{ {
$ary = &$attachments;
}
if (!phpbb_check_attach_extensions($extensions, $ary))
{
send_status_line(404, 'Forbidden');
$ext = ($attachment) ? $attachment['extension'] : $attachments[0]['extension'];
trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $ext));
}
}
if (!download_allowed())
{
send_status_line(403, 'Forbidden'); send_status_line(403, 'Forbidden');
trigger_error($user->lang['LINKAGE_FORBIDDEN']); trigger_error('SORRY_AUTH_VIEW_ATTACH');
}
} }
if ($attachments && sizeof($attachments) < 2) if ($attachments && sizeof($attachments) < 2)
@ -356,15 +355,9 @@ if ($attachment)
if ($attachments) if ($attachments)
{ {
$attach_ids = array();
foreach ($attachments as $attach)
{
$attach_ids[] = $attach['attach_id'];
}
$sql = 'SELECT attach_id, is_orphan, in_message, post_msg_id, extension, physical_filename, real_filename, mimetype, filesize, filetime $sql = '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 ' . $db->sql_in_set('attach_id', $attachment_ids);
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$attachments = $db->sql_fetchrowset($result); $attachments = $db->sql_fetchrowset($result);
@ -433,7 +426,7 @@ if ($attachment)
if ($attachments) if ($attachments)
{ {
require_once $phpbb_root_path . 'includes/functions_compress.' . $phpEx; require_once $phpbb_root_path . 'includes/functions_compress.' . $phpEx;
phpbb_increment_downloads($db, $attach_ids); phpbb_increment_downloads($db, $attachment_ids);
if (!in_array($archive, compress::methods())) if (!in_array($archive, compress::methods()))
{ {

23
phpBB/includes/functions_download.php
View file

@ -613,26 +613,3 @@ function phpbb_increment_downloads($db, $ids)
WHERE ' . $db->sql_in_set('attach_id', $ids); WHERE ' . $db->sql_in_set('attach_id', $ids);
$db->sql_query($sql); $db->sql_query($sql);
} }
/**
* Checks every attachment to see if it has an allowed extension
*
* @param array $extensions As generated by phpbb_cache_service::obtain_attach_extensions
* @param array &$attachments An array of attachments to check
*
* @return bool Whether any of the attachments had allowed extensions
*/
function phpbb_check_attach_extensions($extensions, &$attachments)
{
$new_ary = array();
foreach ($attachments as $attach)
{
if (isset($extensions['_allowed_'][$attach['extension']]))
{
$new_ary[] = $attach;
}
}
$attachments = $new_ary;
return !empty($attachments);
}