diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/ajax/upload.php | 2 | ||||
| -rw-r--r-- | apps/files/index.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/lib/sharedstorage.php | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index a4dcd80a2e2..dc830570403 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -38,7 +38,7 @@ $totalSize=0; foreach($files['size'] as $size) { $totalSize+=$size; } -if($totalSize>OC_Filesystem::free_space('/')) { +if($totalSize>OC_Filesystem::free_space($dir)){ OCP\JSON::error(array("data" => array( "message" => "Not enough space available" ))); exit(); } diff --git a/apps/files/index.php b/apps/files/index.php index 240fc029fcc..a65ffe732a1 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -85,7 +85,7 @@ $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize') $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $maxUploadFilesize = min($upload_max_filesize, $post_max_size); -$freeSpace=OC_Filesystem::free_space('/'); +$freeSpace=OC_Filesystem::free_space($dir); $freeSpace=max($freeSpace,0); $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace); diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 6dba76955a0..7271dcc930b 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -108,6 +108,14 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common { return $internalPath; } + public function getOwner($target) { + $shared_item = OCP\Share::getItemSharedWith('folder', $target, OC_Share_Backend_File::FORMAT_SHARED_STORAGE); + if ($shared_item) { + return $shared_item[0]["uid_owner"]; + } + return null; + } + public function mkdir($path) { if ($path == '' || $path == '/' || !$this->isCreatable(dirname($path))) { return false; |