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

Merge pull request #11186 from owncloud/trash-fixdoubledeleteracecondition 

Added extra check to avoid deleting key folders
This commit is contained in:
Vincent Petry 2014-09-22 16:36:23 +02:00
parent 70937dabcd 8aca127e52
commit 828ae65681
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/files_trashbin/lib/trashbin.php
View File

@ -142,6 +142,12 @@ class Trashbin {
$user = \OCP\User::getUser();
$size = 0;
list($owner, $ownerPath) = self::getUidAndFilename($file_path);
// file has been deleted in between
if (empty($ownerPath)) {
return false;
}
self::setUpTrash($user);
$view = new \OC\Files\View('/' . $user);
@ -219,6 +225,10 @@ class Trashbin {
$rootView = new \OC\Files\View('/');
list($owner, $ownerPath) = self::getUidAndFilename($file_path);
// file has been deleted in between
if (empty($ownerPath)) {
return 0;
}
if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) {
$size += self::calculateSize(new \OC\Files\View('/' . $owner . '/files_versions/' . $ownerPath));
@ -262,6 +272,11 @@ class Trashbin {
list($owner, $ownerPath) = self::getUidAndFilename($file_path);
// file has been deleted in between
if (empty($ownerPath)) {
return 0;
}
$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user);
// disable proxy to prevent recursive calls
@ -440,6 +455,12 @@ class Trashbin {
list($owner, $ownerPath) = self::getUidAndFilename($target);
// file has been deleted in between
if (empty($ownerPath)) {
\OC_FileProxy::$enabled = $proxyStatus;
return false;
}
if ($timestamp) {
$versionedFile = $filename;
} else {
@ -484,6 +505,11 @@ class Trashbin {
list($owner, $ownerPath) = self::getUidAndFilename($target);
// file has been deleted in between
if (empty($ownerPath)) {
return false;
}
$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user);
if ($util->isSystemWideMountPoint($ownerPath)) {