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

Use owner when expiring versions, not the logged in user

This commit is contained in:
Vincent Petry 2015-05-13 18:40:35 +02:00
parent 4789e87a53
commit 033b3dac92
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/files_versions/lib/storage.php
View File

@ -158,7 +158,7 @@ class Storage {
// 1.5 times as large as the current version -> 2.5
$neededSpace = $files_view->filesize($filename) * 2.5;
self::scheduleExpire($filename, $versionsSize, $neededSpace);
self::scheduleExpire($uid, $filename, $versionsSize, $neededSpace);
// store a new version of a file
$mtime = $users_view->filemtime('files/' . $filename);
@ -276,7 +276,7 @@ class Storage {
// if we moved versions directly for a file, schedule expiration check for that file
if (!$rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
self::scheduleExpire($targetPath);
self::scheduleExpire($targetOwner, $targetPath);
}
}
@ -309,7 +309,7 @@ class Storage {
// rollback
if (self::copyFileContents($users_view, 'files_versions' . $filename . '.v' . $revision, 'files' . $filename)) {
$files_view->touch($file, $revision);
Storage::scheduleExpire($file);
Storage::scheduleExpire($uid, $file);
return true;
} else if ($versionCreated) {
self::deleteVersion($users_view, $version);
@ -532,12 +532,15 @@ class Storage {
}
/**
* @param string $fileName
* @param int|null $versionsSize
* @param int $neededSpace
* Schedule versions expiration for the given file
*
* @param string $uid owner of the file
* @param string $fileName file/folder for which to schedule expiration
* @param int|null $versionsSize current versions size
* @param int $neededSpace requested versions size
*/
private static function scheduleExpire($fileName, $versionsSize = null, $neededSpace = 0) {
$command = new Expire(\OC::$server->getUserSession()->getUser()->getUID(), $fileName, $versionsSize, $neededSpace);
private static function scheduleExpire($uid, $fileName, $versionsSize = null, $neededSpace = 0) {
$command = new Expire($uid, $fileName, $versionsSize, $neededSpace);
\OC::$server->getCommandBus()->push($command);
}