diff options
Diffstat (limited to 'lib/filestorage')
-rw-r--r-- | lib/filestorage/common.php | 62 | ||||
-rw-r--r-- | lib/filestorage/commontest.php | 26 | ||||
-rw-r--r-- | lib/filestorage/local.php | 96 | ||||
-rw-r--r-- | lib/filestorage/temporary.php | 6 |
4 files changed, 95 insertions, 95 deletions
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php index e2828e56170..351714437c5 100644 --- a/lib/filestorage/common.php +++ b/lib/filestorage/common.php @@ -34,20 +34,20 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { - public function __construct($parameters){} + public function __construct($parameters) {} // abstract public function mkdir($path); // abstract public function rmdir($path); // abstract public function opendir($path); - public function is_dir($path){ + public function is_dir($path) { return $this->filetype($path)=='dir'; } - public function is_file($path){ + public function is_file($path) { return $this->filetype($path)=='file'; } // abstract public function stat($path); // abstract public function filetype($path); public function filesize($path) { - if($this->is_dir($path)){ + if($this->is_dir($path)) { return 0;//by definition }else{ $stat = $this->stat($path); @@ -80,11 +80,11 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { } public function file_get_contents($path) { $handle = $this->fopen($path, "r"); - if(!$handle){ + if(!$handle) { return false; } $size=$this->filesize($path); - if($size==0){ + if($size==0) { return ''; } return fread($handle, $size); @@ -94,8 +94,8 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { return fwrite($handle, $data); } // abstract public function unlink($path); - public function rename($path1,$path2){ - if($this->copy($path1,$path2)){ + public function rename($path1,$path2) { + if($this->copy($path1,$path2)) { return $this->unlink($path1); }else{ return false; @@ -181,19 +181,19 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { } } - public function getMimeType($path){ - if(!$this->file_exists($path)){ + public function getMimeType($path) { + if(!$this->file_exists($path)) { return false; } - if($this->is_dir($path)){ + if($this->is_dir($path)) { return 'httpd/unix-directory'; } $source=$this->fopen($path,'r'); - if(!$source){ + if(!$source) { return false; } $head=fread($source,8192);//8kb should suffice to determine a mimetype - if($pos=strrpos($path,'.')){ + if($pos=strrpos($path,'.')) { $extension=substr($path,$pos); }else{ $extension=''; @@ -204,25 +204,25 @@ 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); return $hash; } // abstract public function free_space($path); - public function search($query){ + public function search($query) { return $this->searchInDir($query); } - public function getLocalFile($path){ + public function getLocalFile($path) { return $this->toTmpFile($path); } - private function toTmpFile($path){//no longer in the storage api, still usefull here + private function toTmpFile($path) {//no longer in the storage api, still usefull here $source=$this->fopen($path,'r'); - if(!$source){ + if(!$source) { return false; } - if($pos=strrpos($path,'.')){ + if($pos=strrpos($path,'.')) { $extension=substr($path,$pos); }else{ $extension=''; @@ -232,16 +232,16 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { OC_Helper::streamCopy($source,$target); return $tmpFile; } - public function getLocalFolder($path){ + public function getLocalFolder($path) { $baseDir=OC_Helper::tmpFolder(); $this->addLocalFolder($path,$baseDir); return $baseDir; } - private function addLocalFolder($path,$target){ - if($dh=$this->opendir($path)){ - while($file=readdir($dh)){ - if($file!=='.' and $file!=='..'){ - if($this->is_dir($path.'/'.$file)){ + private function addLocalFolder($path,$target) { + if($dh=$this->opendir($path)) { + while($file=readdir($dh)) { + if($file!=='.' and $file!=='..') { + if($this->is_dir($path.'/'.$file)) { mkdir($target.'/'.$file); $this->addLocalFolder($path.'/'.$file,$target.'/'.$file); }else{ @@ -254,16 +254,16 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { } // abstract public function touch($path, $mtime=null); - protected function searchInDir($query,$dir=''){ + protected function searchInDir($query,$dir='') { $files=array(); $dh=$this->opendir($dir); - if($dh){ - while($item=readdir($dh)){ + if($dh) { + while($item=readdir($dh)) { if ($item == '.' || $item == '..') continue; - if(strstr(strtolower($item),strtolower($query))!==false){ + if(strstr(strtolower($item),strtolower($query))!==false) { $files[]=$dir.'/'.$item; } - if($this->is_dir($dir.'/'.$item)){ + if($this->is_dir($dir.'/'.$item)) { $files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item)); } } @@ -276,7 +276,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { * @param int $time * @return bool */ - public function hasUpdated($path,$time){ + public function hasUpdated($path,$time) { return $this->filemtime($path)>$time; } } diff --git a/lib/filestorage/commontest.php b/lib/filestorage/commontest.php index 4d06e4fa321..b88bb232c36 100644 --- a/lib/filestorage/commontest.php +++ b/lib/filestorage/commontest.php @@ -32,44 +32,44 @@ class OC_Filestorage_CommonTest extends OC_Filestorage_Common{ */ private $storage; - public function __construct($params){ + public function __construct($params) { $this->storage=new OC_Filestorage_Local($params); } - public function mkdir($path){ + public function mkdir($path) { return $this->storage->mkdir($path); } - public function rmdir($path){ + public function rmdir($path) { return $this->storage->rmdir($path); } - public function opendir($path){ + public function opendir($path) { return $this->storage->opendir($path); } - public function stat($path){ + public function stat($path) { return $this->storage->stat($path); } - public function filetype($path){ + public function filetype($path) { return $this->storage->filetype($path); } - public function isReadable($path){ + public function isReadable($path) { return $this->storage->isReadable($path); } - public function isUpdatable($path){ + public function isUpdatable($path) { return $this->storage->isUpdatable($path); } - public function file_exists($path){ + public function file_exists($path) { return $this->storage->file_exists($path); } - public function unlink($path){ + public function unlink($path) { return $this->storage->unlink($path); } - public function fopen($path,$mode){ + public function fopen($path,$mode) { return $this->storage->fopen($path,$mode); } - public function free_space($path){ + public function free_space($path) { return $this->storage->free_space($path); } - public function touch($path, $mtime=null){ + public function touch($path, $mtime=null) { return $this->storage->touch($path,$mtime); } }
\ No newline at end of file diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index b19205f45b1..e26d3d3ef91 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -4,67 +4,67 @@ */ class OC_Filestorage_Local extends OC_Filestorage_Common{ protected $datadir; - public function __construct($arguments){ + public function __construct($arguments) { $this->datadir=$arguments['datadir']; - if(substr($this->datadir,-1)!=='/'){ + if(substr($this->datadir,-1)!=='/') { $this->datadir.='/'; } } - public function mkdir($path){ + public function mkdir($path) { return @mkdir($this->datadir.$path); } - public function rmdir($path){ + public function rmdir($path) { return @rmdir($this->datadir.$path); } - public function opendir($path){ + public function opendir($path) { return opendir($this->datadir.$path); } - public function is_dir($path){ - if(substr($path,-1)=='/'){ + public function is_dir($path) { + if(substr($path,-1)=='/') { $path=substr($path,0,-1); } return is_dir($this->datadir.$path); } - public function is_file($path){ + public function is_file($path) { return is_file($this->datadir.$path); } - public function stat($path){ + public function stat($path) { return stat($this->datadir.$path); } - public function filetype($path){ + public function filetype($path) { $filetype=filetype($this->datadir.$path); - if($filetype=='link'){ + if($filetype=='link') { $filetype=filetype(realpath($this->datadir.$path)); } return $filetype; } - public function filesize($path){ - if($this->is_dir($path)){ + public function filesize($path) { + if($this->is_dir($path)) { return 0; }else{ return filesize($this->datadir.$path); } } - public function isReadable($path){ + public function isReadable($path) { return is_readable($this->datadir.$path); } - public function isUpdatable($path){ + public function isUpdatable($path) { return is_writable($this->datadir.$path); } - public function file_exists($path){ + public function file_exists($path) { return file_exists($this->datadir.$path); } - public function filectime($path){ + public function filectime($path) { return filectime($this->datadir.$path); } - public function filemtime($path){ + public function filemtime($path) { return filemtime($this->datadir.$path); } - public function touch($path, $mtime=null){ + public function touch($path, $mtime=null) { // sets the modification time of the file to the given value. // If mtime is nil the current time is set. // note that the access time of the file always changes to the current time. - if(!is_null($mtime)){ + if(!is_null($mtime)) { $result=touch( $this->datadir.$path, $mtime ); }else{ $result=touch( $this->datadir.$path); @@ -75,32 +75,32 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return $result; } - public function file_get_contents($path){ + public function file_get_contents($path) { return file_get_contents($this->datadir.$path); } - public function file_put_contents($path,$data){ + public function file_put_contents($path,$data) { return file_put_contents($this->datadir.$path,$data); } - public function unlink($path){ + public function unlink($path) { return $this->delTree($path); } - public function rename($path1,$path2){ + public function rename($path1,$path2) { if (!$this->isUpdatable($path1)) { OC_Log::write('core','unable to rename, file is not writable : '.$path1,OC_Log::ERROR); return false; } - if(! $this->file_exists($path1)){ + if(! $this->file_exists($path1)) { OC_Log::write('core','unable to rename, file does not exists : '.$path1,OC_Log::ERROR); return false; } - if($return=rename($this->datadir.$path1,$this->datadir.$path2)){ + if($return=rename($this->datadir.$path1,$this->datadir.$path2)) { } return $return; } - public function copy($path1,$path2){ - if($this->is_dir($path2)){ - if(!$this->file_exists($path2)){ + public function copy($path1,$path2) { + if($this->is_dir($path2)) { + if(!$this->file_exists($path2)) { $this->mkdir($path2); } $source=substr($path1,strrpos($path1,'/')+1); @@ -108,9 +108,9 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ } return copy($this->datadir.$path1,$this->datadir.$path2); } - public function fopen($path,$mode){ - if($return=fopen($this->datadir.$path,$mode)){ - switch($mode){ + public function fopen($path,$mode) { + if($return=fopen($this->datadir.$path,$mode)) { + switch($mode) { case 'r': break; case 'r+': @@ -127,8 +127,8 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return $return; } - public function getMimeType($path){ - if($this->isReadable($path)){ + public function getMimeType($path) { + if($this->isReadable($path)) { return OC_Helper::getMimeType($this->datadir.$path); }else{ return false; @@ -142,46 +142,46 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ if (!is_dir($dir) || is_link($dir)) return unlink($dir); foreach (scandir($dir) as $item) { if ($item == '.' || $item == '..') continue; - if(is_file($dir.'/'.$item)){ - if(unlink($dir.'/'.$item)){ + if(is_file($dir.'/'.$item)) { + if(unlink($dir.'/'.$item)) { } - }elseif(is_dir($dir.'/'.$item)){ - if (!$this->delTree($dirRelative. "/" . $item)){ + }elseif(is_dir($dir.'/'.$item)) { + if (!$this->delTree($dirRelative. "/" . $item)) { return false; }; } } - if($return=rmdir($dir)){ + if($return=rmdir($dir)) { } return $return; } - public function hash($path,$type,$raw=false){ + public function hash($path,$type,$raw=false) { return hash_file($type,$this->datadir.$path,$raw); } - public function free_space($path){ + public function free_space($path) { return disk_free_space($this->datadir.$path); } - public function search($query){ + public function search($query) { return $this->searchInDir($query); } - public function getLocalFile($path){ + public function getLocalFile($path) { return $this->datadir.$path; } - public function getLocalFolder($path){ + public function getLocalFolder($path) { return $this->datadir.$path; } - protected function searchInDir($query,$dir=''){ + protected function searchInDir($query,$dir='') { $files=array(); foreach (scandir($this->datadir.$dir) as $item) { if ($item == '.' || $item == '..') continue; - if(strstr(strtolower($item),strtolower($query))!==false){ + if(strstr(strtolower($item),strtolower($query))!==false) { $files[]=$dir.'/'.$item; } - if(is_dir($this->datadir.$dir.'/'.$item)){ + if(is_dir($this->datadir.$dir.'/'.$item)) { $files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item)); } } @@ -193,7 +193,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ * @param int $time * @return bool */ - public function hasUpdated($path,$time){ + public function hasUpdated($path,$time) { return $this->filemtime($path)>$time; } } diff --git a/lib/filestorage/temporary.php b/lib/filestorage/temporary.php index 8f2373c8e95..876ba045a63 100644 --- a/lib/filestorage/temporary.php +++ b/lib/filestorage/temporary.php @@ -3,15 +3,15 @@ * local storage backnd in temporary folder for testing purpores */ class OC_Filestorage_Temporary extends OC_Filestorage_Local{ - public function __construct($arguments){ + public function __construct($arguments) { $this->datadir=OC_Helper::tmpFolder(); } - public function cleanUp(){ + public function cleanUp() { OC_Helper::rmdirr($this->datadir); } - public function __destruct(){ + public function __destruct() { $this->cleanUp(); } } |