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

Fix up issues with .tar, .tar.gz and .tar.bz2 archives and directory structure creation

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4398 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-08-13 16:11:04 +00:00
parent 808d0f1455
commit 321eb7eedc
1 changed files with 58 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
phpBB/includes/functions_compress.php
View file

@ -122,7 +122,7 @@ class compress_zip extends compress
function compress_zip($mode, $file) function compress_zip($mode, $file)
{ {
return $this->fp = @fopen($phpbb_root_path . $file, $mode . 'b'); return $this->fp = @fopen($file, $mode . 'b');
} }
function unix_to_dos_time($time) function unix_to_dos_time($time)
@ -380,12 +380,10 @@ class compress_zip extends compress
// Header/checksum creation derived from tarfile.pl, © Tom Horsley, 1994 // Header/checksum creation derived from tarfile.pl, © Tom Horsley, 1994
class compress_tar extends compress class compress_tar extends compress
{ {
var $fzopen = '';
var $fzclose = '';
var $fzread = '';
var $fzwrite = '';
var $isgz = false; var $isgz = false;
var $isbz = false; var $isbz = false;
var $filename = '';
var $mode = '';
function compress_tar($mode, $file, $type = '') function compress_tar($mode, $file, $type = '')
{ {
@ -393,16 +391,16 @@ class compress_tar extends compress
$this->isgz = (strpos($type, '.tar.gz') !== false || strpos($type, '.tgz') !== false) ? true : false; $this->isgz = (strpos($type, '.tar.gz') !== false || strpos($type, '.tgz') !== false) ? true : false;
$this->isbz = (strpos($type, '.tar.bz2') !== false) ? true : false; $this->isbz = (strpos($type, '.tar.bz2') !== false) ? true : false;
$fzopen = ($this->isbz && function_exists('bzopen')) ? 'bzopen' : (($this->isgz && extension_loaded('zlib')) ? 'gzopen' : 'fopen'); $this->mode = &$mode;
return $this->fp = @$fzopen($phpbb_root_path . $file, $mode . 'b'); $this->file = &$file;
$this->open();
} }
function extract($dst) function extract($dst)
{ {
$fzread = ($this->isbz && function_exists('bzread')) ? 'bzread' : (($this->isgz && extension_loaded('zlib')) ? 'gzread' : 'fread'); $fzread = ($this->isbz && function_exists('bzread')) ? 'bzread' : (($this->isgz && extension_loaded('zlib')) ? 'gzread' : 'fread');
$size = 0; // Run through the file and grab directory entries
$header = $data = '';
while ($buffer = $fzread($this->fp, 512)) while ($buffer = $fzread($this->fp, 512))
{ {
$tmp = unpack("A6magic", substr($buffer, 257, 6)); $tmp = unpack("A6magic", substr($buffer, 257, 6));
@ -417,14 +415,52 @@ class compress_tar extends compress
if ($filetype == 5) if ($filetype == 5)
{ {
if (!@mkdir("$dst$filename", 0777)) $mkdir_ary[] = "$dst$filename";
{
trigger_error("Could not create directory $filename");
}
@chmod("$dst$filename", 0777);
continue;
} }
else }
}
// Create the directory structure
if (is_array($mkdir_ary))
{
sort($mkdir_ary);
foreach ($mkdir_ary as $dir)
{
if (!@mkdir($dir, 0777))
{
trigger_error("Could not create directory $dir");
}
@chmod("$dir", 0777);
}
}
// If this is a .bz2 we need to close and re-open the file in order
// to reset the file pointer since we cannot apparently rewind it
if ($this->isbz)
{
$this->close();
$this->open();
}
else
{
fseek($this->fp, 0);
}
// Write out the files
$size = 0;
while ($buffer = $fzread($this->fp, 512))
{
$tmp = unpack("A6magic", substr($buffer, 257, 6));
if (trim($tmp['magic']) == 'ustar')
{
$tmp = unpack("A100name", $buffer);
$filename = trim($tmp['name']);
$tmp = unpack("Atype", substr($buffer, 156, 1));
$filetype = (int) trim($tmp['type']);
if ($filetype != 5)
{ {
$tmp = unpack("A12size", substr($buffer, 124, 12)); $tmp = unpack("A12size", substr($buffer, 124, 12));
$filesize = octdec((int) trim($tmp['size'])); $filesize = octdec((int) trim($tmp['size']));
@ -499,6 +535,12 @@ class compress_tar extends compress
} }
unset($data); unset($data);
} }
function open($mode, $file)
{
$fzopen = ($this->isbz && function_exists('bzopen')) ? 'bzopen' : (($this->isgz && extension_loaded('zlib')) ? 'gzopen' : 'fopen');
return $this->fp = @$fzopen($this->file, $this->mode . 'b');
}
} }
?> ?>