Skip to content
Snippets Groups Projects
Commit 7afccd0a authored by Andreas Gohr's avatar Andreas Gohr
Browse files

Revert "handle bzip1 as well"

This reverts commit f2cb3ec7.

Turns out I was too fast merging this. I can't get PHP's bzip handler to
handle a bzip1 compressed file.
parent d0cf0750
No related branches found
No related tags found
No related merge requests found
......@@ -73,7 +73,7 @@ class Tar_TestCase extends DokuWikiTest {
public function test_tarcontent() {
$dir = dirname(__FILE__).'/tar';
foreach(array('tar', 'tgz', 'tbz', 'tbz2') as $ext) {
foreach(array('tar', 'tgz', 'tbz') as $ext) {
$tar = new Tar();
$file = "$dir/test.$ext";
......@@ -96,7 +96,7 @@ class Tar_TestCase extends DokuWikiTest {
$dir = dirname(__FILE__).'/tar';
$out = sys_get_temp_dir().'/dwtartest'.md5(time());
foreach(array('tar', 'tgz', 'tbz', 'tbz2') as $ext) {
foreach(array('tar', 'tgz', 'tbz') as $ext) {
$tar = new Tar();
$file = "$dir/test.$ext";
......@@ -122,7 +122,7 @@ class Tar_TestCase extends DokuWikiTest {
$dir = dirname(__FILE__).'/tar';
$out = sys_get_temp_dir().'/dwtartest'.md5(time());
foreach(array('tar', 'tgz', 'tbz', 'tbz2') as $ext) {
foreach(array('tar', 'tgz', 'tbz') as $ext) {
$tar = new Tar();
$file = "$dir/test.$ext";
......@@ -148,7 +148,7 @@ class Tar_TestCase extends DokuWikiTest {
$dir = dirname(__FILE__).'/tar';
$out = sys_get_temp_dir().'/dwtartest'.md5(time());
foreach(array('tar', 'tgz', 'tbz', 'tbz2') as $ext) {
foreach(array('tar', 'tgz', 'tbz') as $ext) {
$tar = new Tar();
$file = "$dir/test.$ext";
......@@ -174,7 +174,7 @@ class Tar_TestCase extends DokuWikiTest {
$dir = dirname(__FILE__).'/tar';
$out = sys_get_temp_dir().'/dwtartest'.md5(time());
foreach(array('tar', 'tgz', 'tbz', 'tbz2') as $ext) {
foreach(array('tar', 'tgz', 'tbz') as $ext) {
$tar = new Tar();
$file = "$dir/test.$ext";
......@@ -199,7 +199,7 @@ class Tar_TestCase extends DokuWikiTest {
$dir = dirname(__FILE__).'/tar';
$out = sys_get_temp_dir().'/dwtartest'.md5(time());
foreach(array('tar', 'tgz', 'tbz', 'tbz2') as $ext) {
foreach(array('tar', 'tgz', 'tbz') as $ext) {
$tar = new Tar();
$file = "$dir/test.$ext";
......@@ -229,10 +229,6 @@ class Tar_TestCase extends DokuWikiTest {
$this->assertEquals(Tar::COMPRESS_GZIP, $tar->filetype('foo.tar.gz'));
$this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tbz'));
$this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tBZ'));
$this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tbz2'));
$this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tBZ2'));
$this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tar.bz'));
$this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tar.BZ'));
$this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tar.BZ2'));
$this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tar.bz2'));
}
......@@ -320,4 +316,4 @@ class Tar_TestCase extends DokuWikiTest {
TestUtils::rdelete($out);
}
}
}
\ No newline at end of file
......@@ -618,7 +618,7 @@ class Tar {
$file = strtolower($file);
if(substr($file, -3) == '.gz' || substr($file, -4) == '.tgz') {
$comptype = Tar::COMPRESS_GZIP;
} elseif(substr($file, -4) == '.bz2' || substr($file, -3) == '.bz' || substr($file, -4) == '.tbz' || substr($file, -5) == ".tbz2") {
} elseif(substr($file, -4) == '.bz2' || substr($file, -4) == '.tbz') {
$comptype = Tar::COMPRESS_BZIP;
} else {
$comptype = Tar::COMPRESS_NONE;
......
......@@ -195,7 +195,7 @@ class ap_download extends ap_manage {
if (substr($target, -1) == "/") $target = substr($target, 0, -1);
$ext = $this->guess_archive($file);
if (in_array($ext, array('tar','bz','bz2','gz'))) {
if (in_array($ext, array('tar','bz','gz'))) {
switch($ext){
case 'bz':
$compress_type = Tar::COMPRESS_BZIP;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment