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

Fix merge conflict

This commit is contained in:
Thomas Müller 2014-06-03 19:05:21 +02:00
parent 2bb902d028
commit 8ee15025f0
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,39 +312,8 @@ class Storage {
return $query->execute(array($uid));
}
/**
<<<<<<< HEAD
* get the size of all stored versions from a given user
* @param string $uid id from the user
* @return int size of versions
*/
private static function calculateSize($uid) {
if (\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED) == 'true') {
$view = new \OC\Files\View('/' . $uid . '/files_versions');
$size = 0;
$dirContent = $view->getDirectoryContent('/');
while (!empty($dirContent)) {
$path = reset($dirContent);
if ($path['type'] === 'dir') {
$dirContent = array_merge($dirContent, $view->getDirectoryContent(substr($path['path'], strlen('files_versions'))));
} else {
$size += $view->filesize(substr($path['path'], strlen('files_versions')));
}
unset($dirContent[key($dirContent)]);
}
return $size;
}
}
/**
* returns all stored file versions from a given user
=======
* @brief returns all stored file versions from a given user
>>>>>>> 2f97e2f... let file cache handle the versions size
* @param string $uid id of the user
* @return array with contains two arrays 'all' which contains all versions sorted by age and 'by_file' which contains all versions sorted by filename
*/