nextcloud / server

apps/files_trashbin/lib/Sabre/AbstractTrash.php

Indentation +45 added lines, -45 removed lines

@@ -28,63 +28,63 @@
 use OCP\IUser;
 
 abstract class AbstractTrash implements ITrash {
-	/** @var ITrashItem */
-	protected $data;
+    /** @var ITrashItem */
+    protected $data;
 
-	/** @var ITrashManager */
-	protected $trashManager;
+    /** @var ITrashManager */
+    protected $trashManager;
 
-	public function __construct(ITrashManager $trashManager, ITrashItem $data) {
-		$this->trashManager = $trashManager;
-		$this->data = $data;
-	}
+    public function __construct(ITrashManager $trashManager, ITrashItem $data) {
+        $this->trashManager = $trashManager;
+        $this->data = $data;
+    }
 
-	public function getFilename(): string {
-		return $this->data->getName();
-	}
+    public function getFilename(): string {
+        return $this->data->getName();
+    }
 
-	public function getDeletionTime(): int {
-		return $this->data->getDeletedTime();
-	}
+    public function getDeletionTime(): int {
+        return $this->data->getDeletedTime();
+    }
 
-	public function getFileId(): int {
-		return $this->data->getId();
-	}
+    public function getFileId(): int {
+        return $this->data->getId();
+    }
 
-	public function getFileInfo(): FileInfo {
-		return $this->data;
-	}
+    public function getFileInfo(): FileInfo {
+        return $this->data;
+    }
 
-	public function getSize(): int {
-		return $this->data->getSize();
-	}
+    public function getSize(): int {
+        return $this->data->getSize();
+    }
 
-	public function getLastModified(): int {
-		return $this->data->getMtime();
-	}
+    public function getLastModified(): int {
+        return $this->data->getMtime();
+    }
 
-	public function getContentType(): string {
-		return $this->data->getMimetype();
-	}
+    public function getContentType(): string {
+        return $this->data->getMimetype();
+    }
 
-	public function getETag(): string {
-		return $this->data->getEtag();
-	}
+    public function getETag(): string {
+        return $this->data->getEtag();
+    }
 
-	public function getName(): string {
-		return $this->data->getName();
-	}
+    public function getName(): string {
+        return $this->data->getName();
+    }
 
-	public function getOriginalLocation(): string {
-		return $this->data->getOriginalLocation();
-	}
+    public function getOriginalLocation(): string {
+        return $this->data->getOriginalLocation();
+    }
 
-	public function delete() {
-		$this->trashManager->removeItem($this->data);
-	}
+    public function delete() {
+        $this->trashManager->removeItem($this->data);
+    }
 
-	public function restore(): bool {
-		$this->trashManager->restoreItem($this->data);
-		return true;
-	}
+    public function restore(): bool {
+        $this->trashManager->restoreItem($this->data);
+        return true;
+    }
 }

apps/files_trashbin/lib/Sabre/RestoreFolder.php

Indentation +33 added lines, -33 removed lines

@@ -31,48 +31,48 @@
 
 
 class RestoreFolder implements ICollection, IMoveTarget {
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
 
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
 
-	public function getChild($name) {
-		return null;
-	}
+    public function getChild($name) {
+        return null;
+    }
 
-	public function delete() {
-		throw new Forbidden();
-	}
+    public function delete() {
+        throw new Forbidden();
+    }
 
-	public function getName() {
-		return 'restore';
-	}
+    public function getName() {
+        return 'restore';
+    }
 
-	public function setName($name) {
-		throw new Forbidden();
-	}
+    public function setName($name) {
+        throw new Forbidden();
+    }
 
-	public function getLastModified(): int {
-		return 0;
-	}
+    public function getLastModified(): int {
+        return 0;
+    }
 
-	public function getChildren(): array {
-		return [];
-	}
+    public function getChildren(): array {
+        return [];
+    }
 
-	public function childExists($name): bool {
-		return false;
-	}
+    public function childExists($name): bool {
+        return false;
+    }
 
-	public function moveInto($targetName, $sourcePath, INode $sourceNode): bool {
-		if (!($sourceNode instanceof ITrash)) {
-			return false;
-		}
+    public function moveInto($targetName, $sourcePath, INode $sourceNode): bool {
+        if (!($sourceNode instanceof ITrash)) {
+            return false;
+        }
 
-		return $sourceNode->restore();
-	}
+        return $sourceNode->restore();
+    }
 
 }

apps/files_trashbin/lib/Sabre/TrashFolder.php

Indentation +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@
 
 
 class TrashFolder extends AbstractTrashFolder {
-	public function getName(): string {
-		return $this->data->getName() . '.d' . $this->getLastModified();
-	}
+    public function getName(): string {
+        return $this->data->getName() . '.d' . $this->getLastModified();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
 
 class TrashFolder extends AbstractTrashFolder {
 	public function getName(): string {
-		return $this->data->getName() . '.d' . $this->getLastModified();
+		return $this->data->getName().'.d'.$this->getLastModified();
 	}
 }

apps/files_trashbin/lib/Sabre/AbstractTrashFile.php

Indentation +6 added lines, -6 removed lines

@@ -26,11 +26,11 @@
 use Sabre\DAV\IFile;
 
 abstract class AbstractTrashFile extends AbstractTrash implements IFile , ITrash{
-	public function put($data) {
-		throw new Forbidden();
-	}
+    public function put($data) {
+        throw new Forbidden();
+    }
 
-	public function setName($name) {
-		throw new Forbidden();
-	}
+    public function setName($name) {
+        throw new Forbidden();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\IFile;
 
-abstract class AbstractTrashFile extends AbstractTrash implements IFile , ITrash{
+abstract class AbstractTrashFile extends AbstractTrash implements IFile, ITrash{
 	public function put($data) {
 		throw new Forbidden();
 	}

apps/files_trashbin/lib/Sabre/TrashRoot.php

Indentation +68 added lines, -68 removed lines

@@ -33,72 +33,72 @@
 
 class TrashRoot implements ICollection {
 
-	/** @var IUser */
-	private $user;
-
-	/** @var ITrashManager  */
-	private $trashManager;
-
-	public function __construct(IUser $user, ITrashManager $trashManager) {
-		$this->user = $user;
-		$this->trashManager = $trashManager;
-	}
-
-	public function delete() {
-		\OCA\Files_Trashbin\Trashbin::deleteAll();
-	}
-
-	public function getName(): string {
-		return 'trash';
-	}
-
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this trashbin');
-	}
-
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Not allowed to create files in the trashbin');
-	}
-
-	public function createDirectory($name) {
-		throw new Forbidden('Not allowed to create folders in the trashbin');
-	}
-
-	public function getChildren(): array {
-		$entries = $this->trashManager->listTrashRoot($this->user);
-
-		$children = array_map(function (ITrashItem $entry) {
-			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
-				return new TrashFolder($this->trashManager, $entry);
-			}
-			return new TrashFile($this->trashManager, $entry);
-		}, $entries);
-
-		return $children;
-	}
-
-	public function getChild($name): ITrash {
-		$entries = $this->getChildren();
-
-		foreach ($entries as $entry) {
-			if ($entry->getName() === $name) {
-				return $entry;
-			}
-		}
-
-		throw new NotFound();
-	}
-
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
-
-	public function getLastModified(): int {
-		return 0;
-	}
+    /** @var IUser */
+    private $user;
+
+    /** @var ITrashManager  */
+    private $trashManager;
+
+    public function __construct(IUser $user, ITrashManager $trashManager) {
+        $this->user = $user;
+        $this->trashManager = $trashManager;
+    }
+
+    public function delete() {
+        \OCA\Files_Trashbin\Trashbin::deleteAll();
+    }
+
+    public function getName(): string {
+        return 'trash';
+    }
+
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this trashbin');
+    }
+
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Not allowed to create files in the trashbin');
+    }
+
+    public function createDirectory($name) {
+        throw new Forbidden('Not allowed to create folders in the trashbin');
+    }
+
+    public function getChildren(): array {
+        $entries = $this->trashManager->listTrashRoot($this->user);
+
+        $children = array_map(function (ITrashItem $entry) {
+            if ($entry->getType() === FileInfo::TYPE_FOLDER) {
+                return new TrashFolder($this->trashManager, $entry);
+            }
+            return new TrashFile($this->trashManager, $entry);
+        }, $entries);
+
+        return $children;
+    }
+
+    public function getChild($name): ITrash {
+        $entries = $this->getChildren();
+
+        foreach ($entries as $entry) {
+            if ($entry->getName() === $name) {
+                return $entry;
+            }
+        }
+
+        throw new NotFound();
+    }
+
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
+
+    public function getLastModified(): int {
+        return 0;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 	public function getChildren(): array {
 		$entries = $this->trashManager->listTrashRoot($this->user);
 
-		$children = array_map(function (ITrashItem $entry) {
+		$children = array_map(function(ITrashItem $entry) {
 			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
 				return new TrashFolder($this->trashManager, $entry);
 			}

apps/files_trashbin/lib/Sabre/AbstractTrashFolder.php

Indentation +36 added lines, -36 removed lines

@@ -29,49 +29,49 @@
 use Sabre\DAV\ICollection;
 
 abstract class AbstractTrashFolder extends AbstractTrash implements ICollection, ITrash {
-	public function getChildren(): array {
-		$entries = $this->trashManager->listTrashFolder($this->data);
+    public function getChildren(): array {
+        $entries = $this->trashManager->listTrashFolder($this->data);
 
-		$children = array_map(function (ITrashItem $entry) {
-			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
-				return new TrashFolderFolder($this->trashManager, $entry);
-			}
-			return new TrashFolderFile($this->trashManager, $entry);
-		}, $entries);
+        $children = array_map(function (ITrashItem $entry) {
+            if ($entry->getType() === FileInfo::TYPE_FOLDER) {
+                return new TrashFolderFolder($this->trashManager, $entry);
+            }
+            return new TrashFolderFile($this->trashManager, $entry);
+        }, $entries);
 
-		return $children;
-	}
+        return $children;
+    }
 
-	public function getChild($name): ITrash {
-		$entries = $this->getChildren();
+    public function getChild($name): ITrash {
+        $entries = $this->getChildren();
 
-		foreach ($entries as $entry) {
-			if ($entry->getName() === $name) {
-				return $entry;
-			}
-		}
+        foreach ($entries as $entry) {
+            if ($entry->getName() === $name) {
+                return $entry;
+            }
+        }
 
-		throw new NotFound();
-	}
+        throw new NotFound();
+    }
 
-	public function childExists($name): bool {
-		try {
-			$this->getChild($name);
-			return true;
-		} catch (NotFound $e) {
-			return false;
-		}
-	}
+    public function childExists($name): bool {
+        try {
+            $this->getChild($name);
+            return true;
+        } catch (NotFound $e) {
+            return false;
+        }
+    }
 
-	public function setName($name) {
-		throw new Forbidden();
-	}
+    public function setName($name) {
+        throw new Forbidden();
+    }
 
-	public function createFile($name, $data = null) {
-		throw new Forbidden();
-	}
+    public function createFile($name, $data = null) {
+        throw new Forbidden();
+    }
 
-	public function createDirectory($name) {
-		throw new Forbidden();
-	}
+    public function createDirectory($name) {
+        throw new Forbidden();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	public function getChildren(): array {
 		$entries = $this->trashManager->listTrashFolder($this->data);
 
-		$children = array_map(function (ITrashItem $entry) {
+		$children = array_map(function(ITrashItem $entry) {
 			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
 				return new TrashFolderFolder($this->trashManager, $entry);
 			}

apps/files_trashbin/lib/Sabre/RootCollection.php

Indentation +32 added lines, -32 removed lines

@@ -31,41 +31,41 @@
 use Sabre\DAVACL\PrincipalBackend;
 
 class RootCollection extends AbstractPrincipalCollection {
-	/** @var ITrashManager */
-	private $trashManager;
+    /** @var ITrashManager */
+    private $trashManager;
 
-	public function __construct(
-		ITrashManager $trashManager,
-		PrincipalBackend\BackendInterface $principalBackend,
-		IConfig $config
-	) {
-		parent::__construct($principalBackend, 'principals/users');
+    public function __construct(
+        ITrashManager $trashManager,
+        PrincipalBackend\BackendInterface $principalBackend,
+        IConfig $config
+    ) {
+        parent::__construct($principalBackend, 'principals/users');
 
-		$this->trashManager = $trashManager;
-		$this->disableListing = !$config->getSystemValue('debug', false);
-	}
+        $this->trashManager = $trashManager;
+        $this->disableListing = !$config->getSystemValue('debug', false);
+    }
 
-	/**
-	 * This method returns a node for a principal.
-	 *
-	 * The passed array contains principal information, and is guaranteed to
-	 * at least contain a uri item. Other properties may or may not be
-	 * supplied by the authentication backend.
-	 *
-	 * @param array $principalInfo
-	 * @return INode
-	 */
-	public function getChildForPrincipal(array $principalInfo): TrashHome {
-		list(, $name) = \Sabre\Uri\split($principalInfo['uri']);
-		$user = \OC::$server->getUserSession()->getUser();
-		if (is_null($user) || $name !== $user->getUID()) {
-			throw new \Sabre\DAV\Exception\Forbidden();
-		}
-		return new TrashHome($principalInfo, $this->trashManager, $user);
-	}
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principalInfo
+     * @return INode
+     */
+    public function getChildForPrincipal(array $principalInfo): TrashHome {
+        list(, $name) = \Sabre\Uri\split($principalInfo['uri']);
+        $user = \OC::$server->getUserSession()->getUser();
+        if (is_null($user) || $name !== $user->getUID()) {
+            throw new \Sabre\DAV\Exception\Forbidden();
+        }
+        return new TrashHome($principalInfo, $this->trashManager, $user);
+    }
 
-	public function getName(): string {
-		return 'trashbin';
-	}
+    public function getName(): string {
+        return 'trashbin';
+    }
 
 }

apps/files_trashbin/lib/Sabre/TrashFile.php

Indentation +6 added lines, -6 removed lines

@@ -25,11 +25,11 @@
 namespace OCA\Files_Trashbin\Sabre;
 
 class TrashFile extends AbstractTrashFile {
-	public function get() {
-		return $this->data->getStorage()->fopen($this->data->getInternalPath() . '.d' . $this->getLastModified(), 'rb');
-	}
+    public function get() {
+        return $this->data->getStorage()->fopen($this->data->getInternalPath() . '.d' . $this->getLastModified(), 'rb');
+    }
 
-	public function getName(): string {
-		return $this->data->getName() . '.d' . $this->getLastModified();
-	}
+    public function getName(): string {
+        return $this->data->getName() . '.d' . $this->getLastModified();
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,10 @@
 
 class TrashFile extends AbstractTrashFile {
 	public function get() {
-		return $this->data->getStorage()->fopen($this->data->getInternalPath() . '.d' . $this->getLastModified(), 'rb');
+		return $this->data->getStorage()->fopen($this->data->getInternalPath().'.d'.$this->getLastModified(), 'rb');
 	}
 
 	public function getName(): string {
-		return $this->data->getName() . '.d' . $this->getLastModified();
+		return $this->data->getName().'.d'.$this->getLastModified();
 	}
 }

apps/files_trashbin/lib/Storage.php

Indentation +169 added lines, -169 removed lines

@@ -41,173 +41,173 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class Storage extends Wrapper {
-	/** @var IMountPoint */
-	private $mountPoint;
-
-	/** @var  IUserManager */
-	private $userManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var EventDispatcher */
-	private $eventDispatcher;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var ITrashManager */
-	private $trashManager;
-
-	/**
-	 * Storage constructor.
-	 *
-	 * @param array $parameters
-	 * @param ITrashManager $trashManager
-	 * @param IUserManager|null $userManager
-	 * @param ILogger|null $logger
-	 * @param EventDispatcher|null $eventDispatcher
-	 * @param IRootFolder|null $rootFolder
-	 */
-	public function __construct(
-		$parameters,
-		ITrashManager $trashManager = null,
-		IUserManager $userManager = null,
-		ILogger $logger = null,
-		EventDispatcher $eventDispatcher = null,
-		IRootFolder $rootFolder = null
-	) {
-		$this->mountPoint = $parameters['mountPoint'];
-		$this->trashManager = $trashManager;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->rootFolder = $rootFolder;
-		parent::__construct($parameters);
-	}
-
-	/**
-	 * Deletes the given file by moving it into the trashbin.
-	 *
-	 * @param string $path path of file or folder to delete
-	 *
-	 * @return bool true if the operation succeeded, false otherwise
-	 */
-	public function unlink($path) {
-		try {
-			return $this->doDelete($path, 'unlink');
-		} catch (GenericEncryptionException $e) {
-			// in case of a encryption exception we delete the file right away
-			$this->logger->info(
-				"Can't move file" . $path .
-				"to the trash bin, therefore it was deleted right away");
-
-			return $this->storage->unlink($path);
-		}
-	}
-
-	/**
-	 * Deletes the given folder by moving it into the trashbin.
-	 *
-	 * @param string $path path of folder to delete
-	 *
-	 * @return bool true if the operation succeeded, false otherwise
-	 */
-	public function rmdir($path) {
-		return $this->doDelete($path, 'rmdir');
-	}
-
-	/**
-	 * check if it is a file located in data/user/files only files in the
-	 * 'files' directory should be moved to the trash
-	 *
-	 * @param $path
-	 * @return bool
-	 */
-	protected function shouldMoveToTrash($path) {
-
-		// check if there is a app which want to disable the trash bin for this file
-		$fileId = $this->storage->getCache()->getId($path);
-		$nodes = $this->rootFolder->getById($fileId);
-		foreach ($nodes as $node) {
-			$event = $this->createMoveToTrashEvent($node);
-			$this->eventDispatcher->dispatch('OCA\Files_Trashbin::moveToTrash', $event);
-			if ($event->shouldMoveToTrashBin() === false) {
-				return false;
-			}
-		}
-
-		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
-		$parts = explode('/', $normalized);
-		if (count($parts) < 4) {
-			return false;
-		}
-
-		if ($parts[2] === 'files' && $this->userManager->userExists($parts[1])) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * get move to trash event
-	 *
-	 * @param Node $node
-	 * @return MoveToTrashEvent
-	 */
-	protected function createMoveToTrashEvent(Node $node) {
-		return new MoveToTrashEvent($node);
-	}
-
-	/**
-	 * Run the delete operation with the given method
-	 *
-	 * @param string $path path of file or folder to delete
-	 * @param string $method either "unlink" or "rmdir"
-	 *
-	 * @return bool true if the operation succeeded, false otherwise
-	 */
-	private function doDelete($path, $method) {
-		if (
-			!\OC::$server->getAppManager()->isEnabledForUser('files_trashbin')
-			|| (pathinfo($path, PATHINFO_EXTENSION) === 'part')
-			|| $this->shouldMoveToTrash($path) === false
-		) {
-			return call_user_func([$this->storage, $method], $path);
-		}
-
-		// check permissions before we continue, this is especially important for
-		// shared files
-		if (!$this->isDeletable($path)) {
-			return false;
-		}
-
-		$isMovedToTrash = $this->trashManager->moveToTrash($this, $path);
-		if (!$isMovedToTrash) {
-			return call_user_func([$this->storage, $method], $path);
-		} else {
-			return true;
-		}
-	}
-
-	/**
-	 * Setup the storate wrapper callback
-	 */
-	public static function setupStorage() {
-		\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) {
-			return new \OCA\Files_Trashbin\Storage(
-				['storage' => $storage, 'mountPoint' => $mountPoint],
-				\OC::$server->query(ITrashManager::class),
-				\OC::$server->getUserManager(),
-				\OC::$server->getLogger(),
-				\OC::$server->getEventDispatcher(),
-				\OC::$server->getLazyRootFolder()
-			);
-		}, 1);
-	}
-
-	public function getMountPoint() {
-		return $this->mountPoint;
-	}
+    /** @var IMountPoint */
+    private $mountPoint;
+
+    /** @var  IUserManager */
+    private $userManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var EventDispatcher */
+    private $eventDispatcher;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var ITrashManager */
+    private $trashManager;
+
+    /**
+     * Storage constructor.
+     *
+     * @param array $parameters
+     * @param ITrashManager $trashManager
+     * @param IUserManager|null $userManager
+     * @param ILogger|null $logger
+     * @param EventDispatcher|null $eventDispatcher
+     * @param IRootFolder|null $rootFolder
+     */
+    public function __construct(
+        $parameters,
+        ITrashManager $trashManager = null,
+        IUserManager $userManager = null,
+        ILogger $logger = null,
+        EventDispatcher $eventDispatcher = null,
+        IRootFolder $rootFolder = null
+    ) {
+        $this->mountPoint = $parameters['mountPoint'];
+        $this->trashManager = $trashManager;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->rootFolder = $rootFolder;
+        parent::__construct($parameters);
+    }
+
+    /**
+     * Deletes the given file by moving it into the trashbin.
+     *
+     * @param string $path path of file or folder to delete
+     *
+     * @return bool true if the operation succeeded, false otherwise
+     */
+    public function unlink($path) {
+        try {
+            return $this->doDelete($path, 'unlink');
+        } catch (GenericEncryptionException $e) {
+            // in case of a encryption exception we delete the file right away
+            $this->logger->info(
+                "Can't move file" . $path .
+                "to the trash bin, therefore it was deleted right away");
+
+            return $this->storage->unlink($path);
+        }
+    }
+
+    /**
+     * Deletes the given folder by moving it into the trashbin.
+     *
+     * @param string $path path of folder to delete
+     *
+     * @return bool true if the operation succeeded, false otherwise
+     */
+    public function rmdir($path) {
+        return $this->doDelete($path, 'rmdir');
+    }
+
+    /**
+     * check if it is a file located in data/user/files only files in the
+     * 'files' directory should be moved to the trash
+     *
+     * @param $path
+     * @return bool
+     */
+    protected function shouldMoveToTrash($path) {
+
+        // check if there is a app which want to disable the trash bin for this file
+        $fileId = $this->storage->getCache()->getId($path);
+        $nodes = $this->rootFolder->getById($fileId);
+        foreach ($nodes as $node) {
+            $event = $this->createMoveToTrashEvent($node);
+            $this->eventDispatcher->dispatch('OCA\Files_Trashbin::moveToTrash', $event);
+            if ($event->shouldMoveToTrashBin() === false) {
+                return false;
+            }
+        }
+
+        $normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
+        $parts = explode('/', $normalized);
+        if (count($parts) < 4) {
+            return false;
+        }
+
+        if ($parts[2] === 'files' && $this->userManager->userExists($parts[1])) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * get move to trash event
+     *
+     * @param Node $node
+     * @return MoveToTrashEvent
+     */
+    protected function createMoveToTrashEvent(Node $node) {
+        return new MoveToTrashEvent($node);
+    }
+
+    /**
+     * Run the delete operation with the given method
+     *
+     * @param string $path path of file or folder to delete
+     * @param string $method either "unlink" or "rmdir"
+     *
+     * @return bool true if the operation succeeded, false otherwise
+     */
+    private function doDelete($path, $method) {
+        if (
+            !\OC::$server->getAppManager()->isEnabledForUser('files_trashbin')
+            || (pathinfo($path, PATHINFO_EXTENSION) === 'part')
+            || $this->shouldMoveToTrash($path) === false
+        ) {
+            return call_user_func([$this->storage, $method], $path);
+        }
+
+        // check permissions before we continue, this is especially important for
+        // shared files
+        if (!$this->isDeletable($path)) {
+            return false;
+        }
+
+        $isMovedToTrash = $this->trashManager->moveToTrash($this, $path);
+        if (!$isMovedToTrash) {
+            return call_user_func([$this->storage, $method], $path);
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Setup the storate wrapper callback
+     */
+    public static function setupStorage() {
+        \OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) {
+            return new \OCA\Files_Trashbin\Storage(
+                ['storage' => $storage, 'mountPoint' => $mountPoint],
+                \OC::$server->query(ITrashManager::class),
+                \OC::$server->getUserManager(),
+                \OC::$server->getLogger(),
+                \OC::$server->getEventDispatcher(),
+                \OC::$server->getLazyRootFolder()
+            );
+        }, 1);
+    }
+
+    public function getMountPoint() {
+        return $this->mountPoint;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -99,7 +99,7 @@ 
 		} catch (GenericEncryptionException $e) {
 			// in case of a encryption exception we delete the file right away
 			$this->logger->info(
-				"Can't move file" . $path .
+				"Can't move file".$path.
 				"to the trash bin, therefore it was deleted right away");
 
 			return $this->storage->unlink($path);
@@ -137,7 +137,7 @@ 
 			}
 		}
 
-		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
+		$normalized = Filesystem::normalizePath($this->mountPoint.'/'.$path);
 		$parts = explode('/', $normalized);
 		if (count($parts) < 4) {
 			return false;
@@ -195,7 +195,7 @@ 
 	 * Setup the storate wrapper callback
 	 */
 	public static function setupStorage() {
-		\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) {
+		\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function($mountPoint, $storage) {
 			return new \OCA\Files_Trashbin\Storage(
 				['storage' => $storage, 'mountPoint' => $mountPoint],
 				\OC::$server->query(ITrashManager::class),