starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ZipFile class

Browse Source
This commit is contained in:
DariusIII
2018-07-23 13:29:32 +02:00
parent f6ec108ba3
commit b7d8ddcb44
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changelog
+1
View File
@@ -1,4 +1,5 @@
2018-07-23 DariusIII
* Chg: Update ZipFile class
* Chg: Update imdbphp/imdbphp to latest commit
2018-07-20 DariusIII
* Chg: Update \Blacklight\db\PreDb class
libs/ZipFile.php
+12 -19
View File
@@ -33,28 +33,28 @@ class ZipFile
*
* @var array $datasec
*/
var $datasec = array();
public $datasec = [];
/**
* Central directory
*
* @var array $ctrl_dir
*/
var $ctrl_dir = array();
public $ctrl_dir = [];
/**
* End of central directory record
*
* @var string $eof_ctrl_dir
*/
var $eof_ctrl_dir = "\x50\x4b\x05\x06\x00\x00\x00\x00";
public $eof_ctrl_dir = "\x50\x4b\x05\x06\x00\x00\x00\x00";
/**
* Last offset position
*
* @var integer $old_offset
*/
var $old_offset = 0;
public $old_offset = 0;
/**
@@ -67,8 +67,9 @@ class ZipFile
*
* @access private
*/
function unix2DosTime($unixtime = 0) {
$timearray = ($unixtime == 0) ? getdate() : getdate($unixtime);
private function unix2DosTime($unixtime = 0): int
{
$timearray = ($unixtime === 0) ? getdate() : getdate($unixtime);
if ($timearray['year'] < 1980) {
$timearray['year'] = 1980;
@@ -93,7 +94,7 @@ class ZipFile
*
* @access public
*/
function addFile($data, $name, $time = 0)
public function addFile($data, $name, $time = 0): void
{
$name = str_replace('\\', '/', $name);
@@ -114,7 +115,7 @@ class ZipFile
$unc_len = strlen($data);
$crc = crc32($data);
$zdata = gzcompress($data);
$zdata = substr(substr($zdata, 0, strlen($zdata) - 4), 2); // fix crc bug
$zdata = substr(substr($zdata, 0, -4), 2); // fix crc bug
$c_len = strlen($zdata);
$fr .= pack('V', $crc); // crc32
$fr .= pack('V', $c_len); // compressed filesize
@@ -126,14 +127,6 @@ class ZipFile
// "file data" segment
$fr .= $zdata;
// "data descriptor" segment (optional but necessary if archive is not
// served as file)
// nijel(2004-10-19): this seems not to be needed at all and causes
// problems in some cases (bug #1037737)
//$fr .= pack('V', $crc); // crc32
//$fr .= pack('V', $c_len); // compressed filesize
//$fr .= pack('V', $unc_len); // uncompressed filesize
// add this entry to array
$this -> datasec[] = $fr;
@@ -172,7 +165,7 @@ class ZipFile
*
* @access public
*/
function file()
public function file(): string
{
$data = implode('', $this -> datasec);
$ctrldir = implode('', $this -> ctrl_dir);
@@ -181,8 +174,8 @@ class ZipFile
$data .
$ctrldir .
$this -> eof_ctrl_dir .
pack('v', sizeof($this -> ctrl_dir)) . // total # of entries "on this disk"
pack('v', sizeof($this -> ctrl_dir)) . // total # of entries overall
pack('v', count($this -> ctrl_dir)) . // total # of entries "on this disk"
pack('v', count($this -> ctrl_dir)) . // total # of entries overall
pack('V', strlen($ctrldir)) . // size of central dir
pack('V', strlen($data)) . // offset to start of central dir
"\x00\x00"; // .zip file comment length