upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Previous commit was not based on master, retry. Removed broken tar cutter, double extensions are not possible in temp files. Added tar support. Fixed extension switch.

Browse source
This commit is contained in:
Remco Brenninkmeijer 2014-08-04 14:10:09 +02:00
parent d1aaa7a12e
commit cb842ba793
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/archive.php
View file

@ -20,11 +20,8 @@ abstract class OC_Archive{
case '.gz':
case '.bz':
case '.bz2':
if(strpos($path, '.tar.')) {
return new OC_Archive_TAR($path);
}
break;
case '.tgz':
case '.tar':
return new OC_Archive_TAR($path);
}
}

10
lib/private/archive/tar.php
View file

@ -40,12 +40,14 @@ class OC_Archive_TAR extends OC_Archive{
if(strpos($file, '.')) {
$extension=substr($file, strrpos($file, '.'));
switch($extension) {
case 'gz':
case 'tgz':
case '.gz':
case '.tgz':
return self::GZIP;
case 'bz':
case 'bz2':
case '.bz':
case '.bz2':
return self::BZIP;
case '.tar':
return self::PLAIN;
default:
return self::PLAIN;
}