nextcloud / server

lib/private/Share20/DefaultShareProvider.php

Indentation +1284 added lines, -1284 removed lines

@@ -58,1321 +58,1321 @@
  */
 class DefaultShareProvider implements IShareProvider {
 
-	// Special share type for user modified group shares
-	const SHARE_TYPE_USERGROUP = 2;
-
-	/** @var IDBConnection */
-	private $dbConn;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IMailer */
-	private $mailer;
-
-	/** @var Defaults */
-	private $defaults;
-
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/**
-	 * DefaultShareProvider constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IRootFolder $rootFolder
-	 * @param IMailer $mailer ;
-	 * @param Defaults $defaults
-	 * @param IL10N $l
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(
-			IDBConnection $connection,
-			IUserManager $userManager,
-			IGroupManager $groupManager,
-			IRootFolder $rootFolder,
-			IMailer $mailer,
-			Defaults $defaults,
-			IL10N $l,
-			IURLGenerator $urlGenerator) {
-		$this->dbConn = $connection;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->rootFolder = $rootFolder;
-		$this->mailer = $mailer;
-		$this->defaults = $defaults;
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	/**
-	 * Return the identifier of this provider.
-	 *
-	 * @return string Containing only [a-zA-Z0-9]
-	 */
-	public function identifier() {
-		return 'ocinternal';
-	}
-
-	/**
-	 * Share a path
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare The share object
-	 * @throws ShareNotFound
-	 * @throws \Exception
-	 */
-	public function create(\OCP\Share\IShare $share) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->insert('share');
-		$qb->setValue('share_type', $qb->createNamedParameter($share->getShareType()));
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			//Set the UID of the user we share with
-			$qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			//Set the GID of the group we share with
-			$qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			//set label for public link
-			$qb->setValue('label', $qb->createNamedParameter($share->getLabel()));
-			//Set the token of the share
-			$qb->setValue('token', $qb->createNamedParameter($share->getToken()));
-
-			//If a password is set store it
-			if ($share->getPassword() !== null) {
-				$qb->setValue('password', $qb->createNamedParameter($share->getPassword()));
-			}
-
-			$qb->setValue('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL));
-
-			//If an expiration date is set store it
-			if ($share->getExpirationDate() !== null) {
-				$qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
-			}
-
-			if (method_exists($share, 'getParent')) {
-				$qb->setValue('parent', $qb->createNamedParameter($share->getParent()));
-			}
-		} else {
-			throw new \Exception('invalid share type!');
-		}
-
-		// Set what is shares
-		$qb->setValue('item_type', $qb->createParameter('itemType'));
-		if ($share->getNode() instanceof \OCP\Files\File) {
-			$qb->setParameter('itemType', 'file');
-		} else {
-			$qb->setParameter('itemType', 'folder');
-		}
-
-		// Set the file id
-		$qb->setValue('item_source', $qb->createNamedParameter($share->getNode()->getId()));
-		$qb->setValue('file_source', $qb->createNamedParameter($share->getNode()->getId()));
-
-		// set the permissions
-		$qb->setValue('permissions', $qb->createNamedParameter($share->getPermissions()));
-
-		// Set who created this share
-		$qb->setValue('uid_initiator', $qb->createNamedParameter($share->getSharedBy()));
-
-		// Set who is the owner of this file/folder (and this the owner of the share)
-		$qb->setValue('uid_owner', $qb->createNamedParameter($share->getShareOwner()));
-
-		// Set the file target
-		$qb->setValue('file_target', $qb->createNamedParameter($share->getTarget()));
-
-		// Set the time this share was created
-		$qb->setValue('stime', $qb->createNamedParameter(time()));
-
-		// insert the data and fetch the id of the share
-		$this->dbConn->beginTransaction();
-		$qb->execute();
-		$id = $this->dbConn->lastInsertId('*PREFIX*share');
-
-		// Now fetch the inserted share and create a complete share object
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$this->dbConn->commit();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		$mailSendValue = $share->getMailSend();
-		$data['mail_send'] = ($mailSendValue === null) ? true : $mailSendValue;
-
-		$share = $this->createShare($data);
-		return $share;
-	}
-
-	/**
-	 * Update a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare The share object
-	 * @throws ShareNotFound
-	 * @throws \OCP\Files\InvalidPathException
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function update(\OCP\Share\IShare $share) {
-
-		$originalShare = $this->getShareById($share->getId());
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			/*
+    // Special share type for user modified group shares
+    const SHARE_TYPE_USERGROUP = 2;
+
+    /** @var IDBConnection */
+    private $dbConn;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IMailer */
+    private $mailer;
+
+    /** @var Defaults */
+    private $defaults;
+
+    /** @var IL10N */
+    private $l;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /**
+     * DefaultShareProvider constructor.
+     *
+     * @param IDBConnection $connection
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IRootFolder $rootFolder
+     * @param IMailer $mailer ;
+     * @param Defaults $defaults
+     * @param IL10N $l
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(
+            IDBConnection $connection,
+            IUserManager $userManager,
+            IGroupManager $groupManager,
+            IRootFolder $rootFolder,
+            IMailer $mailer,
+            Defaults $defaults,
+            IL10N $l,
+            IURLGenerator $urlGenerator) {
+        $this->dbConn = $connection;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->rootFolder = $rootFolder;
+        $this->mailer = $mailer;
+        $this->defaults = $defaults;
+        $this->l = $l;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * Return the identifier of this provider.
+     *
+     * @return string Containing only [a-zA-Z0-9]
+     */
+    public function identifier() {
+        return 'ocinternal';
+    }
+
+    /**
+     * Share a path
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare The share object
+     * @throws ShareNotFound
+     * @throws \Exception
+     */
+    public function create(\OCP\Share\IShare $share) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->insert('share');
+        $qb->setValue('share_type', $qb->createNamedParameter($share->getShareType()));
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            //Set the UID of the user we share with
+            $qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            //Set the GID of the group we share with
+            $qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            //set label for public link
+            $qb->setValue('label', $qb->createNamedParameter($share->getLabel()));
+            //Set the token of the share
+            $qb->setValue('token', $qb->createNamedParameter($share->getToken()));
+
+            //If a password is set store it
+            if ($share->getPassword() !== null) {
+                $qb->setValue('password', $qb->createNamedParameter($share->getPassword()));
+            }
+
+            $qb->setValue('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL));
+
+            //If an expiration date is set store it
+            if ($share->getExpirationDate() !== null) {
+                $qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
+            }
+
+            if (method_exists($share, 'getParent')) {
+                $qb->setValue('parent', $qb->createNamedParameter($share->getParent()));
+            }
+        } else {
+            throw new \Exception('invalid share type!');
+        }
+
+        // Set what is shares
+        $qb->setValue('item_type', $qb->createParameter('itemType'));
+        if ($share->getNode() instanceof \OCP\Files\File) {
+            $qb->setParameter('itemType', 'file');
+        } else {
+            $qb->setParameter('itemType', 'folder');
+        }
+
+        // Set the file id
+        $qb->setValue('item_source', $qb->createNamedParameter($share->getNode()->getId()));
+        $qb->setValue('file_source', $qb->createNamedParameter($share->getNode()->getId()));
+
+        // set the permissions
+        $qb->setValue('permissions', $qb->createNamedParameter($share->getPermissions()));
+
+        // Set who created this share
+        $qb->setValue('uid_initiator', $qb->createNamedParameter($share->getSharedBy()));
+
+        // Set who is the owner of this file/folder (and this the owner of the share)
+        $qb->setValue('uid_owner', $qb->createNamedParameter($share->getShareOwner()));
+
+        // Set the file target
+        $qb->setValue('file_target', $qb->createNamedParameter($share->getTarget()));
+
+        // Set the time this share was created
+        $qb->setValue('stime', $qb->createNamedParameter(time()));
+
+        // insert the data and fetch the id of the share
+        $this->dbConn->beginTransaction();
+        $qb->execute();
+        $id = $this->dbConn->lastInsertId('*PREFIX*share');
+
+        // Now fetch the inserted share and create a complete share object
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $this->dbConn->commit();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        $mailSendValue = $share->getMailSend();
+        $data['mail_send'] = ($mailSendValue === null) ? true : $mailSendValue;
+
+        $share = $this->createShare($data);
+        return $share;
+    }
+
+    /**
+     * Update a share
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare The share object
+     * @throws ShareNotFound
+     * @throws \OCP\Files\InvalidPathException
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function update(\OCP\Share\IShare $share) {
+
+        $originalShare = $this->getShareById($share->getId());
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            /*
 			 * We allow updating the recipient on user shares.
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('share_with', $qb->createNamedParameter($share->getSharedWith()))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->execute();
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->execute();
-
-			/*
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->set('share_with', $qb->createNamedParameter($share->getSharedWith()))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->execute();
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->execute();
+
+            /*
 			 * Update all user defined group shares
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->execute();
-
-			/*
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->execute();
+
+            /*
 			 * Now update the permissions for all children that have not set it to 0
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->neq('permissions', $qb->createNamedParameter(0)))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->execute();
-
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('password', $qb->createNamedParameter($share->getPassword()))
-				->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('token', $qb->createNamedParameter($share->getToken()))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->set('label', $qb->createNamedParameter($share->getLabel()))
-				->set('hide_download', $qb->createNamedParameter($share->getHideDownload() ? 1 : 0), IQueryBuilder::PARAM_INT)
-				->execute();
-		}
-
-		if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
-			$this->propagateNote($share);
-		}
-
-
-		return $share;
-	}
-
-	/**
-	 * Get all children of this share
-	 * FIXME: remove once https://github.com/owncloud/core/pull/21660 is in
-	 *
-	 * @param \OCP\Share\IShare $parent
-	 * @return \OCP\Share\IShare[]
-	 */
-	public function getChildren(\OCP\Share\IShare $parent) {
-		$children = [];
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
-			->andWhere(
-				$qb->expr()->in(
-					'share_type',
-					$qb->createNamedParameter([
-						\OCP\Share::SHARE_TYPE_USER,
-						\OCP\Share::SHARE_TYPE_GROUP,
-						\OCP\Share::SHARE_TYPE_LINK,
-					], IQueryBuilder::PARAM_INT_ARRAY)
-				)
-			)
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->orderBy('id');
-
-		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
-			$children[] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $children;
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 */
-	public function delete(\OCP\Share\IShare $share) {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())));
-
-		/*
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->neq('permissions', $qb->createNamedParameter(0)))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->execute();
+
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->set('password', $qb->createNamedParameter($share->getPassword()))
+                ->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('token', $qb->createNamedParameter($share->getToken()))
+                ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->set('label', $qb->createNamedParameter($share->getLabel()))
+                ->set('hide_download', $qb->createNamedParameter($share->getHideDownload() ? 1 : 0), IQueryBuilder::PARAM_INT)
+                ->execute();
+        }
+
+        if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
+            $this->propagateNote($share);
+        }
+
+
+        return $share;
+    }
+
+    /**
+     * Get all children of this share
+     * FIXME: remove once https://github.com/owncloud/core/pull/21660 is in
+     *
+     * @param \OCP\Share\IShare $parent
+     * @return \OCP\Share\IShare[]
+     */
+    public function getChildren(\OCP\Share\IShare $parent) {
+        $children = [];
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
+            ->andWhere(
+                $qb->expr()->in(
+                    'share_type',
+                    $qb->createNamedParameter([
+                        \OCP\Share::SHARE_TYPE_USER,
+                        \OCP\Share::SHARE_TYPE_GROUP,
+                        \OCP\Share::SHARE_TYPE_LINK,
+                    ], IQueryBuilder::PARAM_INT_ARRAY)
+                )
+            )
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->orderBy('id');
+
+        $cursor = $qb->execute();
+        while($data = $cursor->fetch()) {
+            $children[] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $children;
+    }
+
+    /**
+     * Delete a share
+     *
+     * @param \OCP\Share\IShare $share
+     */
+    public function delete(\OCP\Share\IShare $share) {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())));
+
+        /*
 		 * If the share is a group share delete all possible
 		 * user defined groups shares.
 		 */
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$qb->orWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())));
-		}
-
-		$qb->execute();
-	}
-
-	/**
-	 * Unshare a share from the recipient. If this is a group share
-	 * this means we need a special entry in the share db.
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param string $recipient UserId of recipient
-	 * @throws BackendError
-	 * @throws ProviderException
-	 */
-	public function deleteFromSelf(\OCP\Share\IShare $share, $recipient) {
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-
-			$group = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($recipient);
-
-			if (is_null($group)) {
-				throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
-			}
-
-			if (!$group->inGroup($user)) {
-				throw new ProviderException('Recipient not in receiving group');
-			}
-
-			// Try to fetch user specific share
-			$qb = $this->dbConn->getQueryBuilder();
-			$stmt = $qb->select('*')
-				->from('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
-				->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				))
-				->execute();
-
-			$data = $stmt->fetch();
-
-			/*
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $qb->orWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())));
+        }
+
+        $qb->execute();
+    }
+
+    /**
+     * Unshare a share from the recipient. If this is a group share
+     * this means we need a special entry in the share db.
+     *
+     * @param \OCP\Share\IShare $share
+     * @param string $recipient UserId of recipient
+     * @throws BackendError
+     * @throws ProviderException
+     */
+    public function deleteFromSelf(\OCP\Share\IShare $share, $recipient) {
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+
+            $group = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($recipient);
+
+            if (is_null($group)) {
+                throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
+            }
+
+            if (!$group->inGroup($user)) {
+                throw new ProviderException('Recipient not in receiving group');
+            }
+
+            // Try to fetch user specific share
+            $qb = $this->dbConn->getQueryBuilder();
+            $stmt = $qb->select('*')
+                ->from('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
+                ->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ))
+                ->execute();
+
+            $data = $stmt->fetch();
+
+            /*
 			 * Check if there already is a user specific group share.
 			 * If there is update it (if required).
 			 */
-			if ($data === false) {
-				$qb = $this->dbConn->getQueryBuilder();
-
-				$type = $share->getNodeType();
-
-				//Insert new share
-				$qb->insert('share')
-					->values([
-						'share_type' => $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP),
-						'share_with' => $qb->createNamedParameter($recipient),
-						'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
-						'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
-						'parent' => $qb->createNamedParameter($share->getId()),
-						'item_type' => $qb->createNamedParameter($type),
-						'item_source' => $qb->createNamedParameter($share->getNodeId()),
-						'file_source' => $qb->createNamedParameter($share->getNodeId()),
-						'file_target' => $qb->createNamedParameter($share->getTarget()),
-						'permissions' => $qb->createNamedParameter(0),
-						'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
-					])->execute();
-
-			} else if ($data['permissions'] !== 0) {
-
-				// Update existing usergroup share
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->update('share')
-					->set('permissions', $qb->createNamedParameter(0))
-					->where($qb->expr()->eq('id', $qb->createNamedParameter($data['id'])))
-					->execute();
-			}
-
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-
-			if ($share->getSharedWith() !== $recipient) {
-				throw new ProviderException('Recipient does not match');
-			}
-
-			// We can just delete user and link shares
-			$this->delete($share);
-		} else {
-			throw new ProviderException('Invalid shareType');
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 *
-	 * For now this only works for group shares
-	 * If this gets implemented for normal shares we have to extend it
-	 */
-	public function restore(IShare $share, string $recipient): IShare {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('permissions')
-			->from('share')
-			->where(
-				$qb->expr()->eq('id', $qb->createNamedParameter($share->getId()))
-			);
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		$originalPermission = $data['permissions'];
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->update('share')
-			->set('permissions', $qb->createNamedParameter($originalPermission))
-			->where(
-				$qb->expr()->eq('parent', $qb->createNamedParameter($share->getParent()))
-			)->andWhere(
-				$qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP))
-			)->andWhere(
-				$qb->expr()->eq('share_with', $qb->createNamedParameter($recipient))
-			);
-
-		$qb->execute();
-
-		return $this->getShareById($share->getId(), $recipient);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function move(\OCP\Share\IShare $share, $recipient) {
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			// Just update the target
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->set('file_target', $qb->createNamedParameter($share->getTarget()))
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->execute();
-
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-
-			// Check if there is a usergroup share
-			$qb = $this->dbConn->getQueryBuilder();
-			$stmt = $qb->select('id')
-				->from('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
-				->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				))
-				->setMaxResults(1)
-				->execute();
-
-			$data = $stmt->fetch();
-			$stmt->closeCursor();
-
-			if ($data === false) {
-				// No usergroup share yet. Create one.
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->insert('share')
-					->values([
-						'share_type' => $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP),
-						'share_with' => $qb->createNamedParameter($recipient),
-						'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
-						'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
-						'parent' => $qb->createNamedParameter($share->getId()),
-						'item_type' => $qb->createNamedParameter($share->getNodeType()),
-						'item_source' => $qb->createNamedParameter($share->getNodeId()),
-						'file_source' => $qb->createNamedParameter($share->getNodeId()),
-						'file_target' => $qb->createNamedParameter($share->getTarget()),
-						'permissions' => $qb->createNamedParameter($share->getPermissions()),
-						'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
-					])->execute();
-			} else {
-				// Already a usergroup share. Update it.
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->update('share')
-					->set('file_target', $qb->createNamedParameter($share->getTarget()))
-					->where($qb->expr()->eq('id', $qb->createNamedParameter($data['id'])))
-					->execute();
-			}
-		}
-
-		return $share;
-	}
-
-	public function getSharesInFolder($userId, Folder $node, $reshares) {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share', 's')
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
-
-		$qb->andWhere($qb->expr()->orX(
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK))
-		));
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
-		} else {
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-				)
-			);
-		}
-
-		$qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
-		$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
-
-		$qb->orderBy('id');
-
-		$cursor = $qb->execute();
-		$shares = [];
-		while ($data = $cursor->fetch()) {
-			$shares[$data['fileid']][] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
-
-		$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter($shareType)));
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
-		} else {
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-				)
-			);
-		}
-
-		if ($node !== null) {
-			$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-		}
-
-		if ($limit !== -1) {
-			$qb->setMaxResults($limit);
-		}
-
-		$qb->setFirstResult($offset);
-		$qb->orderBy('id');
-
-		$cursor = $qb->execute();
-		$shares = [];
-		while($data = $cursor->fetch()) {
-			$shares[] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareById($id, $recipientId = null) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere(
-				$qb->expr()->in(
-					'share_type',
-					$qb->createNamedParameter([
-						\OCP\Share::SHARE_TYPE_USER,
-						\OCP\Share::SHARE_TYPE_GROUP,
-						\OCP\Share::SHARE_TYPE_LINK,
-					], IQueryBuilder::PARAM_INT_ARRAY)
-				)
-			)
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
-
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		try {
-			$share = $this->createShare($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		// If the recipient is set for a group share resolve to that user
-		if ($recipientId !== null && $share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$share = $this->resolveGroupShares([$share], $recipientId)[0];
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Get shares for a given path
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @return \OCP\Share\IShare[]
-	 */
-	public function getSharesByPath(Node $path) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
-			->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP))
-				)
-			)
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->execute();
-
-		$shares = [];
-		while($data = $cursor->fetch()) {
-			$shares[] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * Returns whether the given database result can be interpreted as
-	 * a share with accessible file (not trashed, not deleted)
-	 */
-	private function isAccessibleResult($data) {
-		// exclude shares leading to deleted file entries
-		if ($data['fileid'] === null) {
-			return false;
-		}
-
-		// exclude shares leading to trashbin on home storages
-		$pathSections = explode('/', $data['path'], 2);
-		// FIXME: would not detect rare md5'd home storage case properly
-		if ($pathSections[0] !== 'files'
-		    	&& in_array(explode(':', $data['storage_string_id'], 2)[0], array('home', 'object'))) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
-		/** @var Share[] $shares */
-		$shares = [];
-
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
-			//Get shares directly with this user
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->select('s.*',
-				'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
-				'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
-				'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
-			)
-				->selectAlias('st.id', 'storage_string_id')
-				->from('share', 's')
-				->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
-				->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'));
-
-			// Order by id
-			$qb->orderBy('s.id');
-
-			// Set limit and offset
-			if ($limit !== -1) {
-				$qb->setMaxResults($limit);
-			}
-			$qb->setFirstResult($offset);
-
-			$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				));
-
-			// Filter by node if provided
-			if ($node !== null) {
-				$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-			}
-
-			$cursor = $qb->execute();
-
-			while($data = $cursor->fetch()) {
-				if ($this->isAccessibleResult($data)) {
-					$shares[] = $this->createShare($data);
-				}
-			}
-			$cursor->closeCursor();
-
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
-			$user = $this->userManager->get($userId);
-			$allGroups = $this->groupManager->getUserGroups($user);
-
-			/** @var Share[] $shares2 */
-			$shares2 = [];
-
-			$start = 0;
-			while(true) {
-				$groups = array_slice($allGroups, $start, 100);
-				$start += 100;
-
-				if ($groups === []) {
-					break;
-				}
-
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->select('s.*',
-					'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
-					'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
-					'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
-				)
-					->selectAlias('st.id', 'storage_string_id')
-					->from('share', 's')
-					->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
-					->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
-					->orderBy('s.id')
-					->setFirstResult(0);
-
-				if ($limit !== -1) {
-					$qb->setMaxResults($limit - count($shares));
-				}
-
-				// Filter by node if provided
-				if ($node !== null) {
-					$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-				}
-
-
-				$groups = array_filter($groups, function($group) { return $group instanceof IGroup; });
-				$groups = array_map(function(IGroup $group) { return $group->getGID(); }, $groups);
-
-				$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
-					->andWhere($qb->expr()->in('share_with', $qb->createNamedParameter(
-						$groups,
-						IQueryBuilder::PARAM_STR_ARRAY
-					)))
-					->andWhere($qb->expr()->orX(
-						$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-						$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-					));
-
-				$cursor = $qb->execute();
-				while($data = $cursor->fetch()) {
-					if ($offset > 0) {
-						$offset--;
-						continue;
-					}
-
-					if ($this->isAccessibleResult($data)) {
-						$shares2[] = $this->createShare($data);
-					}
-				}
-				$cursor->closeCursor();
-			}
-
-			/*
+            if ($data === false) {
+                $qb = $this->dbConn->getQueryBuilder();
+
+                $type = $share->getNodeType();
+
+                //Insert new share
+                $qb->insert('share')
+                    ->values([
+                        'share_type' => $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP),
+                        'share_with' => $qb->createNamedParameter($recipient),
+                        'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
+                        'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
+                        'parent' => $qb->createNamedParameter($share->getId()),
+                        'item_type' => $qb->createNamedParameter($type),
+                        'item_source' => $qb->createNamedParameter($share->getNodeId()),
+                        'file_source' => $qb->createNamedParameter($share->getNodeId()),
+                        'file_target' => $qb->createNamedParameter($share->getTarget()),
+                        'permissions' => $qb->createNamedParameter(0),
+                        'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
+                    ])->execute();
+
+            } else if ($data['permissions'] !== 0) {
+
+                // Update existing usergroup share
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->update('share')
+                    ->set('permissions', $qb->createNamedParameter(0))
+                    ->where($qb->expr()->eq('id', $qb->createNamedParameter($data['id'])))
+                    ->execute();
+            }
+
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+
+            if ($share->getSharedWith() !== $recipient) {
+                throw new ProviderException('Recipient does not match');
+            }
+
+            // We can just delete user and link shares
+            $this->delete($share);
+        } else {
+            throw new ProviderException('Invalid shareType');
+        }
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * For now this only works for group shares
+     * If this gets implemented for normal shares we have to extend it
+     */
+    public function restore(IShare $share, string $recipient): IShare {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('permissions')
+            ->from('share')
+            ->where(
+                $qb->expr()->eq('id', $qb->createNamedParameter($share->getId()))
+            );
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        $originalPermission = $data['permissions'];
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->update('share')
+            ->set('permissions', $qb->createNamedParameter($originalPermission))
+            ->where(
+                $qb->expr()->eq('parent', $qb->createNamedParameter($share->getParent()))
+            )->andWhere(
+                $qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP))
+            )->andWhere(
+                $qb->expr()->eq('share_with', $qb->createNamedParameter($recipient))
+            );
+
+        $qb->execute();
+
+        return $this->getShareById($share->getId(), $recipient);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function move(\OCP\Share\IShare $share, $recipient) {
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            // Just update the target
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->set('file_target', $qb->createNamedParameter($share->getTarget()))
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->execute();
+
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+
+            // Check if there is a usergroup share
+            $qb = $this->dbConn->getQueryBuilder();
+            $stmt = $qb->select('id')
+                ->from('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
+                ->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ))
+                ->setMaxResults(1)
+                ->execute();
+
+            $data = $stmt->fetch();
+            $stmt->closeCursor();
+
+            if ($data === false) {
+                // No usergroup share yet. Create one.
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->insert('share')
+                    ->values([
+                        'share_type' => $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP),
+                        'share_with' => $qb->createNamedParameter($recipient),
+                        'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
+                        'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
+                        'parent' => $qb->createNamedParameter($share->getId()),
+                        'item_type' => $qb->createNamedParameter($share->getNodeType()),
+                        'item_source' => $qb->createNamedParameter($share->getNodeId()),
+                        'file_source' => $qb->createNamedParameter($share->getNodeId()),
+                        'file_target' => $qb->createNamedParameter($share->getTarget()),
+                        'permissions' => $qb->createNamedParameter($share->getPermissions()),
+                        'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
+                    ])->execute();
+            } else {
+                // Already a usergroup share. Update it.
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->update('share')
+                    ->set('file_target', $qb->createNamedParameter($share->getTarget()))
+                    ->where($qb->expr()->eq('id', $qb->createNamedParameter($data['id'])))
+                    ->execute();
+            }
+        }
+
+        return $share;
+    }
+
+    public function getSharesInFolder($userId, Folder $node, $reshares) {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share', 's')
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ));
+
+        $qb->andWhere($qb->expr()->orX(
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK))
+        ));
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
+        } else {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                )
+            );
+        }
+
+        $qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+        $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
+
+        $qb->orderBy('id');
+
+        $cursor = $qb->execute();
+        $shares = [];
+        while ($data = $cursor->fetch()) {
+            $shares[$data['fileid']][] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ));
+
+        $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter($shareType)));
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
+        } else {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                )
+            );
+        }
+
+        if ($node !== null) {
+            $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+        }
+
+        if ($limit !== -1) {
+            $qb->setMaxResults($limit);
+        }
+
+        $qb->setFirstResult($offset);
+        $qb->orderBy('id');
+
+        $cursor = $qb->execute();
+        $shares = [];
+        while($data = $cursor->fetch()) {
+            $shares[] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareById($id, $recipientId = null) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere(
+                $qb->expr()->in(
+                    'share_type',
+                    $qb->createNamedParameter([
+                        \OCP\Share::SHARE_TYPE_USER,
+                        \OCP\Share::SHARE_TYPE_GROUP,
+                        \OCP\Share::SHARE_TYPE_LINK,
+                    ], IQueryBuilder::PARAM_INT_ARRAY)
+                )
+            )
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ));
+
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        try {
+            $share = $this->createShare($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        // If the recipient is set for a group share resolve to that user
+        if ($recipientId !== null && $share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $share = $this->resolveGroupShares([$share], $recipientId)[0];
+        }
+
+        return $share;
+    }
+
+    /**
+     * Get shares for a given path
+     *
+     * @param \OCP\Files\Node $path
+     * @return \OCP\Share\IShare[]
+     */
+    public function getSharesByPath(Node $path) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP))
+                )
+            )
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->execute();
+
+        $shares = [];
+        while($data = $cursor->fetch()) {
+            $shares[] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * Returns whether the given database result can be interpreted as
+     * a share with accessible file (not trashed, not deleted)
+     */
+    private function isAccessibleResult($data) {
+        // exclude shares leading to deleted file entries
+        if ($data['fileid'] === null) {
+            return false;
+        }
+
+        // exclude shares leading to trashbin on home storages
+        $pathSections = explode('/', $data['path'], 2);
+        // FIXME: would not detect rare md5'd home storage case properly
+        if ($pathSections[0] !== 'files'
+                && in_array(explode(':', $data['storage_string_id'], 2)[0], array('home', 'object'))) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
+        /** @var Share[] $shares */
+        $shares = [];
+
+        if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
+            //Get shares directly with this user
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->select('s.*',
+                'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
+                'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
+                'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
+            )
+                ->selectAlias('st.id', 'storage_string_id')
+                ->from('share', 's')
+                ->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
+                ->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'));
+
+            // Order by id
+            $qb->orderBy('s.id');
+
+            // Set limit and offset
+            if ($limit !== -1) {
+                $qb->setMaxResults($limit);
+            }
+            $qb->setFirstResult($offset);
+
+            $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ));
+
+            // Filter by node if provided
+            if ($node !== null) {
+                $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+            }
+
+            $cursor = $qb->execute();
+
+            while($data = $cursor->fetch()) {
+                if ($this->isAccessibleResult($data)) {
+                    $shares[] = $this->createShare($data);
+                }
+            }
+            $cursor->closeCursor();
+
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
+            $user = $this->userManager->get($userId);
+            $allGroups = $this->groupManager->getUserGroups($user);
+
+            /** @var Share[] $shares2 */
+            $shares2 = [];
+
+            $start = 0;
+            while(true) {
+                $groups = array_slice($allGroups, $start, 100);
+                $start += 100;
+
+                if ($groups === []) {
+                    break;
+                }
+
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->select('s.*',
+                    'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
+                    'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
+                    'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
+                )
+                    ->selectAlias('st.id', 'storage_string_id')
+                    ->from('share', 's')
+                    ->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
+                    ->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
+                    ->orderBy('s.id')
+                    ->setFirstResult(0);
+
+                if ($limit !== -1) {
+                    $qb->setMaxResults($limit - count($shares));
+                }
+
+                // Filter by node if provided
+                if ($node !== null) {
+                    $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+                }
+
+
+                $groups = array_filter($groups, function($group) { return $group instanceof IGroup; });
+                $groups = array_map(function(IGroup $group) { return $group->getGID(); }, $groups);
+
+                $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+                    ->andWhere($qb->expr()->in('share_with', $qb->createNamedParameter(
+                        $groups,
+                        IQueryBuilder::PARAM_STR_ARRAY
+                    )))
+                    ->andWhere($qb->expr()->orX(
+                        $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                        $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                    ));
+
+                $cursor = $qb->execute();
+                while($data = $cursor->fetch()) {
+                    if ($offset > 0) {
+                        $offset--;
+                        continue;
+                    }
+
+                    if ($this->isAccessibleResult($data)) {
+                        $shares2[] = $this->createShare($data);
+                    }
+                }
+                $cursor->closeCursor();
+            }
+
+            /*
  			 * Resolve all group shares to user specific shares
  			 */
-			$shares = $this->resolveGroupShares($shares2, $userId);
-		} else {
-			throw new BackendError('Invalid backend');
-		}
-
-
-		return $shares;
-	}
-
-	/**
-	 * Get a share by token
-	 *
-	 * @param string $token
-	 * @return \OCP\Share\IShare
-	 * @throws ShareNotFound
-	 */
-	public function getShareByToken($token) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)))
-			->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->execute();
-
-		$data = $cursor->fetch();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		try {
-			$share = $this->createShare($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Create a share object from an database row
-	 *
-	 * @param mixed[] $data
-	 * @return \OCP\Share\IShare
-	 * @throws InvalidShare
-	 */
-	private function createShare($data) {
-		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
-			->setTarget($data['file_target'])
-			->setNote($data['note'])
-			->setMailSend((bool)$data['mail_send'])
-			->setLabel($data['label']);
-
-		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
-		$share->setShareTime($shareTime);
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			$share->setSharedWith($data['share_with']);
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$share->setSharedWith($data['share_with']);
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			$share->setPassword($data['password']);
-			$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
-			$share->setToken($data['token']);
-		}
-
-		$share->setSharedBy($data['uid_initiator']);
-		$share->setShareOwner($data['uid_owner']);
-
-		$share->setNodeId((int)$data['file_source']);
-		$share->setNodeType($data['item_type']);
-
-		if ($data['expiration'] !== null) {
-			$expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
-			$share->setExpirationDate($expiration);
-		}
-
-		if (isset($data['f_permissions'])) {
-			$entryData = $data;
-			$entryData['permissions'] = $entryData['f_permissions'];
-			$entryData['parent'] = $entryData['f_parent'];
-			$share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData,
-				\OC::$server->getMimeTypeLoader()));
-		}
-
-		$share->setProviderId($this->identifier());
-		$share->setHideDownload((int)$data['hide_download'] === 1);
-
-		return $share;
-	}
-
-	/**
-	 * @param Share[] $shares
-	 * @param $userId
-	 * @return Share[] The updates shares if no update is found for a share return the original
-	 */
-	private function resolveGroupShares($shares, $userId) {
-		$result = [];
-
-		$start = 0;
-		while(true) {
-			/** @var Share[] $shareSlice */
-			$shareSlice = array_slice($shares, $start, 100);
-			$start += 100;
-
-			if ($shareSlice === []) {
-				break;
-			}
-
-			/** @var int[] $ids */
-			$ids = [];
-			/** @var Share[] $shareMap */
-			$shareMap = [];
-
-			foreach ($shareSlice as $share) {
-				$ids[] = (int)$share->getId();
-				$shareMap[$share->getId()] = $share;
-			}
-
-			$qb = $this->dbConn->getQueryBuilder();
-
-			$query = $qb->select('*')
-				->from('share')
-				->where($qb->expr()->in('parent', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				));
-
-			$stmt = $query->execute();
-
-			while($data = $stmt->fetch()) {
-				$shareMap[$data['parent']]->setPermissions((int)$data['permissions']);
-				$shareMap[$data['parent']]->setTarget($data['file_target']);
-				$shareMap[$data['parent']]->setParent($data['parent']);
-			}
-
-			$stmt->closeCursor();
-
-			foreach ($shareMap as $share) {
-				$result[] = $share;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * A user is deleted from the system
-	 * So clean up the relevant shares.
-	 *
-	 * @param string $uid
-	 * @param int $shareType
-	 */
-	public function userDeleted($uid, $shareType) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->delete('share');
-
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
-			/*
+            $shares = $this->resolveGroupShares($shares2, $userId);
+        } else {
+            throw new BackendError('Invalid backend');
+        }
+
+
+        return $shares;
+    }
+
+    /**
+     * Get a share by token
+     *
+     * @param string $token
+     * @return \OCP\Share\IShare
+     * @throws ShareNotFound
+     */
+    public function getShareByToken($token) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)))
+            ->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->execute();
+
+        $data = $cursor->fetch();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        try {
+            $share = $this->createShare($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        return $share;
+    }
+
+    /**
+     * Create a share object from an database row
+     *
+     * @param mixed[] $data
+     * @return \OCP\Share\IShare
+     * @throws InvalidShare
+     */
+    private function createShare($data) {
+        $share = new Share($this->rootFolder, $this->userManager);
+        $share->setId((int)$data['id'])
+            ->setShareType((int)$data['share_type'])
+            ->setPermissions((int)$data['permissions'])
+            ->setTarget($data['file_target'])
+            ->setNote($data['note'])
+            ->setMailSend((bool)$data['mail_send'])
+            ->setLabel($data['label']);
+
+        $shareTime = new \DateTime();
+        $shareTime->setTimestamp((int)$data['stime']);
+        $share->setShareTime($shareTime);
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            $share->setSharedWith($data['share_with']);
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $share->setSharedWith($data['share_with']);
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            $share->setPassword($data['password']);
+            $share->setSendPasswordByTalk((bool)$data['password_by_talk']);
+            $share->setToken($data['token']);
+        }
+
+        $share->setSharedBy($data['uid_initiator']);
+        $share->setShareOwner($data['uid_owner']);
+
+        $share->setNodeId((int)$data['file_source']);
+        $share->setNodeType($data['item_type']);
+
+        if ($data['expiration'] !== null) {
+            $expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
+            $share->setExpirationDate($expiration);
+        }
+
+        if (isset($data['f_permissions'])) {
+            $entryData = $data;
+            $entryData['permissions'] = $entryData['f_permissions'];
+            $entryData['parent'] = $entryData['f_parent'];
+            $share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData,
+                \OC::$server->getMimeTypeLoader()));
+        }
+
+        $share->setProviderId($this->identifier());
+        $share->setHideDownload((int)$data['hide_download'] === 1);
+
+        return $share;
+    }
+
+    /**
+     * @param Share[] $shares
+     * @param $userId
+     * @return Share[] The updates shares if no update is found for a share return the original
+     */
+    private function resolveGroupShares($shares, $userId) {
+        $result = [];
+
+        $start = 0;
+        while(true) {
+            /** @var Share[] $shareSlice */
+            $shareSlice = array_slice($shares, $start, 100);
+            $start += 100;
+
+            if ($shareSlice === []) {
+                break;
+            }
+
+            /** @var int[] $ids */
+            $ids = [];
+            /** @var Share[] $shareMap */
+            $shareMap = [];
+
+            foreach ($shareSlice as $share) {
+                $ids[] = (int)$share->getId();
+                $shareMap[$share->getId()] = $share;
+            }
+
+            $qb = $this->dbConn->getQueryBuilder();
+
+            $query = $qb->select('*')
+                ->from('share')
+                ->where($qb->expr()->in('parent', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ));
+
+            $stmt = $query->execute();
+
+            while($data = $stmt->fetch()) {
+                $shareMap[$data['parent']]->setPermissions((int)$data['permissions']);
+                $shareMap[$data['parent']]->setTarget($data['file_target']);
+                $shareMap[$data['parent']]->setParent($data['parent']);
+            }
+
+            $stmt->closeCursor();
+
+            foreach ($shareMap as $share) {
+                $result[] = $share;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * A user is deleted from the system
+     * So clean up the relevant shares.
+     *
+     * @param string $uid
+     * @param int $shareType
+     */
+    public function userDeleted($uid, $shareType) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->delete('share');
+
+        if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
+            /*
 			 * Delete all user shares that are owned by this user
 			 * or that are received by this user
 			 */
 
-			$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)));
+            $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)));
 
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
-					$qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
-				)
-			);
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
-			/*
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
+                    $qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
+                )
+            );
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
+            /*
 			 * Delete all group shares that are owned by this user
 			 * Or special user group shares that are received by this user
 			 */
-			$qb->where(
-				$qb->expr()->andX(
-					$qb->expr()->orX(
-						$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
-						$qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP))
-					),
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid))
-				)
-			);
-
-			$qb->orWhere(
-				$qb->expr()->andX(
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)),
-					$qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
-				)
-			);
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_LINK) {
-			/*
+            $qb->where(
+                $qb->expr()->andX(
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
+                        $qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP))
+                    ),
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid))
+                )
+            );
+
+            $qb->orWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)),
+                    $qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
+                )
+            );
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_LINK) {
+            /*
 			 * Delete all link shares owned by this user.
 			 * And all link shares initiated by this user (until #22327 is in)
 			 */
-			$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)));
-
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($uid))
-				)
-			);
-		}
-
-		$qb->execute();
-	}
-
-	/**
-	 * Delete all shares received by this group. As well as any custom group
-	 * shares for group members.
-	 *
-	 * @param string $gid
-	 */
-	public function groupDeleted($gid) {
-		/*
+            $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)));
+
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($uid))
+                )
+            );
+        }
+
+        $qb->execute();
+    }
+
+    /**
+     * Delete all shares received by this group. As well as any custom group
+     * shares for group members.
+     *
+     * @param string $gid
+     */
+    public function groupDeleted($gid) {
+        /*
 		 * First delete all custom group shares for group members
 		 */
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('id')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
-
-		$cursor = $qb->execute();
-		$ids = [];
-		while($row = $cursor->fetch()) {
-			$ids[] = (int)$row['id'];
-		}
-		$cursor->closeCursor();
-
-		if (!empty($ids)) {
-			$chunks = array_chunk($ids, 100);
-			foreach ($chunks as $chunk) {
-				$qb->delete('share')
-					->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-					->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
-				$qb->execute();
-			}
-		}
-
-		/*
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('id')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+
+        $cursor = $qb->execute();
+        $ids = [];
+        while($row = $cursor->fetch()) {
+            $ids[] = (int)$row['id'];
+        }
+        $cursor->closeCursor();
+
+        if (!empty($ids)) {
+            $chunks = array_chunk($ids, 100);
+            foreach ($chunks as $chunk) {
+                $qb->delete('share')
+                    ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                    ->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
+                $qb->execute();
+            }
+        }
+
+        /*
 		 * Now delete all the group shares
 		 */
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
-		$qb->execute();
-	}
-
-	/**
-	 * Delete custom group shares to this group for this user
-	 *
-	 * @param string $uid
-	 * @param string $gid
-	 */
-	public function userDeletedFromGroup($uid, $gid) {
-		/*
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+        $qb->execute();
+    }
+
+    /**
+     * Delete custom group shares to this group for this user
+     *
+     * @param string $uid
+     * @param string $gid
+     */
+    public function userDeletedFromGroup($uid, $gid) {
+        /*
 		 * Get all group shares
 		 */
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('id')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
-
-		$cursor = $qb->execute();
-		$ids = [];
-		while($row = $cursor->fetch()) {
-			$ids[] = (int)$row['id'];
-		}
-		$cursor->closeCursor();
-
-		if (!empty($ids)) {
-			$chunks = array_chunk($ids, 100);
-			foreach ($chunks as $chunk) {
-				/*
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('id')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+
+        $cursor = $qb->execute();
+        $ids = [];
+        while($row = $cursor->fetch()) {
+            $ids[] = (int)$row['id'];
+        }
+        $cursor->closeCursor();
+
+        if (!empty($ids)) {
+            $chunks = array_chunk($ids, 100);
+            foreach ($chunks as $chunk) {
+                /*
 				 * Delete all special shares wit this users for the found group shares
 				 */
-				$qb->delete('share')
-					->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-					->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($uid)))
-					->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
-				$qb->execute();
-			}
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAccessList($nodes, $currentAccess) {
-		$ids = [];
-		foreach ($nodes as $node) {
-			$ids[] = $node->getId();
-		}
-
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$or = $qb->expr()->orX(
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK))
-		);
-
-		if ($currentAccess) {
-			$or->add($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)));
-		}
-
-		$qb->select('id', 'parent', 'share_type', 'share_with', 'file_source', 'file_target', 'permissions')
-			->from('share')
-			->where(
-				$or
-			)
-			->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
-		$cursor = $qb->execute();
-
-		$users = [];
-		$link = false;
-		while($row = $cursor->fetch()) {
-			$type = (int)$row['share_type'];
-			if ($type === \OCP\Share::SHARE_TYPE_USER) {
-				$uid = $row['share_with'];
-				$users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
-				$users[$uid][$row['id']] = $row;
-			} else if ($type === \OCP\Share::SHARE_TYPE_GROUP) {
-				$gid = $row['share_with'];
-				$group = $this->groupManager->get($gid);
-
-				if ($group === null) {
-					continue;
-				}
-
-				$userList = $group->getUsers();
-				foreach ($userList as $user) {
-					$uid = $user->getUID();
-					$users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
-					$users[$uid][$row['id']] = $row;
-				}
-			} else if ($type === \OCP\Share::SHARE_TYPE_LINK) {
-				$link = true;
-			} else if ($type === self::SHARE_TYPE_USERGROUP && $currentAccess === true) {
-				$uid = $row['share_with'];
-				$users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
-				$users[$uid][$row['id']] = $row;
-			}
-		}
-		$cursor->closeCursor();
-
-		if ($currentAccess === true) {
-			$users = array_map([$this, 'filterSharesOfUser'], $users);
-			$users = array_filter($users);
-		} else {
-			$users = array_keys($users);
-		}
-
-		return ['users' => $users, 'public' => $link];
-	}
-
-	/**
-	 * For each user the path with the fewest slashes is returned
-	 * @param array $shares
-	 * @return array
-	 */
-	protected function filterSharesOfUser(array $shares) {
-		// Group shares when the user has a share exception
-		foreach ($shares as $id => $share) {
-			$type = (int) $share['share_type'];
-			$permissions = (int) $share['permissions'];
-
-			if ($type === self::SHARE_TYPE_USERGROUP) {
-				unset($shares[$share['parent']]);
-
-				if ($permissions === 0) {
-					unset($shares[$id]);
-				}
-			}
-		}
-
-		$best = [];
-		$bestDepth = 0;
-		foreach ($shares as $id => $share) {
-			$depth = substr_count($share['file_target'], '/');
-			if (empty($best) || $depth < $bestDepth) {
-				$bestDepth = $depth;
-				$best = [
-					'node_id' => $share['file_source'],
-					'node_path' => $share['file_target'],
-				];
-			}
-		}
-
-		return $best;
-	}
-
-	/**
-	 * propagate notes to the recipients
-	 *
-	 * @param IShare $share
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function propagateNote(IShare $share) {
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			$user = $this->userManager->get($share->getSharedWith());
-			$this->sendNote([$user], $share);
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$groupMembers = $group->getUsers();
-			$this->sendNote($groupMembers, $share);
-		}
-	}
-
-	/**
-	 * send note by mail
-	 *
-	 * @param array $recipients
-	 * @param IShare $share
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function sendNote(array $recipients, IShare $share) {
-
-		$toList = [];
-
-		foreach ($recipients as $recipient) {
-			/** @var IUser $recipient */
-			$email = $recipient->getEMailAddress();
-			if ($email) {
-				$toList[$email] = $recipient->getDisplayName();
-			}
-		}
-
-		if (!empty($toList)) {
-
-			$filename = $share->getNode()->getName();
-			$initiator = $share->getSharedBy();
-			$note = $share->getNote();
-
-			$initiatorUser = $this->userManager->get($initiator);
-			$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-			$initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-			$plainHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add:', [$initiatorDisplayName, $filename]);
-			$htmlHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add', [$initiatorDisplayName, $filename]);
-			$message = $this->mailer->createMessage();
-
-			$emailTemplate = $this->mailer->createEMailTemplate('defaultShareProvider.sendNote');
-
-			$emailTemplate->setSubject($this->l->t('»%s« added a note to a file shared with you', [$initiatorDisplayName]));
-			$emailTemplate->addHeader();
-			$emailTemplate->addHeading($htmlHeading, $plainHeading);
-			$emailTemplate->addBodyText(htmlspecialchars($note), $note);
-
-			$link = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]);
-			$emailTemplate->addBodyButton(
-				$this->l->t('Open »%s«', [$filename]),
-				$link
-			);
-
-
-			// The "From" contains the sharers name
-			$instanceName = $this->defaults->getName();
-			$senderName = $this->l->t(
-				'%1$s via %2$s',
-				[
-					$initiatorDisplayName,
-					$instanceName
-				]
-			);
-			$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-			if ($initiatorEmailAddress !== null) {
-				$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
-			} else {
-				$emailTemplate->addFooter();
-			}
-
-			if (count($toList) === 1) {
-				$message->setTo($toList);
-			} else {
-				$message->setTo([]);
-				$message->setBcc($toList);
-			}
-			$message->useTemplate($emailTemplate);
-			$this->mailer->send($message);
-		}
-
-	}
+                $qb->delete('share')
+                    ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                    ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($uid)))
+                    ->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
+                $qb->execute();
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAccessList($nodes, $currentAccess) {
+        $ids = [];
+        foreach ($nodes as $node) {
+            $ids[] = $node->getId();
+        }
+
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $or = $qb->expr()->orX(
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK))
+        );
+
+        if ($currentAccess) {
+            $or->add($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)));
+        }
+
+        $qb->select('id', 'parent', 'share_type', 'share_with', 'file_source', 'file_target', 'permissions')
+            ->from('share')
+            ->where(
+                $or
+            )
+            ->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ));
+        $cursor = $qb->execute();
+
+        $users = [];
+        $link = false;
+        while($row = $cursor->fetch()) {
+            $type = (int)$row['share_type'];
+            if ($type === \OCP\Share::SHARE_TYPE_USER) {
+                $uid = $row['share_with'];
+                $users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
+                $users[$uid][$row['id']] = $row;
+            } else if ($type === \OCP\Share::SHARE_TYPE_GROUP) {
+                $gid = $row['share_with'];
+                $group = $this->groupManager->get($gid);
+
+                if ($group === null) {
+                    continue;
+                }
+
+                $userList = $group->getUsers();
+                foreach ($userList as $user) {
+                    $uid = $user->getUID();
+                    $users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
+                    $users[$uid][$row['id']] = $row;
+                }
+            } else if ($type === \OCP\Share::SHARE_TYPE_LINK) {
+                $link = true;
+            } else if ($type === self::SHARE_TYPE_USERGROUP && $currentAccess === true) {
+                $uid = $row['share_with'];
+                $users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
+                $users[$uid][$row['id']] = $row;
+            }
+        }
+        $cursor->closeCursor();
+
+        if ($currentAccess === true) {
+            $users = array_map([$this, 'filterSharesOfUser'], $users);
+            $users = array_filter($users);
+        } else {
+            $users = array_keys($users);
+        }
+
+        return ['users' => $users, 'public' => $link];
+    }
+
+    /**
+     * For each user the path with the fewest slashes is returned
+     * @param array $shares
+     * @return array
+     */
+    protected function filterSharesOfUser(array $shares) {
+        // Group shares when the user has a share exception
+        foreach ($shares as $id => $share) {
+            $type = (int) $share['share_type'];
+            $permissions = (int) $share['permissions'];
+
+            if ($type === self::SHARE_TYPE_USERGROUP) {
+                unset($shares[$share['parent']]);
+
+                if ($permissions === 0) {
+                    unset($shares[$id]);
+                }
+            }
+        }
+
+        $best = [];
+        $bestDepth = 0;
+        foreach ($shares as $id => $share) {
+            $depth = substr_count($share['file_target'], '/');
+            if (empty($best) || $depth < $bestDepth) {
+                $bestDepth = $depth;
+                $best = [
+                    'node_id' => $share['file_source'],
+                    'node_path' => $share['file_target'],
+                ];
+            }
+        }
+
+        return $best;
+    }
+
+    /**
+     * propagate notes to the recipients
+     *
+     * @param IShare $share
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function propagateNote(IShare $share) {
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            $user = $this->userManager->get($share->getSharedWith());
+            $this->sendNote([$user], $share);
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $groupMembers = $group->getUsers();
+            $this->sendNote($groupMembers, $share);
+        }
+    }
+
+    /**
+     * send note by mail
+     *
+     * @param array $recipients
+     * @param IShare $share
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function sendNote(array $recipients, IShare $share) {
+
+        $toList = [];
+
+        foreach ($recipients as $recipient) {
+            /** @var IUser $recipient */
+            $email = $recipient->getEMailAddress();
+            if ($email) {
+                $toList[$email] = $recipient->getDisplayName();
+            }
+        }
+
+        if (!empty($toList)) {
+
+            $filename = $share->getNode()->getName();
+            $initiator = $share->getSharedBy();
+            $note = $share->getNote();
+
+            $initiatorUser = $this->userManager->get($initiator);
+            $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+            $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+            $plainHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add:', [$initiatorDisplayName, $filename]);
+            $htmlHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add', [$initiatorDisplayName, $filename]);
+            $message = $this->mailer->createMessage();
+
+            $emailTemplate = $this->mailer->createEMailTemplate('defaultShareProvider.sendNote');
+
+            $emailTemplate->setSubject($this->l->t('»%s« added a note to a file shared with you', [$initiatorDisplayName]));
+            $emailTemplate->addHeader();
+            $emailTemplate->addHeading($htmlHeading, $plainHeading);
+            $emailTemplate->addBodyText(htmlspecialchars($note), $note);
+
+            $link = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]);
+            $emailTemplate->addBodyButton(
+                $this->l->t('Open »%s«', [$filename]),
+                $link
+            );
+
+
+            // The "From" contains the sharers name
+            $instanceName = $this->defaults->getName();
+            $senderName = $this->l->t(
+                '%1$s via %2$s',
+                [
+                    $initiatorDisplayName,
+                    $instanceName
+                ]
+            );
+            $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+            if ($initiatorEmailAddress !== null) {
+                $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
+                $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+            } else {
+                $emailTemplate->addFooter();
+            }
+
+            if (count($toList) === 1) {
+                $message->setTo($toList);
+            } else {
+                $message->setTo([]);
+                $message->setBcc($toList);
+            }
+            $message->useTemplate($emailTemplate);
+            $this->mailer->send($message);
+        }
+
+    }
 }

Spacing +27 added lines, -27 removed lines

@@ -348,7 +348,7 @@ 
 			->orderBy('id');
 
 		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$children[] = $this->createShare($data);
 		}
 		$cursor->closeCursor();
@@ -393,7 +393,7 @@ 
 			$user = $this->userManager->get($recipient);
 
 			if (is_null($group)) {
-				throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
+				throw new ProviderException('Group "'.$share->getSharedWith().'" does not exist');
 			}
 
 			if (!$group->inGroup($user)) {
@@ -588,7 +588,7 @@ 
 			);
 		}
 
-		$qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+		$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
 		$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
 
 		$qb->orderBy('id');
@@ -644,7 +644,7 @@ 
 
 		$cursor = $qb->execute();
 		$shares = [];
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$shares[] = $this->createShare($data);
 		}
 		$cursor->closeCursor();
@@ -723,7 +723,7 @@ 
 			->execute();
 
 		$shares = [];
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$shares[] = $this->createShare($data);
 		}
 		$cursor->closeCursor();
@@ -794,7 +794,7 @@ 
 
 			$cursor = $qb->execute();
 
-			while($data = $cursor->fetch()) {
+			while ($data = $cursor->fetch()) {
 				if ($this->isAccessibleResult($data)) {
 					$shares[] = $this->createShare($data);
 				}
@@ -809,7 +809,7 @@ 
 			$shares2 = [];
 
 			$start = 0;
-			while(true) {
+			while (true) {
 				$groups = array_slice($allGroups, $start, 100);
 				$start += 100;
 
@@ -854,7 +854,7 @@ 
 					));
 
 				$cursor = $qb->execute();
-				while($data = $cursor->fetch()) {
+				while ($data = $cursor->fetch()) {
 					if ($offset > 0) {
 						$offset--;
 						continue;
@@ -923,16 +923,16 @@ 
 	 */
 	private function createShare($data) {
 		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
+		$share->setId((int) $data['id'])
+			->setShareType((int) $data['share_type'])
+			->setPermissions((int) $data['permissions'])
 			->setTarget($data['file_target'])
 			->setNote($data['note'])
-			->setMailSend((bool)$data['mail_send'])
+			->setMailSend((bool) $data['mail_send'])
 			->setLabel($data['label']);
 
 		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
+		$shareTime->setTimestamp((int) $data['stime']);
 		$share->setShareTime($shareTime);
 
 		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
@@ -941,14 +941,14 @@ 
 			$share->setSharedWith($data['share_with']);
 		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
 			$share->setPassword($data['password']);
-			$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
+			$share->setSendPasswordByTalk((bool) $data['password_by_talk']);
 			$share->setToken($data['token']);
 		}
 
 		$share->setSharedBy($data['uid_initiator']);
 		$share->setShareOwner($data['uid_owner']);
 
-		$share->setNodeId((int)$data['file_source']);
+		$share->setNodeId((int) $data['file_source']);
 		$share->setNodeType($data['item_type']);
 
 		if ($data['expiration'] !== null) {
@@ -965,7 +965,7 @@ 
 		}
 
 		$share->setProviderId($this->identifier());
-		$share->setHideDownload((int)$data['hide_download'] === 1);
+		$share->setHideDownload((int) $data['hide_download'] === 1);
 
 		return $share;
 	}
@@ -979,7 +979,7 @@ 
 		$result = [];
 
 		$start = 0;
-		while(true) {
+		while (true) {
 			/** @var Share[] $shareSlice */
 			$shareSlice = array_slice($shares, $start, 100);
 			$start += 100;
@@ -994,7 +994,7 @@ 
 			$shareMap = [];
 
 			foreach ($shareSlice as $share) {
-				$ids[] = (int)$share->getId();
+				$ids[] = (int) $share->getId();
 				$shareMap[$share->getId()] = $share;
 			}
 
@@ -1011,8 +1011,8 @@ 
 
 			$stmt = $query->execute();
 
-			while($data = $stmt->fetch()) {
-				$shareMap[$data['parent']]->setPermissions((int)$data['permissions']);
+			while ($data = $stmt->fetch()) {
+				$shareMap[$data['parent']]->setPermissions((int) $data['permissions']);
 				$shareMap[$data['parent']]->setTarget($data['file_target']);
 				$shareMap[$data['parent']]->setParent($data['parent']);
 			}
@@ -1110,8 +1110,8 @@ 
 
 		$cursor = $qb->execute();
 		$ids = [];
-		while($row = $cursor->fetch()) {
-			$ids[] = (int)$row['id'];
+		while ($row = $cursor->fetch()) {
+			$ids[] = (int) $row['id'];
 		}
 		$cursor->closeCursor();
 
@@ -1153,8 +1153,8 @@ 
 
 		$cursor = $qb->execute();
 		$ids = [];
-		while($row = $cursor->fetch()) {
-			$ids[] = (int)$row['id'];
+		while ($row = $cursor->fetch()) {
+			$ids[] = (int) $row['id'];
 		}
 		$cursor->closeCursor();
 
@@ -1208,8 +1208,8 @@ 
 
 		$users = [];
 		$link = false;
-		while($row = $cursor->fetch()) {
-			$type = (int)$row['share_type'];
+		while ($row = $cursor->fetch()) {
+			$type = (int) $row['share_type'];
 			if ($type === \OCP\Share::SHARE_TYPE_USER) {
 				$uid = $row['share_with'];
 				$users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
@@ -1359,7 +1359,7 @@ 
 			$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 			if ($initiatorEmailAddress !== null) {
 				$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+				$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 			} else {
 				$emailTemplate->addFooter();
 			}

apps/files_sharing/lib/Controller/ShareAPIController.php

Indentation +1050 added lines, -1050 removed lines

@@ -66,1060 +66,1060 @@
  */
 class ShareAPIController extends OCSController {
 
-	/** @var IManager */
-	private $shareManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var string */
-	private $currentUser;
-	/** @var IL10N */
-	private $l;
-	/** @var \OCP\Files\Node */
-	private $lockedNode;
-	/** @var IConfig */
-	private $config;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	/**
-	 * Share20OCS constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IManager $shareManager
-	 * @param IGroupManager $groupManager
-	 * @param IUserManager $userManager
-	 * @param IRootFolder $rootFolder
-	 * @param IURLGenerator $urlGenerator
-	 * @param string $userId
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param IAppManager $appManager
-	 * @param IServerContainer $serverContainer
-	 */
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IManager $shareManager,
-		IGroupManager $groupManager,
-		IUserManager $userManager,
-		IRootFolder $rootFolder,
-		IURLGenerator $urlGenerator,
-		string $userId = null,
-		IL10N $l10n,
-		IConfig $config,
-		IAppManager $appManager,
-		IServerContainer $serverContainer
-	) {
-		parent::__construct($appName, $request);
-
-		$this->shareManager = $shareManager;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->request = $request;
-		$this->rootFolder = $rootFolder;
-		$this->urlGenerator = $urlGenerator;
-		$this->currentUser = $userId;
-		$this->l = $l10n;
-		$this->config = $config;
-		$this->appManager = $appManager;
-		$this->serverContainer = $serverContainer;
-	}
-
-	/**
-	 * Convert an IShare to an array for OCS output
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param Node|null $recipientNode
-	 * @return array
-	 * @throws NotFoundException In case the node can't be resolved.
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function formatShare(\OCP\Share\IShare $share, Node $recipientNode = null): array {
-		$sharedBy = $this->userManager->get($share->getSharedBy());
-		$shareOwner = $this->userManager->get($share->getShareOwner());
-
-		$result = [
-			'id' => $share->getId(),
-			'share_type' => $share->getShareType(),
-			'uid_owner' => $share->getSharedBy(),
-			'displayname_owner' => $sharedBy !== null ? $sharedBy->getDisplayName() : $share->getSharedBy(),
-			'permissions' => $share->getPermissions(),
-			'stime' => $share->getShareTime()->getTimestamp(),
-			'parent' => null,
-			'expiration' => null,
-			'token' => null,
-			'uid_file_owner' => $share->getShareOwner(),
-			'note' => $share->getNote(),
-			'label' => $share->getLabel(),
-			'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
-		];
-
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		if ($recipientNode) {
-			$node = $recipientNode;
-		} else {
-			$nodes = $userFolder->getById($share->getNodeId());
-			if (empty($nodes)) {
-				// fallback to guessing the path
-				$node = $userFolder->get($share->getTarget());
-				if ($node === null || $share->getTarget() === '') {
-					throw new NotFoundException();
-				}
-			} else {
-				$node = $nodes[0];
-			}
-		}
-
-		$result['path'] = $userFolder->getRelativePath($node->getPath());
-		if ($node instanceOf \OCP\Files\Folder) {
-			$result['item_type'] = 'folder';
-		} else {
-			$result['item_type'] = 'file';
-		}
-		$result['mimetype'] = $node->getMimetype();
-		$result['storage_id'] = $node->getStorage()->getId();
-		$result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
-		$result['item_source'] = $node->getId();
-		$result['file_source'] = $node->getId();
-		$result['file_parent'] = $node->getParent()->getId();
-		$result['file_target'] = $share->getTarget();
-
-		$expiration = $share->getExpirationDate();
-		if ($expiration !== null) {
-			$result['expiration'] = $expiration->format('Y-m-d 00:00:00');
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_USER) {
-			$sharedWith = $this->userManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_LINK) {
-
-			$result['share_with'] = $share->getPassword();
-			$result['share_with_displayname'] = $share->getPassword();
-
-			$result['send_password_by_talk'] = $share->getSendPasswordByTalk();
-
-			$result['token'] = $share->getToken();
-			$result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
-
-		} else if ($share->getShareType() === Share::SHARE_TYPE_REMOTE || $share->getShareType() === Share::SHARE_TYPE_REMOTE_GROUP) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
-			$result['token'] = $share->getToken();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['password'] = $share->getPassword();
-			$result['send_password_by_talk'] = $share->getSendPasswordByTalk();
-			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
-			$result['token'] = $share->getToken();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
-			// getSharedWith() returns either "name (type, owner)" or
-			// "name (type, owner) [id]", depending on the Circles app version.
-			$hasCircleId = (substr($share->getSharedWith(), -1) === ']');
-
-			$result['share_with_displayname'] = $share->getSharedWithDisplayName();
-			if (empty($result['share_with_displayname'])) {
-				$displayNameLength = ($hasCircleId? strrpos($share->getSharedWith(), ' '): strlen($share->getSharedWith()));
-				$result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength);
-			}
-
-			$result['share_with_avatar'] = $share->getSharedWithAvatar();
-
-			$shareWithStart = ($hasCircleId? strrpos($share->getSharedWith(), '[') + 1: 0);
-			$shareWithLength = ($hasCircleId? -1: strpos($share->getSharedWith(), ' '));
-			$result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
-		} else if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = '';
-
-			try {
-				$result = array_merge($result, $this->getRoomShareHelper()->formatShare($share));
-			} catch (QueryException $e) {
-			}
-		}
-
-
-		$result['mail_send'] = $share->getMailSend() ? 1 : 0;
-		$result['hide_download'] = $share->getHideDownload() ? 1 : 0;
-
-		return $result;
-	}
-
-	/**
-	 * Check if one of the users address books knows the exact property, if
-	 * yes we return the full name.
-	 *
-	 * @param string $query
-	 * @param string $property
-	 * @return string
-	 */
-	private function getDisplayNameFromAddressBook(string $query, string $property): string {
-		// FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
-		$result = \OC::$server->getContactsManager()->search($query, [$property]);
-		foreach ($result as $r) {
-			foreach($r[$property] as $value) {
-				if ($value === $query) {
-					return $r['FN'];
-				}
-			}
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Get a specific share by id
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function getShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		if ($this->canAccessShare($share)) {
-			try {
-				$share = $this->formatShare($share);
-				return new DataResponse([$share]);
-			} catch (NotFoundException $e) {
-				//Fall trough
-			}
-		}
-
-		throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function deleteShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		try {
-			$this->lock($share->getNode());
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('could not delete share'));
-		}
-
-		if (!$this->canAccessShare($share)) {
-			throw new OCSNotFoundException($this->l->t('Could not delete share'));
-		}
-
-		if (($share->getShareType() === Share::SHARE_TYPE_GROUP ||
-				$share->getShareType() === Share::SHARE_TYPE_ROOM) &&
-			$share->getShareOwner() !== $this->currentUser &&
-			$share->getSharedBy() !== $this->currentUser) {
-			$this->shareManager->deleteFromSelf($share, $this->currentUser);
-		} else {
-			$this->shareManager->deleteShare($share);
-		}
-
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $path
-	 * @param int $permissions
-	 * @param int $shareType
-	 * @param string $shareWith
-	 * @param string $publicUpload
-	 * @param string $password
-	 * @param string $sendPasswordByTalk
-	 * @param string $expireDate
-	 * @param string $label
-	 *
-	 * @return DataResponse
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 * @throws OCSNotFoundException
-	 * @throws \OCP\Files\InvalidPathException
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	public function createShare(
-		string $path = null,
-		int $permissions = null,
-		int $shareType = -1,
-		string $shareWith = null,
-		string $publicUpload = 'false',
-		string $password = '',
-		string $sendPasswordByTalk = null,
-		string $expireDate = '',
-		string $label = ''
-	): DataResponse {
-		$share = $this->shareManager->newShare();
-
-		if ($permissions === null) {
-			$permissions = $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
-		}
-
-		// Verify path
-		if ($path === null) {
-			throw new OCSNotFoundException($this->l->t('Please specify a file or folder path'));
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		try {
-			$path = $userFolder->get($path);
-		} catch (NotFoundException $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
-		}
-
-		$share->setNode($path);
-
-		try {
-			$this->lock($share->getNode());
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('Could not create share'));
-		}
-
-		if ($permissions < 0 || $permissions > Constants::PERMISSION_ALL) {
-			throw new OCSNotFoundException($this->l->t('invalid permissions'));
-		}
-
-		// Shares always require read permissions
-		$permissions |= Constants::PERMISSION_READ;
-
-		if ($path instanceof \OCP\Files\File) {
-			// Single file shares should never have delete or create permissions
-			$permissions &= ~Constants::PERMISSION_DELETE;
-			$permissions &= ~Constants::PERMISSION_CREATE;
-		}
-
-		/*
+    /** @var IManager */
+    private $shareManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var string */
+    private $currentUser;
+    /** @var IL10N */
+    private $l;
+    /** @var \OCP\Files\Node */
+    private $lockedNode;
+    /** @var IConfig */
+    private $config;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var IServerContainer */
+    private $serverContainer;
+
+    /**
+     * Share20OCS constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IManager $shareManager
+     * @param IGroupManager $groupManager
+     * @param IUserManager $userManager
+     * @param IRootFolder $rootFolder
+     * @param IURLGenerator $urlGenerator
+     * @param string $userId
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param IAppManager $appManager
+     * @param IServerContainer $serverContainer
+     */
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IManager $shareManager,
+        IGroupManager $groupManager,
+        IUserManager $userManager,
+        IRootFolder $rootFolder,
+        IURLGenerator $urlGenerator,
+        string $userId = null,
+        IL10N $l10n,
+        IConfig $config,
+        IAppManager $appManager,
+        IServerContainer $serverContainer
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->shareManager = $shareManager;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->request = $request;
+        $this->rootFolder = $rootFolder;
+        $this->urlGenerator = $urlGenerator;
+        $this->currentUser = $userId;
+        $this->l = $l10n;
+        $this->config = $config;
+        $this->appManager = $appManager;
+        $this->serverContainer = $serverContainer;
+    }
+
+    /**
+     * Convert an IShare to an array for OCS output
+     *
+     * @param \OCP\Share\IShare $share
+     * @param Node|null $recipientNode
+     * @return array
+     * @throws NotFoundException In case the node can't be resolved.
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function formatShare(\OCP\Share\IShare $share, Node $recipientNode = null): array {
+        $sharedBy = $this->userManager->get($share->getSharedBy());
+        $shareOwner = $this->userManager->get($share->getShareOwner());
+
+        $result = [
+            'id' => $share->getId(),
+            'share_type' => $share->getShareType(),
+            'uid_owner' => $share->getSharedBy(),
+            'displayname_owner' => $sharedBy !== null ? $sharedBy->getDisplayName() : $share->getSharedBy(),
+            'permissions' => $share->getPermissions(),
+            'stime' => $share->getShareTime()->getTimestamp(),
+            'parent' => null,
+            'expiration' => null,
+            'token' => null,
+            'uid_file_owner' => $share->getShareOwner(),
+            'note' => $share->getNote(),
+            'label' => $share->getLabel(),
+            'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
+        ];
+
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        if ($recipientNode) {
+            $node = $recipientNode;
+        } else {
+            $nodes = $userFolder->getById($share->getNodeId());
+            if (empty($nodes)) {
+                // fallback to guessing the path
+                $node = $userFolder->get($share->getTarget());
+                if ($node === null || $share->getTarget() === '') {
+                    throw new NotFoundException();
+                }
+            } else {
+                $node = $nodes[0];
+            }
+        }
+
+        $result['path'] = $userFolder->getRelativePath($node->getPath());
+        if ($node instanceOf \OCP\Files\Folder) {
+            $result['item_type'] = 'folder';
+        } else {
+            $result['item_type'] = 'file';
+        }
+        $result['mimetype'] = $node->getMimetype();
+        $result['storage_id'] = $node->getStorage()->getId();
+        $result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
+        $result['item_source'] = $node->getId();
+        $result['file_source'] = $node->getId();
+        $result['file_parent'] = $node->getParent()->getId();
+        $result['file_target'] = $share->getTarget();
+
+        $expiration = $share->getExpirationDate();
+        if ($expiration !== null) {
+            $result['expiration'] = $expiration->format('Y-m-d 00:00:00');
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_USER) {
+            $sharedWith = $this->userManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_LINK) {
+
+            $result['share_with'] = $share->getPassword();
+            $result['share_with_displayname'] = $share->getPassword();
+
+            $result['send_password_by_talk'] = $share->getSendPasswordByTalk();
+
+            $result['token'] = $share->getToken();
+            $result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
+
+        } else if ($share->getShareType() === Share::SHARE_TYPE_REMOTE || $share->getShareType() === Share::SHARE_TYPE_REMOTE_GROUP) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
+            $result['token'] = $share->getToken();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['password'] = $share->getPassword();
+            $result['send_password_by_talk'] = $share->getSendPasswordByTalk();
+            $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
+            $result['token'] = $share->getToken();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
+            // getSharedWith() returns either "name (type, owner)" or
+            // "name (type, owner) [id]", depending on the Circles app version.
+            $hasCircleId = (substr($share->getSharedWith(), -1) === ']');
+
+            $result['share_with_displayname'] = $share->getSharedWithDisplayName();
+            if (empty($result['share_with_displayname'])) {
+                $displayNameLength = ($hasCircleId? strrpos($share->getSharedWith(), ' '): strlen($share->getSharedWith()));
+                $result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength);
+            }
+
+            $result['share_with_avatar'] = $share->getSharedWithAvatar();
+
+            $shareWithStart = ($hasCircleId? strrpos($share->getSharedWith(), '[') + 1: 0);
+            $shareWithLength = ($hasCircleId? -1: strpos($share->getSharedWith(), ' '));
+            $result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
+        } else if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = '';
+
+            try {
+                $result = array_merge($result, $this->getRoomShareHelper()->formatShare($share));
+            } catch (QueryException $e) {
+            }
+        }
+
+
+        $result['mail_send'] = $share->getMailSend() ? 1 : 0;
+        $result['hide_download'] = $share->getHideDownload() ? 1 : 0;
+
+        return $result;
+    }
+
+    /**
+     * Check if one of the users address books knows the exact property, if
+     * yes we return the full name.
+     *
+     * @param string $query
+     * @param string $property
+     * @return string
+     */
+    private function getDisplayNameFromAddressBook(string $query, string $property): string {
+        // FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
+        $result = \OC::$server->getContactsManager()->search($query, [$property]);
+        foreach ($result as $r) {
+            foreach($r[$property] as $value) {
+                if ($value === $query) {
+                    return $r['FN'];
+                }
+            }
+        }
+
+        return $query;
+    }
+
+    /**
+     * Get a specific share by id
+     *
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function getShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        if ($this->canAccessShare($share)) {
+            try {
+                $share = $this->formatShare($share);
+                return new DataResponse([$share]);
+            } catch (NotFoundException $e) {
+                //Fall trough
+            }
+        }
+
+        throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+    }
+
+    /**
+     * Delete a share
+     *
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function deleteShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        try {
+            $this->lock($share->getNode());
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('could not delete share'));
+        }
+
+        if (!$this->canAccessShare($share)) {
+            throw new OCSNotFoundException($this->l->t('Could not delete share'));
+        }
+
+        if (($share->getShareType() === Share::SHARE_TYPE_GROUP ||
+                $share->getShareType() === Share::SHARE_TYPE_ROOM) &&
+            $share->getShareOwner() !== $this->currentUser &&
+            $share->getSharedBy() !== $this->currentUser) {
+            $this->shareManager->deleteFromSelf($share, $this->currentUser);
+        } else {
+            $this->shareManager->deleteShare($share);
+        }
+
+        return new DataResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $path
+     * @param int $permissions
+     * @param int $shareType
+     * @param string $shareWith
+     * @param string $publicUpload
+     * @param string $password
+     * @param string $sendPasswordByTalk
+     * @param string $expireDate
+     * @param string $label
+     *
+     * @return DataResponse
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     * @throws OCSNotFoundException
+     * @throws \OCP\Files\InvalidPathException
+     * @suppress PhanUndeclaredClassMethod
+     */
+    public function createShare(
+        string $path = null,
+        int $permissions = null,
+        int $shareType = -1,
+        string $shareWith = null,
+        string $publicUpload = 'false',
+        string $password = '',
+        string $sendPasswordByTalk = null,
+        string $expireDate = '',
+        string $label = ''
+    ): DataResponse {
+        $share = $this->shareManager->newShare();
+
+        if ($permissions === null) {
+            $permissions = $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
+        }
+
+        // Verify path
+        if ($path === null) {
+            throw new OCSNotFoundException($this->l->t('Please specify a file or folder path'));
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        try {
+            $path = $userFolder->get($path);
+        } catch (NotFoundException $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
+        }
+
+        $share->setNode($path);
+
+        try {
+            $this->lock($share->getNode());
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('Could not create share'));
+        }
+
+        if ($permissions < 0 || $permissions > Constants::PERMISSION_ALL) {
+            throw new OCSNotFoundException($this->l->t('invalid permissions'));
+        }
+
+        // Shares always require read permissions
+        $permissions |= Constants::PERMISSION_READ;
+
+        if ($path instanceof \OCP\Files\File) {
+            // Single file shares should never have delete or create permissions
+            $permissions &= ~Constants::PERMISSION_DELETE;
+            $permissions &= ~Constants::PERMISSION_CREATE;
+        }
+
+        /*
 		 * Hack for https://github.com/owncloud/core/issues/22587
 		 * We check the permissions via webdav. But the permissions of the mount point
 		 * do not equal the share permissions. Here we fix that for federated mounts.
 		 */
-		if ($path->getStorage()->instanceOfStorage(Storage::class)) {
-			$permissions &= ~($permissions & ~$path->getPermissions());
-		}
-
-		if ($shareType === Share::SHARE_TYPE_USER) {
-			// Valid user is required to share
-			if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_GROUP) {
-			if (!$this->shareManager->allowGroupSharing()) {
-				throw new OCSNotFoundException($this->l->t('Group sharing is disabled by the administrator'));
-			}
-
-			// Valid group is required to share
-			if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid group'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_LINK) {
-			//Can we even share links?
-			if (!$this->shareManager->shareApiAllowLinks()) {
-				throw new OCSNotFoundException($this->l->t('Public link sharing is disabled by the administrator'));
-			}
-
-			if ($publicUpload === 'true') {
-				// Check if public upload is allowed
-				if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
-					throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
-				}
-
-				// Public upload can only be set for folders
-				if ($path instanceof \OCP\Files\File) {
-					throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders'));
-				}
-
-				$share->setPermissions(
-					Constants::PERMISSION_READ |
-					Constants::PERMISSION_CREATE |
-					Constants::PERMISSION_UPDATE |
-					Constants::PERMISSION_DELETE
-				);
-			} else {
-				$share->setPermissions(Constants::PERMISSION_READ);
-			}
-
-			// Set password
-			if ($password !== '') {
-				$share->setPassword($password);
-			}
-
-
-			if (!empty($label)) {
-				$share->setLabel($label);
-			}
-
-			if ($sendPasswordByTalk === 'true') {
-				if (!$this->appManager->isEnabledForUser('spreed')) {
-					throw new OCSForbiddenException($this->l->t('Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled', [$path->getPath()]));
-				}
-
-				$share->setSendPasswordByTalk(true);
-			}
-
-			//Expire date
-			if ($expireDate !== '') {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-					$share->setExpirationDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSNotFoundException($this->l->t('Invalid date, date format must be YYYY-MM-DD'));
-				}
-			}
-
-		} else if ($shareType === Share::SHARE_TYPE_REMOTE) {
-			if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-				throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
-			}
-
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		}  else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
-			if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-				throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
-			}
-
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_EMAIL) {
-			if ($share->getNodeType() === 'file') {
-				$share->setPermissions(Constants::PERMISSION_READ);
-			} else {
-				$share->setPermissions($permissions);
-			}
-			$share->setSharedWith($shareWith);
-
-			if ($sendPasswordByTalk === 'true') {
-				if (!$this->appManager->isEnabledForUser('spreed')) {
-					throw new OCSForbiddenException($this->l->t('Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled', [$path->getPath()]));
-				}
-
-				$share->setSendPasswordByTalk(true);
-			}
-		} else if ($shareType === Share::SHARE_TYPE_CIRCLE) {
-			if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
-				throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
-			}
-
-			$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($shareWith);
-
-			// Valid circle is required to share
-			if ($circle === null) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_ROOM) {
-			try {
-				$this->getRoomShareHelper()->createShare($share, $shareWith, $permissions, $expireDate);
-			} catch (QueryException $e) {
-				throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not support room shares', [$path->getPath()]));
-			}
-		} else {
-			throw new OCSBadRequestException($this->l->t('Unknown share type'));
-		}
-
-		$share->setShareType($shareType);
-		$share->setSharedBy($this->currentUser);
-
-		try {
-			$share = $this->shareManager->createShare($share);
-		} catch (GenericShareException $e) {
-			$code = $e->getCode() === 0 ? 403 : $e->getCode();
-			throw new OCSException($e->getHint(), $code);
-		} catch (\Exception $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		}
-
-		$output = $this->formatShare($share);
-
-		return new DataResponse($output);
-	}
-
-	/**
-	 * @param \OCP\Files\File|\OCP\Files\Folder $node
-	 * @param boolean $includeTags
-	 * @return DataResponse
-	 */
-	private function getSharedWithMe($node = null, bool $includeTags): DataResponse {
-
-		$userShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $node, -1, 0);
-		$groupShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $node, -1, 0);
-		$circleShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_CIRCLE, $node, -1, 0);
-		$roomShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_ROOM, $node, -1, 0);
-
-		$shares = array_merge($userShares, $groupShares, $circleShares, $roomShares);
-
-		$shares = array_filter($shares, function (IShare $share) {
-			return $share->getShareOwner() !== $this->currentUser;
-		});
-
-		$formatted = [];
-		foreach ($shares as $share) {
-			if ($this->canAccessShare($share)) {
-				try {
-					$formatted[] = $this->formatShare($share);
-				} catch (NotFoundException $e) {
-					// Ignore this share
-				}
-			}
-		}
-
-		if ($includeTags) {
-			$formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
-		}
-
-		return new DataResponse($formatted);
-	}
-
-	/**
-	 * @param \OCP\Files\Folder $folder
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	private function getSharesInDir(Node $folder): DataResponse {
-		if (!($folder instanceof \OCP\Files\Folder)) {
-			throw new OCSBadRequestException($this->l->t('Not a directory'));
-		}
-
-		$nodes = $folder->getDirectoryListing();
-		/** @var \OCP\Share\IShare[] $shares */
-		$shares = [];
-		foreach ($nodes as $node) {
-			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $node, false, -1, 0));
-			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $node, false, -1, 0));
-			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $node, false, -1, 0));
-			if($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $node, false, -1, 0));
-			}
-			if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-				$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $node, false, -1, 0));
-			}
-			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_ROOM, $node, false, -1, 0));
-		}
-
-		$formatted = [];
-		foreach ($shares as $share) {
-			try {
-				$formatted[] = $this->formatShare($share);
-			} catch (NotFoundException $e) {
-				//Ignore this share
-			}
-		}
-
-		return new DataResponse($formatted);
-	}
-
-	/**
-	 * The getShares function.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $shared_with_me
-	 * @param string $reshares
-	 * @param string $subfiles
-	 * @param string $path
-	 *
-	 * - Get shares by the current user
-	 * - Get shares by the current user and reshares (?reshares=true)
-	 * - Get shares with the current user (?shared_with_me=true)
-	 * - Get shares for a specific path (?path=...)
-	 * - Get all shares in a folder (?subfiles=true&path=..)
-	 *
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function getShares(
-		string $shared_with_me = 'false',
-		string $reshares = 'false',
-		string $subfiles = 'false',
-		string $path = null,
-		string $include_tags = 'false'
-	): DataResponse {
-
-		if ($path !== null) {
-			$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-			try {
-				$path = $userFolder->get($path);
-				$this->lock($path);
-			} catch (\OCP\Files\NotFoundException $e) {
-				throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
-			} catch (LockedException $e) {
-				throw new OCSNotFoundException($this->l->t('Could not lock path'));
-			}
-		}
-
-		$include_tags = $include_tags === 'true';
-
-		if ($shared_with_me === 'true') {
-			$result = $this->getSharedWithMe($path, $include_tags);
-			return $result;
-		}
-
-		if ($subfiles === 'true') {
-			$result = $this->getSharesInDir($path);
-			return $result;
-		}
-
-		if ($reshares === 'true') {
-			$reshares = true;
-		} else {
-			$reshares = false;
-		}
-
-		// Get all shares
-		$userShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $path, $reshares, -1, 0);
-		$groupShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $path, $reshares, -1, 0);
-		$linkShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $path, $reshares, -1, 0);
-		if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-			$mailShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $path, $reshares, -1, 0);
-		} else {
-			$mailShares = [];
-		}
-		if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
-			$circleShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_CIRCLE, $path, $reshares, -1, 0);
-		} else {
-			$circleShares = [];
-		}
-		$roomShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_ROOM, $path, $reshares, -1, 0);
-
-		$shares = array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares, $roomShares);
-
-		if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0);
-			$shares = array_merge($shares, $federatedShares);
-		}
-
-		if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $path, $reshares, -1, 0);
-			$shares = array_merge($shares, $federatedShares);
-		}
-
-		$formatted = [];
-		foreach ($shares as $share) {
-			try {
-				$formatted[] = $this->formatShare($share, $path);
-			} catch (NotFoundException $e) {
-				//Ignore share
-			}
-		}
-
-		if ($include_tags) {
-			$formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
-		}
-
-		return new DataResponse($formatted);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @param int $permissions
-	 * @param string $password
-	 * @param string $sendPasswordByTalk
-	 * @param string $publicUpload
-	 * @param string $expireDate
-	 * @param string $note
-	 * @param string $label
-	 * @param string $hideDownload
-	 * @return DataResponse
-	 * @throws LockedException
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 * @throws OCSNotFoundException
-	 */
-	public function updateShare(
-		string $id,
-		int $permissions = null,
-		string $password = null,
-		string $sendPasswordByTalk = null,
-		string $publicUpload = null,
-		string $expireDate = null,
-		string $note = null,
-		string $label = null,
-		string $hideDownload = null
-	): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		$this->lock($share->getNode());
-
-		if (!$this->canAccessShare($share, false)) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		if ($permissions === null &&
-			$password === null &&
-			$sendPasswordByTalk === null &&
-			$publicUpload === null &&
-			$expireDate === null &&
-			$note === null &&
-			$label === null &&
-			$hideDownload === null
-		) {
-			throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
-		}
-
-		if($note !== null) {
-			$share->setNote($note);
-		}
-
-		/*
+        if ($path->getStorage()->instanceOfStorage(Storage::class)) {
+            $permissions &= ~($permissions & ~$path->getPermissions());
+        }
+
+        if ($shareType === Share::SHARE_TYPE_USER) {
+            // Valid user is required to share
+            if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_GROUP) {
+            if (!$this->shareManager->allowGroupSharing()) {
+                throw new OCSNotFoundException($this->l->t('Group sharing is disabled by the administrator'));
+            }
+
+            // Valid group is required to share
+            if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid group'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_LINK) {
+            //Can we even share links?
+            if (!$this->shareManager->shareApiAllowLinks()) {
+                throw new OCSNotFoundException($this->l->t('Public link sharing is disabled by the administrator'));
+            }
+
+            if ($publicUpload === 'true') {
+                // Check if public upload is allowed
+                if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+                    throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
+                }
+
+                // Public upload can only be set for folders
+                if ($path instanceof \OCP\Files\File) {
+                    throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders'));
+                }
+
+                $share->setPermissions(
+                    Constants::PERMISSION_READ |
+                    Constants::PERMISSION_CREATE |
+                    Constants::PERMISSION_UPDATE |
+                    Constants::PERMISSION_DELETE
+                );
+            } else {
+                $share->setPermissions(Constants::PERMISSION_READ);
+            }
+
+            // Set password
+            if ($password !== '') {
+                $share->setPassword($password);
+            }
+
+
+            if (!empty($label)) {
+                $share->setLabel($label);
+            }
+
+            if ($sendPasswordByTalk === 'true') {
+                if (!$this->appManager->isEnabledForUser('spreed')) {
+                    throw new OCSForbiddenException($this->l->t('Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled', [$path->getPath()]));
+                }
+
+                $share->setSendPasswordByTalk(true);
+            }
+
+            //Expire date
+            if ($expireDate !== '') {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                    $share->setExpirationDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSNotFoundException($this->l->t('Invalid date, date format must be YYYY-MM-DD'));
+                }
+            }
+
+        } else if ($shareType === Share::SHARE_TYPE_REMOTE) {
+            if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+                throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
+            }
+
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        }  else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
+            if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+                throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
+            }
+
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_EMAIL) {
+            if ($share->getNodeType() === 'file') {
+                $share->setPermissions(Constants::PERMISSION_READ);
+            } else {
+                $share->setPermissions($permissions);
+            }
+            $share->setSharedWith($shareWith);
+
+            if ($sendPasswordByTalk === 'true') {
+                if (!$this->appManager->isEnabledForUser('spreed')) {
+                    throw new OCSForbiddenException($this->l->t('Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled', [$path->getPath()]));
+                }
+
+                $share->setSendPasswordByTalk(true);
+            }
+        } else if ($shareType === Share::SHARE_TYPE_CIRCLE) {
+            if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
+                throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
+            }
+
+            $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($shareWith);
+
+            // Valid circle is required to share
+            if ($circle === null) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_ROOM) {
+            try {
+                $this->getRoomShareHelper()->createShare($share, $shareWith, $permissions, $expireDate);
+            } catch (QueryException $e) {
+                throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not support room shares', [$path->getPath()]));
+            }
+        } else {
+            throw new OCSBadRequestException($this->l->t('Unknown share type'));
+        }
+
+        $share->setShareType($shareType);
+        $share->setSharedBy($this->currentUser);
+
+        try {
+            $share = $this->shareManager->createShare($share);
+        } catch (GenericShareException $e) {
+            $code = $e->getCode() === 0 ? 403 : $e->getCode();
+            throw new OCSException($e->getHint(), $code);
+        } catch (\Exception $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        }
+
+        $output = $this->formatShare($share);
+
+        return new DataResponse($output);
+    }
+
+    /**
+     * @param \OCP\Files\File|\OCP\Files\Folder $node
+     * @param boolean $includeTags
+     * @return DataResponse
+     */
+    private function getSharedWithMe($node = null, bool $includeTags): DataResponse {
+
+        $userShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $node, -1, 0);
+        $groupShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $node, -1, 0);
+        $circleShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_CIRCLE, $node, -1, 0);
+        $roomShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_ROOM, $node, -1, 0);
+
+        $shares = array_merge($userShares, $groupShares, $circleShares, $roomShares);
+
+        $shares = array_filter($shares, function (IShare $share) {
+            return $share->getShareOwner() !== $this->currentUser;
+        });
+
+        $formatted = [];
+        foreach ($shares as $share) {
+            if ($this->canAccessShare($share)) {
+                try {
+                    $formatted[] = $this->formatShare($share);
+                } catch (NotFoundException $e) {
+                    // Ignore this share
+                }
+            }
+        }
+
+        if ($includeTags) {
+            $formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
+        }
+
+        return new DataResponse($formatted);
+    }
+
+    /**
+     * @param \OCP\Files\Folder $folder
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    private function getSharesInDir(Node $folder): DataResponse {
+        if (!($folder instanceof \OCP\Files\Folder)) {
+            throw new OCSBadRequestException($this->l->t('Not a directory'));
+        }
+
+        $nodes = $folder->getDirectoryListing();
+        /** @var \OCP\Share\IShare[] $shares */
+        $shares = [];
+        foreach ($nodes as $node) {
+            $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $node, false, -1, 0));
+            $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $node, false, -1, 0));
+            $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $node, false, -1, 0));
+            if($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+                $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $node, false, -1, 0));
+            }
+            if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
+                $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $node, false, -1, 0));
+            }
+            $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_ROOM, $node, false, -1, 0));
+        }
+
+        $formatted = [];
+        foreach ($shares as $share) {
+            try {
+                $formatted[] = $this->formatShare($share);
+            } catch (NotFoundException $e) {
+                //Ignore this share
+            }
+        }
+
+        return new DataResponse($formatted);
+    }
+
+    /**
+     * The getShares function.
+     *
+     * @NoAdminRequired
+     *
+     * @param string $shared_with_me
+     * @param string $reshares
+     * @param string $subfiles
+     * @param string $path
+     *
+     * - Get shares by the current user
+     * - Get shares by the current user and reshares (?reshares=true)
+     * - Get shares with the current user (?shared_with_me=true)
+     * - Get shares for a specific path (?path=...)
+     * - Get all shares in a folder (?subfiles=true&path=..)
+     *
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function getShares(
+        string $shared_with_me = 'false',
+        string $reshares = 'false',
+        string $subfiles = 'false',
+        string $path = null,
+        string $include_tags = 'false'
+    ): DataResponse {
+
+        if ($path !== null) {
+            $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+            try {
+                $path = $userFolder->get($path);
+                $this->lock($path);
+            } catch (\OCP\Files\NotFoundException $e) {
+                throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
+            } catch (LockedException $e) {
+                throw new OCSNotFoundException($this->l->t('Could not lock path'));
+            }
+        }
+
+        $include_tags = $include_tags === 'true';
+
+        if ($shared_with_me === 'true') {
+            $result = $this->getSharedWithMe($path, $include_tags);
+            return $result;
+        }
+
+        if ($subfiles === 'true') {
+            $result = $this->getSharesInDir($path);
+            return $result;
+        }
+
+        if ($reshares === 'true') {
+            $reshares = true;
+        } else {
+            $reshares = false;
+        }
+
+        // Get all shares
+        $userShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $path, $reshares, -1, 0);
+        $groupShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $path, $reshares, -1, 0);
+        $linkShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $path, $reshares, -1, 0);
+        if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+            $mailShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $path, $reshares, -1, 0);
+        } else {
+            $mailShares = [];
+        }
+        if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
+            $circleShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_CIRCLE, $path, $reshares, -1, 0);
+        } else {
+            $circleShares = [];
+        }
+        $roomShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_ROOM, $path, $reshares, -1, 0);
+
+        $shares = array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares, $roomShares);
+
+        if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0);
+            $shares = array_merge($shares, $federatedShares);
+        }
+
+        if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $path, $reshares, -1, 0);
+            $shares = array_merge($shares, $federatedShares);
+        }
+
+        $formatted = [];
+        foreach ($shares as $share) {
+            try {
+                $formatted[] = $this->formatShare($share, $path);
+            } catch (NotFoundException $e) {
+                //Ignore share
+            }
+        }
+
+        if ($include_tags) {
+            $formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
+        }
+
+        return new DataResponse($formatted);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @param int $permissions
+     * @param string $password
+     * @param string $sendPasswordByTalk
+     * @param string $publicUpload
+     * @param string $expireDate
+     * @param string $note
+     * @param string $label
+     * @param string $hideDownload
+     * @return DataResponse
+     * @throws LockedException
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     * @throws OCSNotFoundException
+     */
+    public function updateShare(
+        string $id,
+        int $permissions = null,
+        string $password = null,
+        string $sendPasswordByTalk = null,
+        string $publicUpload = null,
+        string $expireDate = null,
+        string $note = null,
+        string $label = null,
+        string $hideDownload = null
+    ): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        $this->lock($share->getNode());
+
+        if (!$this->canAccessShare($share, false)) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        if ($permissions === null &&
+            $password === null &&
+            $sendPasswordByTalk === null &&
+            $publicUpload === null &&
+            $expireDate === null &&
+            $note === null &&
+            $label === null &&
+            $hideDownload === null
+        ) {
+            throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
+        }
+
+        if($note !== null) {
+            $share->setNote($note);
+        }
+
+        /*
 		 * expirationdate, password and publicUpload only make sense for link shares
 		 */
-		if ($share->getShareType() === Share::SHARE_TYPE_LINK) {
-
-			// Update hide download state
-			if ($hideDownload === 'true') {
-				$share->setHideDownload(true);
-			} else if ($hideDownload === 'false') {
-				$share->setHideDownload(false);
-			}
-
-			$newPermissions = null;
-			if ($publicUpload === 'true') {
-				$newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
-			} else if ($publicUpload === 'false') {
-				$newPermissions = Constants::PERMISSION_READ;
-			}
-
-			if ($permissions !== null) {
-				$newPermissions = (int)$permissions;
-				$newPermissions = $newPermissions & ~Constants::PERMISSION_SHARE;
-			}
-
-			if ($newPermissions !== null &&
-				!in_array($newPermissions, [
-					Constants::PERMISSION_READ,
-					Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE, // legacy
-					Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE, // correct
-					Constants::PERMISSION_CREATE, // hidden file list
-					Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE, // allow to edit single files
-				], true)
-			) {
-				throw new OCSBadRequestException($this->l->t('Can\'t change permissions for public share links'));
-			}
-
-			if (
-				// legacy
-				$newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE) ||
-				// correct
-				$newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE)
-			) {
-				if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
-					throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
-				}
-
-				if (!($share->getNode() instanceof \OCP\Files\Folder)) {
-					throw new OCSBadRequestException($this->l->t('Public upload is only possible for publicly shared folders'));
-				}
-
-				// normalize to correct public upload permissions
-				$newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
-			}
-
-			if ($newPermissions !== null) {
-				$share->setPermissions($newPermissions);
-				$permissions = $newPermissions;
-			}
-
-			if ($expireDate === '') {
-				$share->setExpirationDate(null);
-			} else if ($expireDate !== null) {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSBadRequestException($e->getMessage(), $e);
-				}
-				$share->setExpirationDate($expireDate);
-			}
-
-			if ($password === '') {
-				$share->setPassword(null);
-			} else if ($password !== null) {
-				$share->setPassword($password);
-			}
-
-			if ($label !== null) {
-				$share->setLabel($label);
-			}
-
-			if ($sendPasswordByTalk === 'true') {
-				if (!$this->appManager->isEnabledForUser('spreed')) {
-					throw new OCSForbiddenException($this->l->t('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled'));
-				}
-
-				$share->setSendPasswordByTalk(true);
-			} else if ($sendPasswordByTalk !== null) {
-				$share->setSendPasswordByTalk(false);
-			}
-		} else {
-			if ($permissions !== null) {
-				$permissions = (int)$permissions;
-				$share->setPermissions($permissions);
-			}
-
-			if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
-				if ($password === '') {
-					$share->setPassword(null);
-				} else if ($password !== null) {
-					$share->setPassword($password);
-				}
-
-				if ($sendPasswordByTalk === 'true') {
-					if (!$this->appManager->isEnabledForUser('spreed')) {
-						throw new OCSForbiddenException($this->l->t('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled'));
-					}
-
-					$share->setSendPasswordByTalk(true);
-				} else {
-					$share->setSendPasswordByTalk(false);
-				}
-			}
-
-			if ($expireDate === '') {
-				$share->setExpirationDate(null);
-			} else if ($expireDate !== null) {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSBadRequestException($e->getMessage(), $e);
-				}
-				$share->setExpirationDate($expireDate);
-			}
-
-		}
-
-		if ($permissions !== null && $share->getShareOwner() !== $this->currentUser) {
-			/* Check if this is an incomming share */
-			$incomingShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $share->getNode(), -1, 0);
-			$incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0));
-			$incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_ROOM, $share->getNode(), -1, 0));
-
-			/** @var \OCP\Share\IShare[] $incomingShares */
-			if (!empty($incomingShares)) {
-				$maxPermissions = 0;
-				foreach ($incomingShares as $incomingShare) {
-					$maxPermissions |= $incomingShare->getPermissions();
-				}
-
-				if ($share->getPermissions() & ~$maxPermissions) {
-					throw new OCSNotFoundException($this->l->t('Cannot increase permissions'));
-				}
-			}
-		}
-
-
-		try {
-			$share = $this->shareManager->updateShare($share);
-		} catch (\Exception $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		}
-
-		return new DataResponse($this->formatShare($share));
-	}
-
-	/**
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function canAccessShare(\OCP\Share\IShare $share, bool $checkGroups = true): bool {
-		// A file with permissions 0 can't be accessed by us. So Don't show it
-		if ($share->getPermissions() === 0) {
-			return false;
-		}
-
-		// Owner of the file and the sharer of the file can always get share
-		if ($share->getShareOwner() === $this->currentUser ||
-			$share->getSharedBy() === $this->currentUser
-		) {
-			return true;
-		}
-
-		// If the share is shared with you (or a group you are a member of)
-		if ($share->getShareType() === Share::SHARE_TYPE_USER &&
-			$share->getSharedWith() === $this->currentUser
-		) {
-			return true;
-		}
-
-		if ($checkGroups && $share->getShareType() === Share::SHARE_TYPE_GROUP) {
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($this->currentUser);
-			if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
-				return true;
-			}
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
-			// TODO: have a sanity check like above?
-			return true;
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
-			try {
-				return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
-			} catch (QueryException $e) {
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Make sure that the passed date is valid ISO 8601
-	 * So YYYY-MM-DD
-	 * If not throw an exception
-	 *
-	 * @param string $expireDate
-	 *
-	 * @throws \Exception
-	 * @return \DateTime
-	 */
-	private function parseDate(string $expireDate): \DateTime {
-		try {
-			$date = new \DateTime($expireDate);
-		} catch (\Exception $e) {
-			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
-		}
-
-		if ($date === false) {
-			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
-		}
-
-		$date->setTime(0, 0, 0);
-
-		return $date;
-	}
-
-	/**
-	 * Since we have multiple providers but the OCS Share API v1 does
-	 * not support this we need to check all backends.
-	 *
-	 * @param string $id
-	 * @return \OCP\Share\IShare
-	 * @throws ShareNotFound
-	 */
-	private function getShareById(string $id): IShare {
-		$share = null;
-
-		// First check if it is an internal share.
-		try {
-			$share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
-			return $share;
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-
-		try {
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
-				$share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		try {
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		try {
-			$share = $this->shareManager->getShareById('ocRoomShare:' . $id, $this->currentUser);
-			return $share;
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			throw new ShareNotFound();
-		}
-		$share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
-
-		return $share;
-	}
-
-	/**
-	 * Lock a Node
-	 *
-	 * @param \OCP\Files\Node $node
-	 * @throws LockedException
-	 */
-	private function lock(\OCP\Files\Node $node) {
-		$node->lock(ILockingProvider::LOCK_SHARED);
-		$this->lockedNode = $node;
-	}
-
-	/**
-	 * Cleanup the remaining locks
-	 * @throws @LockedException
-	 */
-	public function cleanup() {
-		if ($this->lockedNode !== null) {
-			$this->lockedNode->unlock(ILockingProvider::LOCK_SHARED);
-		}
-	}
-
-	/**
-	 * Returns the helper of ShareAPIController for room shares.
-	 *
-	 * If the Talk application is not enabled or the helper is not available
-	 * a QueryException is thrown instead.
-	 *
-	 * @return \OCA\Spreed\Share\Helper\ShareAPIController
-	 * @throws QueryException
-	 */
-	private function getRoomShareHelper() {
-		if (!$this->appManager->isEnabledForUser('spreed')) {
-			throw new QueryException();
-		}
-
-		return $this->serverContainer->query('\OCA\Spreed\Share\Helper\ShareAPIController');
-	}
+        if ($share->getShareType() === Share::SHARE_TYPE_LINK) {
+
+            // Update hide download state
+            if ($hideDownload === 'true') {
+                $share->setHideDownload(true);
+            } else if ($hideDownload === 'false') {
+                $share->setHideDownload(false);
+            }
+
+            $newPermissions = null;
+            if ($publicUpload === 'true') {
+                $newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
+            } else if ($publicUpload === 'false') {
+                $newPermissions = Constants::PERMISSION_READ;
+            }
+
+            if ($permissions !== null) {
+                $newPermissions = (int)$permissions;
+                $newPermissions = $newPermissions & ~Constants::PERMISSION_SHARE;
+            }
+
+            if ($newPermissions !== null &&
+                !in_array($newPermissions, [
+                    Constants::PERMISSION_READ,
+                    Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE, // legacy
+                    Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE, // correct
+                    Constants::PERMISSION_CREATE, // hidden file list
+                    Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE, // allow to edit single files
+                ], true)
+            ) {
+                throw new OCSBadRequestException($this->l->t('Can\'t change permissions for public share links'));
+            }
+
+            if (
+                // legacy
+                $newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE) ||
+                // correct
+                $newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE)
+            ) {
+                if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+                    throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
+                }
+
+                if (!($share->getNode() instanceof \OCP\Files\Folder)) {
+                    throw new OCSBadRequestException($this->l->t('Public upload is only possible for publicly shared folders'));
+                }
+
+                // normalize to correct public upload permissions
+                $newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
+            }
+
+            if ($newPermissions !== null) {
+                $share->setPermissions($newPermissions);
+                $permissions = $newPermissions;
+            }
+
+            if ($expireDate === '') {
+                $share->setExpirationDate(null);
+            } else if ($expireDate !== null) {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSBadRequestException($e->getMessage(), $e);
+                }
+                $share->setExpirationDate($expireDate);
+            }
+
+            if ($password === '') {
+                $share->setPassword(null);
+            } else if ($password !== null) {
+                $share->setPassword($password);
+            }
+
+            if ($label !== null) {
+                $share->setLabel($label);
+            }
+
+            if ($sendPasswordByTalk === 'true') {
+                if (!$this->appManager->isEnabledForUser('spreed')) {
+                    throw new OCSForbiddenException($this->l->t('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled'));
+                }
+
+                $share->setSendPasswordByTalk(true);
+            } else if ($sendPasswordByTalk !== null) {
+                $share->setSendPasswordByTalk(false);
+            }
+        } else {
+            if ($permissions !== null) {
+                $permissions = (int)$permissions;
+                $share->setPermissions($permissions);
+            }
+
+            if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
+                if ($password === '') {
+                    $share->setPassword(null);
+                } else if ($password !== null) {
+                    $share->setPassword($password);
+                }
+
+                if ($sendPasswordByTalk === 'true') {
+                    if (!$this->appManager->isEnabledForUser('spreed')) {
+                        throw new OCSForbiddenException($this->l->t('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled'));
+                    }
+
+                    $share->setSendPasswordByTalk(true);
+                } else {
+                    $share->setSendPasswordByTalk(false);
+                }
+            }
+
+            if ($expireDate === '') {
+                $share->setExpirationDate(null);
+            } else if ($expireDate !== null) {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSBadRequestException($e->getMessage(), $e);
+                }
+                $share->setExpirationDate($expireDate);
+            }
+
+        }
+
+        if ($permissions !== null && $share->getShareOwner() !== $this->currentUser) {
+            /* Check if this is an incomming share */
+            $incomingShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $share->getNode(), -1, 0);
+            $incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0));
+            $incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_ROOM, $share->getNode(), -1, 0));
+
+            /** @var \OCP\Share\IShare[] $incomingShares */
+            if (!empty($incomingShares)) {
+                $maxPermissions = 0;
+                foreach ($incomingShares as $incomingShare) {
+                    $maxPermissions |= $incomingShare->getPermissions();
+                }
+
+                if ($share->getPermissions() & ~$maxPermissions) {
+                    throw new OCSNotFoundException($this->l->t('Cannot increase permissions'));
+                }
+            }
+        }
+
+
+        try {
+            $share = $this->shareManager->updateShare($share);
+        } catch (\Exception $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        }
+
+        return new DataResponse($this->formatShare($share));
+    }
+
+    /**
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function canAccessShare(\OCP\Share\IShare $share, bool $checkGroups = true): bool {
+        // A file with permissions 0 can't be accessed by us. So Don't show it
+        if ($share->getPermissions() === 0) {
+            return false;
+        }
+
+        // Owner of the file and the sharer of the file can always get share
+        if ($share->getShareOwner() === $this->currentUser ||
+            $share->getSharedBy() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        // If the share is shared with you (or a group you are a member of)
+        if ($share->getShareType() === Share::SHARE_TYPE_USER &&
+            $share->getSharedWith() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        if ($checkGroups && $share->getShareType() === Share::SHARE_TYPE_GROUP) {
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($this->currentUser);
+            if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
+                return true;
+            }
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
+            // TODO: have a sanity check like above?
+            return true;
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
+            try {
+                return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
+            } catch (QueryException $e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Make sure that the passed date is valid ISO 8601
+     * So YYYY-MM-DD
+     * If not throw an exception
+     *
+     * @param string $expireDate
+     *
+     * @throws \Exception
+     * @return \DateTime
+     */
+    private function parseDate(string $expireDate): \DateTime {
+        try {
+            $date = new \DateTime($expireDate);
+        } catch (\Exception $e) {
+            throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+        }
+
+        if ($date === false) {
+            throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+        }
+
+        $date->setTime(0, 0, 0);
+
+        return $date;
+    }
+
+    /**
+     * Since we have multiple providers but the OCS Share API v1 does
+     * not support this we need to check all backends.
+     *
+     * @param string $id
+     * @return \OCP\Share\IShare
+     * @throws ShareNotFound
+     */
+    private function getShareById(string $id): IShare {
+        $share = null;
+
+        // First check if it is an internal share.
+        try {
+            $share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
+            return $share;
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+
+        try {
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
+                $share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        try {
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+                $share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        try {
+            $share = $this->shareManager->getShareById('ocRoomShare:' . $id, $this->currentUser);
+            return $share;
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            throw new ShareNotFound();
+        }
+        $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
+
+        return $share;
+    }
+
+    /**
+     * Lock a Node
+     *
+     * @param \OCP\Files\Node $node
+     * @throws LockedException
+     */
+    private function lock(\OCP\Files\Node $node) {
+        $node->lock(ILockingProvider::LOCK_SHARED);
+        $this->lockedNode = $node;
+    }
+
+    /**
+     * Cleanup the remaining locks
+     * @throws @LockedException
+     */
+    public function cleanup() {
+        if ($this->lockedNode !== null) {
+            $this->lockedNode->unlock(ILockingProvider::LOCK_SHARED);
+        }
+    }
+
+    /**
+     * Returns the helper of ShareAPIController for room shares.
+     *
+     * If the Talk application is not enabled or the helper is not available
+     * a QueryException is thrown instead.
+     *
+     * @return \OCA\Spreed\Share\Helper\ShareAPIController
+     * @throws QueryException
+     */
+    private function getRoomShareHelper() {
+        if (!$this->appManager->isEnabledForUser('spreed')) {
+            throw new QueryException();
+        }
+
+        return $this->serverContainer->query('\OCA\Spreed\Share\Helper\ShareAPIController');
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -234,14 +234,14 @@ 
 
 			$result['share_with_displayname'] = $share->getSharedWithDisplayName();
 			if (empty($result['share_with_displayname'])) {
-				$displayNameLength = ($hasCircleId? strrpos($share->getSharedWith(), ' '): strlen($share->getSharedWith()));
+				$displayNameLength = ($hasCircleId ? strrpos($share->getSharedWith(), ' ') : strlen($share->getSharedWith()));
 				$result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength);
 			}
 
 			$result['share_with_avatar'] = $share->getSharedWithAvatar();
 
-			$shareWithStart = ($hasCircleId? strrpos($share->getSharedWith(), '[') + 1: 0);
-			$shareWithLength = ($hasCircleId? -1: strpos($share->getSharedWith(), ' '));
+			$shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
+			$shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
 			$result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
 		} else if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
 			$result['share_with'] = $share->getSharedWith();
@@ -272,7 +272,7 @@ 
 		// FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
 		$result = \OC::$server->getContactsManager()->search($query, [$property]);
 		foreach ($result as $r) {
-			foreach($r[$property] as $value) {
+			foreach ($r[$property] as $value) {
 				if ($value === $query) {
 					return $r['FN'];
 				}
@@ -509,7 +509,7 @@ 
 
 			$share->setSharedWith($shareWith);
 			$share->setPermissions($permissions);
-		}  else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
+		} else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
 			if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
 				throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
 			}
@@ -585,7 +585,7 @@ 
 
 		$shares = array_merge($userShares, $groupShares, $circleShares, $roomShares);
 
-		$shares = array_filter($shares, function (IShare $share) {
+		$shares = array_filter($shares, function(IShare $share) {
 			return $share->getShareOwner() !== $this->currentUser;
 		});
 
@@ -624,7 +624,7 @@ 
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $node, false, -1, 0));
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $node, false, -1, 0));
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $node, false, -1, 0));
-			if($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
 				$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $node, false, -1, 0));
 			}
 			if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
@@ -800,7 +800,7 @@ 
 			throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
 		}
 
-		if($note !== null) {
+		if ($note !== null) {
 			$share->setNote($note);
 		}
 
@@ -824,7 +824,7 @@ 
 			}
 
 			if ($permissions !== null) {
-				$newPermissions = (int)$permissions;
+				$newPermissions = (int) $permissions;
 				$newPermissions = $newPermissions & ~Constants::PERMISSION_SHARE;
 			}
 
@@ -895,7 +895,7 @@ 
 			}
 		} else {
 			if ($permissions !== null) {
-				$permissions = (int)$permissions;
+				$permissions = (int) $permissions;
 				$share->setPermissions($permissions);
 			}
 
@@ -1045,7 +1045,7 @@ 
 
 		// First check if it is an internal share.
 		try {
-			$share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
+			$share = $this->shareManager->getShareById('ocinternal:'.$id, $this->currentUser);
 			return $share;
 		} catch (ShareNotFound $e) {
 			// Do nothing, just try the other share type
@@ -1054,7 +1054,7 @@ 
 
 		try {
 			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
-				$share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
+				$share = $this->shareManager->getShareById('ocCircleShare:'.$id, $this->currentUser);
 				return $share;
 			}
 		} catch (ShareNotFound $e) {
@@ -1063,7 +1063,7 @@ 
 
 		try {
 			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
+				$share = $this->shareManager->getShareById('ocMailShare:'.$id, $this->currentUser);
 				return $share;
 			}
 		} catch (ShareNotFound $e) {
@@ -1071,7 +1071,7 @@ 
 		}
 
 		try {
-			$share = $this->shareManager->getShareById('ocRoomShare:' . $id, $this->currentUser);
+			$share = $this->shareManager->getShareById('ocRoomShare:'.$id, $this->currentUser);
 			return $share;
 		} catch (ShareNotFound $e) {
 			// Do nothing, just try the other share type
@@ -1080,7 +1080,7 @@ 
 		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
 			throw new ShareNotFound();
 		}
-		$share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
+		$share = $this->shareManager->getShareById('ocFederatedSharing:'.$id, $this->currentUser);
 
 		return $share;
 	}