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

Merge pull request #27043 from nextcloud/storage-info-include-external 

fix return value of getStorageInfo when 'quota_include_external_storage' is enabled
This commit is contained in:
Morris Jobke 2021-05-25 21:57:23 +02:00 committed by GitHub
parent 1b47886abb 7e22487278
commit 6ed728d76c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/private/legacy/OC_Helper.php
View File

@ -45,6 +45,8 @@
*/ */
use bantu\IniGetWrapper\IniGetWrapper; use bantu\IniGetWrapper\IniGetWrapper;
use OCP\Files\Mount\IMountPoint;
use OCP\IUser;
use Symfony\Component\Process\ExecutableFinder; use Symfony\Component\Process\ExecutableFinder;
/** /**
@ -518,7 +520,7 @@ class OC_Helper {
$quota = OC_Util::getUserQuota($user); $quota = OC_Util::getUserQuota($user);
if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) { if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
// always get free space / total space from root + mount points // always get free space / total space from root + mount points
return self::getGlobalStorageInfo($quota); return self::getGlobalStorageInfo($quota, $user, $mount);
} }
} }
@ -570,11 +572,8 @@ class OC_Helper {
/** /**
* Get storage info including all mount points and quota * Get storage info including all mount points and quota
*
* @param int $quota
* @return array
*/ */
private static function getGlobalStorageInfo($quota) { private static function getGlobalStorageInfo(int $quota, IUser $user, IMountPoint $mount): array {
$rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext'); $rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
$used = $rootInfo['size']; $used = $rootInfo['size'];
if ($used < 0) { if ($used < 0) {
@ -594,12 +593,22 @@ class OC_Helper {
$relative = 0; $relative = 0;
} }
if (substr_count($mount->getMountPoint(), '/') < 3) {
$mountPoint = '';
} else {
[,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4);
}
return [ return [
'free' => $free, 'free' => $free,
'used' => $used, 'used' => $used,
'total' => $total, 'total' => $total,
'relative' => $relative, 'relative' => $relative,
'quota' => $quota 'quota' => $quota,
'owner' => $user->getUID(),
'ownerDisplayName' => $user->getDisplayName(),
'mountType' => $mount->getMountType(),
'mountPoint' => trim($mountPoint, '/'),
]; ];
} }