diff options
author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-24 17:42:07 -0400 |
---|---|---|
committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-24 20:10:28 -0400 |
commit | f7b89f047504740224f664917d6588c1fe203877 (patch) | |
tree | 5cce4d672681a025466dce8b7237cf17b652eab9 /lib | |
parent | c60c6024a7f02fc9548bc8b8f45f02efa1f9346f (diff) | |
download | nextcloud-server-f7b89f047504740224f664917d6588c1fe203877.tar.gz nextcloud-server-f7b89f047504740224f664917d6588c1fe203877.zip |
Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()
Diffstat (limited to 'lib')
-rw-r--r-- | lib/filestorage.php | 7 | ||||
-rw-r--r-- | lib/filestorage/common.php | 13 | ||||
-rw-r--r-- | lib/filestorage/local.php | 4 | ||||
-rw-r--r-- | lib/filesystem.php | 21 | ||||
-rw-r--r-- | lib/filesystemview.php | 25 |
5 files changed, 62 insertions, 8 deletions
diff --git a/lib/filestorage.php b/lib/filestorage.php index 71ef4aed00b..c104fca87fe 100644 --- a/lib/filestorage.php +++ b/lib/filestorage.php @@ -33,8 +33,11 @@ abstract class OC_Filestorage{ abstract public function stat($path); abstract public function filetype($path); abstract public function filesize($path); - abstract public function is_readable($path); - abstract public function is_writable($path); + abstract public function isCreatable($path); + abstract public function isReadable($path); + abstract public function isUpdatable($path); + abstract public function isDeletable($path); + abstract public function isSharable($path); abstract public function file_exists($path); abstract public function filectime($path); abstract public function filemtime($path); diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php index ba78fca80e5..633c2fdfc76 100644 --- a/lib/filestorage/common.php +++ b/lib/filestorage/common.php @@ -54,8 +54,17 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { return $stat['size']; } } -// abstract public function is_readable($path); -// abstract public function is_writable($path); + public function isCreatable($path) { + return $this->isUpdatable($path); + } +// abstract public function isReadable($path); +// abstract public function isUpdatable($path); + public function isDeletable($path) { + return $this->isUpdatable($path); + } + public function isSharable($path) { + return $this->isReadable($path); + } // abstract public function file_exists($path); public function filectime($path) { $stat = $this->stat($path); diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index b2eba051515..b8b9cd0812c 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -46,10 +46,10 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ return filesize($this->datadir.$path); } } - public function is_readable($path){ + public function isReadable($path){ return is_readable($this->datadir.$path); } - public function is_writable($path){ + public function isUpdatable($path){ return is_writable($this->datadir.$path); } public function file_exists($path){ diff --git a/lib/filesystem.php b/lib/filesystem.php index 65318fa3ab6..5dfcaa107b8 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -421,12 +421,33 @@ class OC_Filesystem{ static public function readfile($path){ return self::$defaultInstance->readfile($path); } + /** + * @deprecated Replaced by isReadable() as part of CRUDS + */ static public function is_readable($path){ return self::$defaultInstance->is_readable($path); } + /** + * @deprecated Replaced by isCreatable(), isUpdatable(), isDeletable() as part of CRUDS + */ static public function is_writable($path){ return self::$defaultInstance->is_writable($path); } + static public function isCreatable($path) { + return self::$defaultInstance->isCreatable($path); + } + static public function isReadable($path) { + return self::$defaultInstance->isReadable($path); + } + static public function isUpdatable($path) { + return self::$defaultInstance->isUpdatable($path); + } + static public function isDeletable($path) { + return self::$defaultInstance->isDeletable($path); + } + static public function isSharable($path) { + return self::$defaultInstance->isSharable($path); + } static public function file_exists($path){ return self::$defaultInstance->file_exists($path); } diff --git a/lib/filesystemview.php b/lib/filesystemview.php index 448663bb081..05731299467 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -197,11 +197,32 @@ class OC_FilesystemView { } return false; } + /** + * @deprecated Replaced by isReadable() as part of CRUDS + */ public function is_readable($path){ - return $this->basicOperation('is_readable',$path); + return $this->basicOperation('isReadable',$path); } + /** + * @deprecated Replaced by isCreatable(), isUpdatable(), isDeletable() as part of CRUDS + */ public function is_writable($path){ - return $this->basicOperation('is_writable',$path); + return $this->basicOperation('isUpdatable',$path); + } + public function isCreatable($path) { + return $this->basicOperation('isCreatable', $path); + } + public function isReadable($path) { + return $this->basicOperation('isReadable', $path); + } + public function isUpdatable($path) { + return $this->basicOperation('isUpdatable', $path); + } + public function isDeletable($path) { + return $this->basicOperation('isDeletable', $path); + } + public function isSharable($path) { + return $this->basicOperation('isSharable', $path); } public function file_exists($path){ if($path=='/'){ |