diff options
| author | Felix Moeller <mail@felixmoeller.de> | 2012-11-04 11:10:46 +0100 |
|---|---|---|
| committer | Felix Moeller <mail@felixmoeller.de> | 2012-11-04 11:10:46 +0100 |
| commit | 30d7993e0105a6c98cbf61d4253d08acf236aca7 (patch) | |
| tree | bbf0cf871a65a2cb897f3a4ea405cf3ca3980c47 /lib/filestorage | |
| parent | f8d1d7787e1112842db81a629dfd84b586fbebda (diff) | |
| download | nextcloud-server-30d7993e0105a6c98cbf61d4253d08acf236aca7.tar.gz nextcloud-server-30d7993e0105a6c98cbf61d4253d08acf236aca7.zip | |
Checkstyle fixes: NoSpaceAfterComma
Diffstat (limited to 'lib/filestorage')
| -rw-r--r-- | lib/filestorage/common.php | 4 | ||||
| -rw-r--r-- | lib/filestorage/local.php | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php index 3c06570d890..b97eb79d8d4 100644 --- a/lib/filestorage/common.php +++ b/lib/filestorage/common.php @@ -204,7 +204,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { unlink($tmpFile); return $mime; } - public function hash($type,$path, $raw = false) { + public function hash($type, $path, $raw = false) { $tmpFile=$this->getLocalFile(); $hash=hash($type, $tmpFile, $raw); unlink($tmpFile); @@ -264,7 +264,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { $files[]=$dir.'/'.$item; } if($this->is_dir($dir.'/'.$item)) { - $files=array_merge($files,$this->searchInDir($query, $dir.'/'.$item)); + $files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item)); } } } diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index 89e994120ca..2dde0093d4b 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -86,11 +86,11 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ } public function rename($path1, $path2) { if (!$this->isUpdatable($path1)) { - OC_Log::write('core','unable to rename, file is not writable : '.$path1,OC_Log::ERROR); + OC_Log::write('core','unable to rename, file is not writable : '.$path1, OC_Log::ERROR); return false; } if(! $this->file_exists($path1)) { - OC_Log::write('core','unable to rename, file does not exists : '.$path1,OC_Log::ERROR); + OC_Log::write('core','unable to rename, file does not exists : '.$path1, OC_Log::ERROR); return false; } @@ -103,7 +103,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ if(!$this->file_exists($path2)) { $this->mkdir($path2); } - $source=substr($path1, strrpos($path1,'/')+1); + $source=substr($path1, strrpos($path1, '/')+1); $path2.=$source; } return copy($this->datadir.$path1, $this->datadir.$path2); @@ -156,8 +156,8 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return $return; } - public function hash($path,$type, $raw=false) { - return hash_file($type,$this->datadir.$path, $raw); + public function hash($path, $type, $raw=false) { + return hash_file($type, $this->datadir.$path, $raw); } public function free_space($path) { @@ -182,7 +182,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ $files[]=$dir.'/'.$item; } if(is_dir($this->datadir.$dir.'/'.$item)) { - $files=array_merge($files,$this->searchInDir($query, $dir.'/'.$item)); + $files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item)); } } return $files; |