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

fix quota calculation for trash and versions

This commit is contained in:
Björn Schießle 2013-03-04 12:17:57 +01:00
parent 36a1bcb732
commit 94dab96dba
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_trashbin/lib/trash.php
View File

@ -108,7 +108,7 @@ class Trashbin {
if ( $quota === null || $quota === 'default') { if ( $quota === null || $quota === 'default') {
$quota = \OC_Appconfig::getValue('files', 'default_quota'); $quota = \OC_Appconfig::getValue('files', 'default_quota');
} }
if ( $quota === null ) { if ( $quota === null || $quote === 'none' ) {
$quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers()); $quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers());
} else { } else {
$quota = \OCP\Util::computerFileSize($quota); $quota = \OCP\Util::computerFileSize($quota);

6
apps/files_versions/lib/versions.php
View File

@ -351,11 +351,11 @@ class Storage {
$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions'); $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
// get available disk space for user // get available disk space for user
$quota = \OC_Preferences::getValue($uid, 'files', 'quota'); $quota = \OC_Preferences::getValue($user, 'files', 'quota');
if ( $quota === null ) { if ( $quota === null || $quota === 'default') {
$quota = \OC_Appconfig::getValue('files', 'default_quota'); $quota = \OC_Appconfig::getValue('files', 'default_quota');
} }
if ( $quota === null ) { if ( $quota === null || $quote === 'none' ) {
$quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers()); $quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers());
} else { } else {
$quota = \OCP\Util::computerFileSize($quota); $quota = \OCP\Util::computerFileSize($quota);