sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8015 from owncloud/storageinfo-reuse 

Allow reusing FileInfo for getStorageInfo
remotes/origin/ldap_group_count
Vincent Petry 2014-04-04 10:18:02 +07:00
parent 0805f678cc da5541ac02
commit 8a10c44eb3
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files/index.php
Unescape Escape View File

@ -39,7 +39,7 @@ OCP\App::setActiveNavigationEntry('files_index');
// Load the files
$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
$dir = \OC\Files\Filesystem::normalizePath($dir);
$dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
$dirInfo = \OC\Files\Filesystem::getFileInfo($dir, false);
// Redirect if directory does not exist
if (!$dirInfo || !$dirInfo->getType() === 'dir') {
header('Location: ' . OCP\Util::getScriptName() . '');
@ -70,7 +70,7 @@ $config = \OC::$server->getConfig();
$permissions = $dirInfo->getPermissions();
// information about storage capacities
$storageInfo=OC_Helper::getStorageInfo($dir);
$storageInfo=OC_Helper::getStorageInfo($dir, $dirInfo);
$freeSpace=$storageInfo['free'];
$uploadLimit=OCP\Util::uploadLimit();
$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir, $freeSpace);

9
lib/private/helper.php
Unescape Escape View File

@ -875,12 +875,15 @@ class OC_Helper {
* Calculate the disc space for the given path
*
* @param string $path
* @param \OCP\Files\FileInfo $rootInfo (optional)
* @return array
*/
public static function getStorageInfo($path) {
public static function getStorageInfo($path, $rootInfo = null) {
// return storage info without adding mount points
$rootInfo = \OC\Files\Filesystem::getFileInfo($path, false);
$used = $rootInfo['size'];
if (is_null($rootInfo)) {
$rootInfo = \OC\Files\Filesystem::getFileInfo($path, false);
}
$used = $rootInfo->getSize();
if ($used < 0) {
$used = 0;
}