wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix trashbin when deleting a file over an external share

Browse source
This commit is contained in:
Robin Appelman 2014-08-08 15:00:47 +02:00
parent fa260b1649
commit 07d5725de2
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/files_sharing/publicwebdav.php
View file

@ -54,7 +54,6 @@ $server->subscribeEvent('beforeMethod', function () use ($server, $objectTree, $
$ownerView = \OC\Files\Filesystem::getView(); $ownerView = \OC\Files\Filesystem::getView();
$path = $ownerView->getPath($fileId); $path = $ownerView->getPath($fileId);
$view = new \OC\Files\View($ownerView->getAbsolutePath($path)); $view = new \OC\Files\View($ownerView->getAbsolutePath($path));
$rootInfo = $view->getFileInfo(''); $rootInfo = $view->getFileInfo('');

6
apps/files_trashbin/lib/trashbin.php
View file

@ -22,6 +22,8 @@
namespace OCA\Files_Trashbin; namespace OCA\Files_Trashbin;
use OC\Files\Filesystem;
class Trashbin { class Trashbin {
// how long do we keep files in the trash bin if no other value is defined in the config file (unit: days) // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
@ -99,7 +101,9 @@ class Trashbin {
* @param string $file_path path to the deleted file/directory relative to the files root directory * @param string $file_path path to the deleted file/directory relative to the files root directory
*/ */
public static function move2trash($file_path) { public static function move2trash($file_path) {
$user = \OCP\User::getUser(); // get the user for which the filesystem is setup
$root = Filesystem::getRoot();
list(, $user) = explode('/', $root);
$size = 0; $size = 0;
list($owner, $ownerPath) = self::getUidAndFilename($file_path); list($owner, $ownerPath) = self::getUidAndFilename($file_path);
self::setUpTrash($user); self::setUpTrash($user);