wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix checkstyle on archive zip/tar

Browse source
This commit is contained in:
Jörn Friedrich Dreyer 2012-10-05 12:39:43 +02:00
parent 00b34a09ea
commit b5f11195af
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/archive.php
View file

@ -13,14 +13,14 @@ abstract class OC_Archive{
* @return OC_Archive
*/
public static function open($path) {
$ext=substr($path,strrpos($path,'.'));
$ext=substr($path, strrpos($path, '.'));
switch($ext) {
case '.zip':
return new OC_Archive_ZIP($path);
case '.gz':
case '.bz':
case '.bz2':
if(strpos($path,'.tar.')) {
if(strpos($path, '.tar.')) {
return new OC_Archive_TAR($path);
}
break;
@ -126,9 +126,9 @@ abstract class OC_Archive{
continue;
}
if(is_dir($source.'/'.$file)) {
$this->addRecursive($path.'/'.$file,$source.'/'.$file);
$this->addRecursive($path.'/'.$file, $source.'/'.$file);
}else{
$this->addFile($path.'/'.$file,$source.'/'.$file);
$this->addFile($path.'/'.$file, $source.'/'.$file);
}
}
}

5
lib/archive/tar.php
View file

@ -127,7 +127,10 @@ class OC_Archive_TAR extends OC_Archive{
$this->cachedHeaders = $this->tar->listContent();
}
foreach($this->cachedHeaders as $header) {
if($file==$header['filename'] or $file.'/'==$header['filename'] or '/'.$file.'/'==$header['filename'] or '/'.$file==$header['filename']) {
if( $file == $header['filename']
or $file.'/' == $header['filename']
or '/'.$file.'/' == $header['filename']
or '/'.$file == $header['filename']) {
return $header;
}
}

7
lib/archive/zip.php
View file

@ -86,7 +86,7 @@ class OC_Archive_ZIP extends OC_Archive{
$pathLength=strlen($path);
foreach($files as $file) {
if(substr($file, 0, $pathLength)==$path and $file!=$path) {
if(strrpos(substr($file, 0, -1),'/')<=$pathLength) {
if(strrpos(substr($file, 0, -1), '/')<=$pathLength) {
$folderContent[]=substr($file, $pathLength);
}
}
@ -161,7 +161,10 @@ class OC_Archive_ZIP extends OC_Archive{
function getStream($path,$mode) {
if($mode=='r' or $mode=='rb') {
return $this->zip->getStream($path);
}else{//since we cant directly get a writable stream, make a temp copy of the file and put it back in the archive when the stream is closed
} else {
//since we cant directly get a writable stream,
//make a temp copy of the file and put it back
//in the archive when the stream is closed
if(strrpos($path, '.')!==false) {
$ext=substr($path, strrpos($path, '.'));
}else{