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

[ticket/11044] Compress class now deals with file conflicts

Browse source 
PHPBB3-11044
This commit is contained in:
Fyorl 2012-08-04 16:50:03 +01:00
parent fa06b779ad
commit 70d9c02aae
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
phpBB/includes/functions_compress.php
View file

@ -23,6 +23,11 @@ class compress
{
var $fp = 0;
/**
* @var array
*/
private $filelist = array();
/**
* Add file to archive
*/
@ -122,6 +127,24 @@ class compress
return true;
}
/**
* Checks if a file by that name as already been added and, if it has,
* returns a new, unique name.
*
* @param string $name The filename
* @return string A unique string
*/
private function check_name($name)
{
if (isset($this->filelist[$name])) {
$this->filelist[$name]++;
return $name . '.' . $this->filelist[$name];
}
$this->filelist[$name] = 0;
return $name;
}
/**
* Return available methods
*/
@ -361,6 +384,7 @@ class compress_zip extends compress
function data($name, $data, $is_dir = false, $stat)
{
$name = str_replace('\\', '/', $name);
$name = $this->check_name($name);
$hexdtime = pack('V', $this->unix_to_dos_time($stat[9]));
@ -633,6 +657,7 @@ class compress_tar extends compress
*/
function data($name, $data, $is_dir = false, $stat)
{
$name = $this->check_name($name);
$this->wrote = true;
$fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && @extension_loaded('zlib')) ? 'gzwrite' : 'fwrite');