summaryrefslogtreecommitdiffstats
path: root/lib/archive
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2012-11-04 08:59:45 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2012-11-04 08:59:45 -0800
commit8ac3849a95bd6a733cce9134bab4bf38c5c0fadd (patch)
tree5fc42258625fa612348f701f0dd334ee476bdd4d /lib/archive
parent8c4c74b23f268b232e3f591ea564c018597ee82d (diff)
parent30d7993e0105a6c98cbf61d4253d08acf236aca7 (diff)
downloadnextcloud-server-8ac3849a95bd6a733cce9134bab4bf38c5c0fadd.tar.gz
nextcloud-server-8ac3849a95bd6a733cce9134bab4bf38c5c0fadd.zip
Merge pull request #238 from fmms/checkstyle04
Checkstyle fixes
Diffstat (limited to 'lib/archive')
-rw-r--r--lib/archive/tar.php6
-rw-r--r--lib/archive/zip.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index 6e0629a0e18..6c264686991 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -23,7 +23,7 @@ class OC_Archive_TAR extends OC_Archive{
private $path;
function __construct($source) {
- $types=array(null,'gz','bz');
+ $types=array(null, 'gz', 'bz');
$this->path=$source;
$this->tar=new Archive_Tar($source, $types[self::getTarType($source)]);
}
@@ -309,7 +309,7 @@ class OC_Archive_TAR extends OC_Archive{
if($mode=='r' or $mode=='rb') {
return fopen($tmpFile, $mode);
}else{
- OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
+ OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack');
self::$tempFiles[$tmpFile]=$path;
return fopen('close://'.$tmpFile, $mode);
}
@@ -334,7 +334,7 @@ class OC_Archive_TAR extends OC_Archive{
$this->tar->_close();
$this->tar=null;
}
- $types=array(null,'gz','bz');
+ $types=array(null, 'gz', 'bz');
$this->tar=new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
}
}
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index 5a6fc578be7..1c967baa08f 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -171,7 +171,7 @@ class OC_Archive_ZIP extends OC_Archive{
$ext='';
}
$tmpFile=OCP\Files::tmpFile($ext);
- OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
+ OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack');
if($this->fileExists($path)) {
$this->extractFile($path, $tmpFile);
}