Skip to content

Commit

Permalink
Same treatment as JArchiveBzip2 and JArchiveGzip
Browse files Browse the repository at this point in the history 
isolating JError into a temporary method.
  • Loading branch information
@Mathewlenning
Mathewlenning committed Mar 20, 2015
1 parent 07a64bf commit e14e8b7
Showing 1 changed file with 70 additions and 149 deletions.
219 changes: 70 additions & 149 deletions libraries/joomla/archive/zip.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,24 +126,34 @@ public function extract($archive, $destination, array $options = array())
{
if (!is_file($archive))
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Archive does not exist');
}
else
{
throw new RuntimeException('Archive does not exist');
}
return $this->raiseWarning(100, 'Archive does not exist');
}

if ($this->hasNativeSupport())
{
return $this->extractNative($archive, $destination);
}
else

return $this->extractCustom($archive, $destination);
}

/**
* Temporary private method to isolate JError from the extract method
* This code should be removed when JError is removed.
*
* @param int $code The application-internal error code for this error
* @param string $msg The error message, which may also be shown the user if need be.
*
* @return mixed JError object or Runtime Exception
*/
private function raiseWarning($code, $msg)
{
if (class_exists('JError'))
{
return $this->extractCustom($archive, $destination);
return JError::raiseWarning($code, $msg);
}

throw new RuntimeException($msg);
}

/**
Expand Down Expand Up @@ -185,10 +195,8 @@ public function checkZipData(&$data)
{
return false;
}
else
{
return true;
}

return true;
}

/**
Expand All @@ -209,40 +217,19 @@ protected function extractCustom($archive, $destination)

if (!extension_loaded('zlib'))
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Zlib not supported');
}
else
{
throw new RuntimeException('Zlib not supported');
}
return $this->raiseWarning(100, 'Zlib not supported');
}

$this->_data = file_get_contents($archive);

if (!$this->_data)
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Unable to read archive (zip)');
}
else
{
throw new RuntimeException('Unable to read archive (zip)');
}
return $this->raiseWarning(100, 'Unable to read archive (zip)');
}

if (!$this->_readZipInfo($this->_data))
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Get ZIP Information failed');
}
else
{
throw new RuntimeException('Get ZIP Information failed');
}
return $this->raiseWarning(100, 'Get ZIP Information failed');
}

for ($i = 0, $n = count($this->_metadata); $i < $n; $i++)
Expand All @@ -257,26 +244,12 @@ protected function extractCustom($archive, $destination)
// Make sure the destination folder exists
if (!JFolder::create(dirname($path)))
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Unable to create destination');
}
else
{
throw new RuntimeException('Unable to create destination');
}
return $this->raiseWarning(100, 'Unable to create destination');
}

if (JFile::write($path, $buffer) === false)
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Unable to write entry');
}
else
{
throw new RuntimeException('Unable to write entry');
}
return $this->raiseWarning(100, 'Unable to write entry');
}
}
}
Expand All @@ -299,72 +272,40 @@ protected function extractNative($archive, $destination)
{
$zip = zip_open($archive);

if (is_resource($zip))
if (!is_resource($zip))
{
// Make sure the destination folder exists
if (!JFolder::create($destination))
return $this->raiseWarning(100, 'Unable to open archive');
}

// Make sure the destination folder exists
if (!JFolder::create($destination))
{
return $this->raiseWarning(100, 'Unable to create destination');
}

// Read files in the archive
while ($file = @zip_read($zip))
{
if (!zip_entry_open($zip, $file, "r"))
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Unable to create destination');
}
else
{
throw new RuntimeException('Unable to create destination');
}
return $this->raiseWarning(100, 'Unable to read entry');
}

// Read files in the archive
while ($file = @zip_read($zip))
if (substr(zip_entry_name($file), strlen(zip_entry_name($file)) - 1) != "/")
{
if (zip_entry_open($zip, $file, "r"))
{
if (substr(zip_entry_name($file), strlen(zip_entry_name($file)) - 1) != "/")
{
$buffer = zip_entry_read($file, zip_entry_filesize($file));

if (JFile::write($destination . '/' . zip_entry_name($file), $buffer) === false)
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Unable to write entry');
}
else
{
throw new RuntimeException('Unable to write entry');
}
}

zip_entry_close($file);
}
}
else
$buffer = zip_entry_read($file, zip_entry_filesize($file));

if (JFile::write($destination . '/' . zip_entry_name($file), $buffer) === false)
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Unable to read entry');
}
else
{
throw new RuntimeException('Unable to read entry');
}
return $this->raiseWarning(100, 'Unable to write entry');
}
}

@zip_close($zip);
}
else
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Unable to open archive');
}
else
{
throw new RuntimeException('Unable to open archive');
zip_entry_close($file);
}
}

@zip_close($zip);

return true;
}

Expand Down Expand Up @@ -425,14 +366,7 @@ private function _readZipInfo(&$data)
{
if ($dataLength < $fhStart + 31)
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Invalid Zip Data');
}
else
{
throw new RuntimeException('Invalid Zip Data');
}
return $this->raiseWarning(100, 'Invalid Zip Data');
}

$info = unpack('vMethod/VTime/VCRC32/VCompressed/VUncompressed/vLength', substr($data, $fhStart + 10, 20));
Expand Down Expand Up @@ -462,14 +396,7 @@ private function _readZipInfo(&$data)

if ($dataLength < $fhStart + 43)
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Invalid ZIP data');
}
else
{
throw new RuntimeException('Invalid ZIP data');
}
return $this->raiseWarning(100, 'Invalid ZIP data');
}

$info = unpack('vInternal/VExternal/VOffset', substr($data, $fhStart + 36, 10));
Expand All @@ -484,14 +411,7 @@ private function _readZipInfo(&$data)

if ($dataLength < $lfhStart + 34)
{
if (class_exists('JError'))
{
return JError::raiseWarning(100, 'Invalid Zip Data');
}
else
{
throw new RuntimeException('Invalid Zip Data');
}
return $this->raiseWarning(100, 'Invalid Zip Data');
}

$info = unpack('vMethod/VTime/VCRC32/VCompressed/VUncompressed/vLength/vExtraLength', substr($data, $lfhStart + 8, 25));
Expand Down Expand Up @@ -520,22 +440,25 @@ private function _readZipInfo(&$data)
*/
private function _getFileData($key)
{
if ($this->_metadata[$key]['_method'] == 0x8)
{
return gzinflate(substr($this->_data, $this->_metadata[$key]['_dataStart'], $this->_metadata[$key]['csize']));
}
elseif ($this->_metadata[$key]['_method'] == 0x0)
$method = $this->_metadata[$key]['_method'];

if ($method == 0x12 && !extension_loaded('bz2'))
{
/* Files that aren't compressed. */
return substr($this->_data, $this->_metadata[$key]['_dataStart'], $this->_metadata[$key]['csize']);
return '';
}
elseif ($this->_metadata[$key]['_method'] == 0x12)

switch ($method)
{
// If bz2 extension is loaded use it
if (extension_loaded('bz2'))
{
case 0x8:
return gzinflate(substr($this->_data, $this->_metadata[$key]['_dataStart'], $this->_metadata[$key]['csize']));

case 0x0:
// Files that aren't compressed.
return substr($this->_data, $this->_metadata[$key]['_dataStart'], $this->_metadata[$key]['csize']);

case 0x12:

return bzdecompress(substr($this->_data, $this->_metadata[$key]['_dataStart'], $this->_metadata[$key]['csize']));
}
}

return '';
Expand Down Expand Up @@ -710,9 +633,7 @@ private function _createZIPFile(array &$contents, array &$ctrlDir, $path)
{
return false;
}
else
{
return true;
}

return true;
}
}

0 comments on commit e14e8b7

Please sign in to comment.