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

*** empty log message ***

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5377 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2005-12-25 11:12:03 +00:00
parent b9b70c9ceb
commit 4373cf2f30
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
phpBB/includes/functions_compress.php
View file

@ -159,7 +159,7 @@ class compress_zip extends compress
function extract($dst) function extract($dst)
{ {
// Loop the file, looking for files and folders // Loop the file, looking for files and folders
$ddTry = false; $dd_try = false;
fseek($this->fp, 0); fseek($this->fp, 0);
while (true) while (true)
@ -198,30 +198,35 @@ class compress_zip extends compress
'offset' => $file['offset'] 'offset' => $file['offset']
); );
break; break;
case "\x50\x4b\x01\x02": case "\x50\x4b\x01\x02":
fread($this->fp, 24); fread($this->fp, 24);
fread($this->fp, 12 + current(unpack("v", fread($this->fp, 2))) + current(unpack("v", fread($this->fp, 2))) + current(unpack("v", fread($this->fp, 2)))); fread($this->fp, 12 + current(unpack("v", fread($this->fp, 2))) + current(unpack("v", fread($this->fp, 2))) + current(unpack("v", fread($this->fp, 2))));
break; break;
// We safely end the loop as we are totally finished with looking for files and folders // We safely end the loop as we are totally finished with looking for files and folders
case "\x50\x4b\x05\x06": case "\x50\x4b\x05\x06":
break 2; break 2;
// Look for the next signature... // Look for the next signature...
case 'PK00': case 'PK00':
continue 2; continue 2;
// We have encountered a header that is weird. Lets look for better data... // We have encountered a header that is weird. Lets look for better data...
default: default:
if(!$ddTry) if (!$dd_try)
{ {
// Unexpected header. Trying to detect wrong placed 'Data Descriptor'; // Unexpected header. Trying to detect wrong placed 'Data Descriptor';
$ddTry = true; $dd_try = true;
fseek($this->fp, 8, SEEK_CUR); // Jump over 'crc-32'(4) 'compressed-size'(4), 'uncompressed-size'(4) fseek($this->fp, 8, SEEK_CUR); // Jump over 'crc-32'(4) 'compressed-size'(4), 'uncompressed-size'(4)
continue 2; continue 2;
} }
trigger_error("Unexpected header, ending loop"); trigger_error("Unexpected header, ending loop");
break 2; break 2;
} }
$ddTry = false; $dd_try = false;
} }
if (sizeof($seek_ary)) if (sizeof($seek_ary))
{ {
foreach ($seek_ary as $filename => $trash) foreach ($seek_ary as $filename => $trash)
@ -232,10 +237,12 @@ class compress_zip extends compress
{ {
$str = ''; $str = '';
$folders = explode('/', $dirname); $folders = explode('/', $dirname);
// Create and folders and subfolders if they do not exist // Create and folders and subfolders if they do not exist
foreach ($folders as $folder) foreach ($folders as $folder)
{ {
$str = (!empty($str)) ? $str . '/' . $folder : $folder; $str = (!empty($str)) ? $str . '/' . $folder : $folder;
if(!is_dir("$dst$str")) if(!is_dir("$dst$str"))
{ {
if (!@mkdir("$dst$str", 0777)) if (!@mkdir("$dst$str", 0777))
@ -247,7 +254,7 @@ class compress_zip extends compress
} }
} }
if(substr($filename, -1, 1) == '/') if (substr($filename, -1, 1) == '/')
{ {
continue; continue;
} }
@ -255,7 +262,7 @@ class compress_zip extends compress
$target_filename = "$dst$filename"; $target_filename = "$dst$filename";
$fdetails = &$seek_ary[$filename]; $fdetails = &$seek_ary[$filename];
if(!$fdetails['uc_size']) if (!$fdetails['uc_size'])
{ {
$fp = fopen($target_filename, "w"); $fp = fopen($target_filename, "w");
fwrite($fp, ''); fwrite($fp, '');
@ -265,7 +272,8 @@ class compress_zip extends compress
fseek($this->fp, $fdetails['offset']); fseek($this->fp, $fdetails['offset']);
$mode = $fdetails['c_method']; $mode = $fdetails['c_method'];
$content = fread($this->fp, $fdetails['c_size']); $content = fread($this->fp, $fdetails['c_size']);
switch($mode)
switch ($mode)
{ {
case 0: case 0:
// Not compressed // Not compressed
@ -273,6 +281,7 @@ class compress_zip extends compress
fwrite($fp, $content); fwrite($fp, $content);
fclose($fp); fclose($fp);
break; break;
case 8: case 8:
// Deflate // Deflate
$fp = fopen($target_filename, "w"); $fp = fopen($target_filename, "w");