diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-20 06:29:01 +0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-20 06:29:01 +0400 |
| commit | b4a72c3116657a194e4270adc37ab660d66e89fd (patch) | |
| tree | 7bbf69dc6aa9d35ad581f08060875b29d12bb442 /files_archive | |
| parent | 26cf92bcf1aa62b115c5f4b97ff464e3c575b276 (diff) | |
| parent | de4d05a5a66a8bcdc0e89827aa025db4ca62535c (diff) | |
Merge branch 'share_api'
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
Diffstat (limited to 'files_archive')
| -rw-r--r-- | files_archive/js/archive.js | 4 | ||||
| -rw-r--r-- | files_archive/lib/storage.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/files_archive/js/archive.js b/files_archive/js/archive.js index 9fb9853e2..6bcbe0926 100644 --- a/files_archive/js/archive.js +++ b/files_archive/js/archive.js @@ -7,11 +7,11 @@ $(document).ready(function() { if(typeof FileActions!=='undefined'){ - FileActions.register('application/zip','Open','',function(filename){ + FileActions.register('application/zip','Open', FileActions.PERMISSION_READ, '',function(filename){ window.location=OC.linkTo('files', 'index.php')+'&dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename); }); FileActions.setDefault('application/zip','Open'); - FileActions.register('application/x-gzip','Open','',function(filename){ + FileActions.register('application/x-gzip','Open', FileActions.PERMISSION_READ, '',function(filename){ window.location=OC.linkTo('files', 'index.php')+'&dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename); }); FileActions.setDefault('application/x-gzip','Open'); diff --git a/files_archive/lib/storage.php b/files_archive/lib/storage.php index ca36e76b4..3c14c3e1f 100644 --- a/files_archive/lib/storage.php +++ b/files_archive/lib/storage.php @@ -89,10 +89,10 @@ class OC_Filestorage_Archive extends OC_Filestorage_Common{ return $this->archive->fileExists($path.'/')?'dir':'file'; } } - public function is_readable($path){ + public function isReadable($path){ return is_readable($this->path); } - public function is_writable($path){ + public function isUpdatable($path){ return is_writable($this->path); } public function file_exists($path){ |