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] Added identifiers to attachment archive name

Browse source 
Attachment archives now include the post/topic id and the subject.
Attachments downloaded from a topic are prefixed with their post
id.

PHPBB3-11042
This commit is contained in:
Fyorl 2012-08-07 18:19:58 +01:00
parent 773c513ac0
commit 10f0fc0713
1 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
phpBB/download/file.php
View file

@ -426,6 +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;
require_once $phpbb_root_path . 'includes/functions_upload.' . $phpEx;
phpbb_increment_downloads($db, $attachment_ids); phpbb_increment_downloads($db, $attachment_ids);
if (!in_array($archive, compress::methods())) if (!in_array($archive, compress::methods()))
@ -433,8 +434,40 @@ if ($attachments)
$archive = '.tar'; $archive = '.tar';
} }
if ($post_id)
{
$sql = 'SELECT `post_subject`
FROM ' . POSTS_TABLE . "
WHERE post_id = $post_id";
}
else
{
$sql = 'SELECT `topic_title`
FROM ' . TOPICS_TABLE . "
WHERE topic_id = $topic_id";
}
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
$filespec = new filespec(array(
'tmp_name' => '',
'size' => 0,
'name' => ($post_id) ? $row['post_subject'] : $row['topic_title'],
'type' => '',
));
$filespec->clean_filename('real');
$suffix = '_' . (($post_id) ? $post_id : $topic_id) . '_' . $filespec->realname;
// Remove trailing full stop
if (strrpos($suffix, '.') === strlen($suffix) - 1)
{
$suffix = substr($suffix, 0, strlen($suffix) - 1);
}
$store_name = 'att_' . time() . '_' . unique_id(); $store_name = 'att_' . time() . '_' . unique_id();
$archive_name = 'attachments'; $archive_name = 'attachments' . $suffix;
if ($archive === '.zip') if ($archive === '.zip')
{ {
@ -447,7 +480,13 @@ if ($attachments)
foreach ($attachments as $attach) foreach ($attachments as $attach)
{ {
$compress->add_custom_file("{$phpbb_root_path}files/{$attach['physical_filename']}", $attach['real_filename']); $prefix = '';
if ($topic_id)
{
$prefix = $attach['post_msg_id'] . '_';
}
$compress->add_custom_file("{$phpbb_root_path}files/{$attach['physical_filename']}", "{$prefix}{$attach['real_filename']}");
} }
$compress->close(); $compress->close();