Skip to content

[stable19] Change free space calculation #22553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Sep 4, 2020
Merged

[stable19] Change free space calculation #22553

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a5045e
Change free space calculation
kesselb Aug 31, 2020
82239d8
Tests only: Forward calls to getUserValue and getAppValue
kesselb Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Change free space calculation 
Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
@kesselb @backportbot
kesselb authored and backportbot[bot] committed Sep 3, 2020
commit 0a5045ec8e38593c53647fe82d8ccc8f61eb66b8
10 changes: 6 additions & 4 deletions apps/files_trashbin/lib/Trashbin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,11 +708,13 @@ public static function deleteUser($uid) {
*/
private static function calculateFreeSpace($trashbinSize, $user) {
$config = \OC::$server->getConfig();
$systemTrashbinSize = (int)$config->getAppValue('files_trashbin', 'trashbin_size', '-1');
$userTrashbinSize = (int)$config->getUserValue($user, 'files_trashbin', 'trashbin_size', '-1');
$configuredTrashbinSize = ($userTrashbinSize < 0) ? $systemTrashbinSize : $userTrashbinSize;
if ($configuredTrashbinSize) {
return $configuredTrashbinSize - $trashbinSize;
if ($userTrashbinSize > -1) {
return $userTrashbinSize - $trashbinSize;
}
$systemTrashbinSize = (int)$config->getAppValue('files_trashbin', 'trashbin_size', '-1');
if ($systemTrashbinSize > -1) {
return $systemTrashbinSize - $trashbinSize;
}

$softQuota = true;
Expand Down