handle versions expire for home storages with unlimited quota

This commit is contained in:
Robin Appelman 2015-10-14 13:51:20 +02:00 committed by Thomas Müller
parent 416da0dfe9
commit 22c5c19376
1 changed files with 12 additions and 8 deletions

View File

@ -676,17 +676,21 @@ class Storage {
// calculate available space for version history
// subtract size of files and current versions size from quota
if ($softQuota) {
$files_view = new \OC\Files\View('/'.$uid.'/files');
$rootInfo = $files_view->getFileInfo('/', false);
$free = $quota-$rootInfo['size']; // remaining free space for user
if ( $free > 0 ) {
$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - ($versionsSize + $offset); // how much space can be used for versions
if ($quota >= 0) {
if ($softQuota) {
$files_view = new \OC\Files\View('/' . $uid . '/files');
$rootInfo = $files_view->getFileInfo('/', false);
$free = $quota - $rootInfo['size']; // remaining free space for user
if ($free > 0) {
$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - ($versionsSize + $offset); // how much space can be used for versions
} else {
$availableSpace = $free - $versionsSize - $offset;
}
} else {
$availableSpace = $free - $versionsSize - $offset;
$availableSpace = $quota - $offset;
}
} else {
$availableSpace = $quota - $offset;
$availableSpace = PHP_INT_MAX;
}
$allVersions = Storage::getVersions($uid, $filename);