mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
safer name for the updater downloads (even if removed after download) - reported by SHS`
git-svn-id: file:///svn/phpbb/trunk@7134 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -419,15 +419,20 @@ class compress_zip extends compress
|
||||
/**
|
||||
* Download archive
|
||||
*/
|
||||
function download($filename)
|
||||
function download($filename, $download_name = false)
|
||||
{
|
||||
global $phpbb_root_path;
|
||||
|
||||
if ($download_name === false)
|
||||
{
|
||||
$download_name = $filename;
|
||||
}
|
||||
|
||||
$mimetype = 'application/zip';
|
||||
|
||||
header('Pragma: no-cache');
|
||||
header("Content-Type: $mimetype; name=\"$filename.zip\"");
|
||||
header("Content-disposition: attachment; filename=$filename.zip");
|
||||
header("Content-Type: $mimetype; name=\"$download_name.zip\"");
|
||||
header("Content-disposition: attachment; filename=$download_name.zip");
|
||||
|
||||
$fp = fopen("{$phpbb_root_path}store/$filename.zip", 'rb');
|
||||
while ($buffer = fread($fp, 1024))
|
||||
@@ -611,10 +616,15 @@ class compress_tar extends compress
|
||||
/**
|
||||
* Download archive
|
||||
*/
|
||||
function download($filename)
|
||||
function download($filename, $download_name = false)
|
||||
{
|
||||
global $phpbb_root_path;
|
||||
|
||||
if ($download_name === false)
|
||||
{
|
||||
$download_name = $filename;
|
||||
}
|
||||
|
||||
switch ($this->type)
|
||||
{
|
||||
case '.tar':
|
||||
@@ -635,8 +645,8 @@ class compress_tar extends compress
|
||||
}
|
||||
|
||||
header('Pragma: no-cache');
|
||||
header("Content-Type: $mimetype; name=\"$filename$this->type\"");
|
||||
header("Content-disposition: attachment; filename=$filename$this->type");
|
||||
header("Content-Type: $mimetype; name=\"$download_name$this->type\"");
|
||||
header("Content-disposition: attachment; filename=$download_name$this->type");
|
||||
|
||||
$fp = fopen("{$phpbb_root_path}store/$filename$this->type", 'rb');
|
||||
while ($buffer = fread($fp, 1024))
|
||||
|
Reference in New Issue
Block a user