mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14454 from nextcloud/feature/noid/use-node-api-for-trashbin 

Use node API for trash bin with special flag for getSize()
This commit is contained in:
Roeland Jago Douma 2019-03-01 13:22:16 +01:00 committed by GitHub
parent fb5a2496e2 4704e719ed
commit d0d1c85def
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/files_trashbin/lib/Trashbin.php
View File

@ -680,10 +680,11 @@ class Trashbin {
// calculate available space for trash bin // calculate available space for trash bin
// subtract size of files and current trash bin size from quota // subtract size of files and current trash bin size from quota
if ($softQuota) { if ($softQuota) {
$files_view = new View('/' . $user . '/files'); $userFolder = \OC::$server->getUserFolder($user);
$rootInfo = $files_view->getFileInfo('/', false); if(is_null($userFolder)) {
$free = $quota - $rootInfo['size']; // remaining free space for user return 0;
}
$free = $quota - $userFolder->getSize(false); // remaining free space for user
if ($free > 0) { if ($free > 0) {
$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
} else { } else {