aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-08-09 15:30:08 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-08-09 15:30:08 +0000
commit2efff507368029dcb8a31750c7768fc3bfc39114 (patch)
treeefeea7d227b4b3afe94db9c6301b3cb364ba769f /phpBB
parent5e79ac7d8f981bed29e48364422c6e68da04536c (diff)
downloadforums-2efff507368029dcb8a31750c7768fc3bfc39114.tar
forums-2efff507368029dcb8a31750c7768fc3bfc39114.tar.gz
forums-2efff507368029dcb8a31750c7768fc3bfc39114.tar.bz2
forums-2efff507368029dcb8a31750c7768fc3bfc39114.tar.xz
forums-2efff507368029dcb8a31750c7768fc3bfc39114.zip
It's amazing what a strategically placed = can do for normal operation ...
git-svn-id: file:///svn/phpbb/trunk@4356 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_compress.php43
1 files changed, 24 insertions, 19 deletions
diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php
index f3a8f6272e..0ddfc62612 100644
--- a/phpBB/includes/functions_compress.php
+++ b/phpBB/includes/functions_compress.php
@@ -99,7 +99,7 @@ class compress_zip extends compress
{
var $datasec = array();
var $ctrl_dir = array();
- var $eof_ctrl_dir = 0x06054b50;
+ var $eof_cdh = "\x50\x4b\x05\x06\x00\x00\x00\x00";
var $old_offset = 0;
var $datasec_len = 0;
@@ -144,11 +144,11 @@ class compress_zip extends compress
{
$buffer = fread($this->fp, 46);
- $tmp = unpack("Vcrc/Vc_size/Vuc_size/vstrlen", substr($buffer, 16, 14));
+ $tmp = unpack("vc_method/Vmtime/Vcrc/Vc_size/Vuc_size/vstrlen", substr($buffer, 10, 20));
+ $c_method = (int) trim($tmp['c_method']);
$crc = (int) trim($tmp['crc']);
$strlen = (int) trim($tmp['strlen']);
$uc_size = (int) trim($tmp['uc_size']);
- $c_size = (int) trim($tmp['c_size']);
$tmp = unpack("Vattrib/Voffset", substr($buffer, 38, 8));
$attrib = (int) trim($tmp['attrib']);
@@ -158,10 +158,10 @@ class compress_zip extends compress
if ($attrib == 32)
{
+ $seek_ary[$j]['c_method'] = $c_method;
$seek_ary[$j]['crc'] = $crc;
$seek_ary[$j]['strlen'] = $strlen;
$seek_ary[$j]['uc_size'] = $uc_size;
- $seek_ary[$j]['c_size'] = $c_size;
$seek_ary[$j]['offset'] = $offset;
$seek_ary[$j]['filename'] = $dst . $filename;
@@ -192,12 +192,16 @@ class compress_zip extends compress
{
$filename = $seek['filename'];
+// fseek($this->fp, $seek['offset'] + 8); // To grab file header info
+// fseek($this->fp, $seek['offset'] + 30 + $tmp['strlen'] + $tmp['c_size']); // To grab file header info2
+
+ // Jump to data
fseek($this->fp, $seek['offset'] + 30 + $seek['strlen']);
// Was data compressed? If so we have to fudge a solution thanks
// to some "issues" with gzuncompress. Else we just write out the
// data
- if ($seek['uc_size'] != $seek['c_size'])
+ if ($seek['c_method'] == 8)
{
// Temp gzip file -> .gz header -> data -> gz footer
if (!($fp = fopen($filename . '.gz', 'wb')))
@@ -234,7 +238,7 @@ class compress_zip extends compress
trigger_error("Could not create $filename");
}
- fwrite($fp, fread($this->fp, $seek['c_size']));
+ fwrite($fp, fread($this->fp, $seek['uc_size']));
fclose($fp);
}
}
@@ -270,7 +274,7 @@ class compress_zip extends compress
$c_len = strlen($zdata);
// Did we compress? No, then use data as is
- if ($c_len > $unc_len)
+ if ($c_len >= $unc_len)
{
$zdata = $data;
$c_len = $unc_len;
@@ -281,8 +285,13 @@ class compress_zip extends compress
// If we didn't compress set method to store, else deflate
$c_method = ($c_len == $unc_len) ? "\x00\x00" : "\x08\x00";
+ // Are we a file or a directory? Set archive for file
+ $attrib = ($is_dir) ? 16 : 32;
+ $var_ext = ($is_dir) ? "\x0a" : "\x14";
+
+ // File Record Header
$fr = "\x50\x4b\x03\x04"; // Local file header 4bytes
- $fr .= "\x14\x00"; // ver needed to extract 2bytes
+ $fr .= "$var_ext\x00"; // ver needed to extract 2bytes
$fr .= "\x00\x00"; // gen purpose bit flag 2bytes
$fr .= $c_method; // compression method 2bytes
$fr .= $hexdtime; // last mod time and date 2+2bytes
@@ -290,6 +299,7 @@ class compress_zip extends compress
$fr .= pack('V', $c_len); // compressed filesize 4bytes
$fr .= pack('V', $unc_len); // uncompressed filesize 4bytes
$fr .= pack('v', strlen($name));// length of filename 2bytes
+
$fr .= pack('v', 0); // extra field length 2bytes
$fr .= $name;
$fr .= $zdata;
@@ -300,17 +310,14 @@ class compress_zip extends compress
$this->datasec_len += strlen($fr);
- // Add data to file ... by writing data out incrementally we
- // save some memory
+ // Add data to file ... by writing data out incrementally we save some memory
fwrite($this->fp, $fr);
unset($fr);
- // Are we a file or a directory? Set archive for file
- $attrib = ($is_dir) ? 16 : 32;
-
+ // Central Directory Header
$cdrec = "\x50\x4b\x01\x02"; // header 4bytes
$cdrec .= "\x00\x00"; // version made by
- $cdrec .= "\x14\x00"; // version needed to extract
+ $cdrec .= "$var_ext\x00"; // version needed to extract
$cdrec .= "\x00\x00"; // gen purpose bit flag
$cdrec .= $c_method; // compression method
$cdrec .= $hexdtime; // last mod time & date
@@ -322,7 +329,7 @@ class compress_zip extends compress
$cdrec .= pack('v', 0); // file comment length
$cdrec .= pack('v', 0); // disk number start
$cdrec .= pack('v', 0); // internal file attributes
- $cdrec .= pack('V', $attrib); // external file attributes
+ $cdrec .= pack('V', $attrib); // external file attributes
$cdrec .= pack('V', $this->old_offset); // relative offset of local header
$cdrec .= $name;
@@ -335,15 +342,13 @@ class compress_zip extends compress
function file()
{
$ctrldir = implode('', $this->ctrl_dir);
- $comment = 'Created by phpBB 2.2';
- return $ctrldir . "\x50\x4b\x05\x06\x00\x00\x00\x00" .
+ return $ctrldir . $this->eof_cdh .
pack('v', sizeof($this->ctrl_dir)) . // total # of entries "on this disk"
pack('v', sizeof($this->ctrl_dir)) . // total # of entries overall
pack('V', strlen($ctrldir)) . // size of central dir
pack('V', $this->datasec_len) . // offset to start of central dir
- pack('v', strlen($comment)) . // .zip file comment length
- $comment;
+ "\x00\x00"; // .zip file comment length
}
}
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-15 16:41:41 +0000