ignore "Shared"-directory when calculating free space

Conflicts: lib/fileproxy/quota.php
14 years ago · 814cab97cf
parent ca41f2e96a
commit 814cab97cf
1 changed files with 4 additions and 2 deletions
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@ -54,8 +54,10 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 	 * @return int
 	 */
 	private function getFreeSpace(){
-		$rootInfo=OC_FileCache::get('');
-		$usedSpace=$rootInfo['size'];
+		$rootInfo=OC_FileCache_Cached::get('');
+		$sharedInfo=OC_FileCache_Cached::get('/Shared');
+		$usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
+		$usedSpace=isset($sharedInfo['size'])?$rootInfo['size']-$sharedInfo['size']:$rootInfo['size'];
 		$totalSpace=$this->getQuota();
 		if($totalSpace==0){
 			return 0;