nextcloud / server

apps/files_sharing/appinfo/update.php

Indentation +6 added lines, -6 removed lines

@@ -26,16 +26,16 @@
 
 // Migration OC8.2 -> OC9
 if (version_compare($installedVersion, '0.9.1', '<')) {
-	$m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig());
-	$m->removeReShares();
-	$m->updateInitiatorInfo();
+    $m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig());
+    $m->removeReShares();
+    $m->updateInitiatorInfo();
 }
 
 if (version_compare($installedVersion, '1.1.1', '<')) {
-	$m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig());
+    $m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig());
 }
 
 if (version_compare($installedVersion, '1.4.0', '<')) {
-	$m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig());
-	$m->addPasswordColumn();
+    $m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig());
+    $m->addPasswordColumn();
 }

apps/sharebymail/templates/mailpassword.php

Indentation +4 added lines, -4 removed lines

@@ -36,10 +36,10 @@
 					<td width="20px">&nbsp;</td>
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
 						<?php
-						print_unescaped($l->t('Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>', [$_['initiator'], $_['filename'], $_['password']]));
-						// TRANSLATORS term at the end of a mail
-						p($l->t('Cheers!'));
-						?>
+                        print_unescaped($l->t('Hey there,<br><br>%s shared <i>%s</i> with you.<br>You should have already received a separate mail with a link to access it.<br><br>It is protected with the following password: %s<br><br>', [$_['initiator'], $_['filename'], $_['password']]));
+                        // TRANSLATORS term at the end of a mail
+                        p($l->t('Cheers!'));
+                        ?>
 					</td>
 				</tr>
 				<tr><td colspan="2">&nbsp;</td></tr>

apps/files_sharing/lib/Migration.php

Indentation +265 added lines, -265 removed lines

@@ -39,270 +39,270 @@
  */
 class Migration {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var  IConfig */
-	private $config;
-
-	/** @var  ICache with all shares we already saw */
-	private $shareCache;
-
-	/** @var string */
-	private $table = 'share';
-
-	public function __construct(IDBConnection $connection, IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-
-		// We cache up to 10k share items (~20MB)
-		$this->shareCache = new CappedMemoryCache(10000);
-	}
-
-	/**
-	 * move all re-shares to the owner in order to have a flat list of shares
-	 * upgrade from oC 8.2 to 9.0 with the new sharing
-	 */
-	public function removeReShares() {
-
-		$stmt = $this->getReShares();
-
-		$owners = [];
-		while($share = $stmt->fetch()) {
-
-			$this->shareCache[$share['id']] = $share;
-
-			$owners[$share['id']] = [
-					'owner' => $this->findOwner($share),
-					'initiator' => $share['uid_owner'],
-					'type' => $share['share_type'],
-			];
-
-			if (count($owners) === 1000) {
-				$this->updateOwners($owners);
-				$owners = [];
-			}
-		}
-
-		$stmt->closeCursor();
-
-		if (count($owners)) {
-			$this->updateOwners($owners);
-		}
-	}
-
-	/**
-	 * update all owner information so that all shares have an owner
-	 * and an initiator for the upgrade from oC 8.2 to 9.0 with the new sharing
-	 */
-	public function updateInitiatorInfo() {
-		while (true) {
-			$shares = $this->getMissingInitiator(1000);
-
-			if (empty($shares)) {
-				break;
-			}
-
-			$owners = [];
-			foreach ($shares as $share) {
-				$owners[$share['id']] = [
-					'owner' => $share['uid_owner'],
-					'initiator' => $share['uid_owner'],
-					'type' => $share['share_type'],
-				];
-			}
-			$this->updateOwners($owners);
-		}
-	}
-
-	/**
-	 * this was dropped for Nextcloud 11 in favour of share by mail
-	 */
-	public function removeSendMailOption() {
-		$this->config->deleteAppValue('core', 'shareapi_allow_mail_notification');
-		$this->config->deleteAppValue('core', 'shareapi_allow_public_notification');
-	}
-
-	public function addPasswordColumn() {
-		$query = $this->connection->getQueryBuilder();
-		$query
-			->update('share')
-			->set('password', 'share_with')
-			->where($query->expr()->eq('share_type', $query->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)))
-			->andWhere($query->expr()->isNotNull('share_with'));
-		$query->execute();
-
-		$clearQuery = $this->connection->getQueryBuilder();
-		$clearQuery
-			->update('share')->set('share_with', $clearQuery->createNamedParameter(null))
-			->where($clearQuery->expr()->eq('share_type', $clearQuery->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)));
-
-		$clearQuery->execute();
-
-	}
-
-	/**
-	 * find the owner of a re-shared file/folder
-	 *
-	 * @param array $share
-	 * @return array
-	 */
-	private function findOwner($share) {
-		$currentShare = $share;
-		while(!is_null($currentShare['parent'])) {
-			if (isset($this->shareCache[$currentShare['parent']])) {
-				$currentShare = $this->shareCache[$currentShare['parent']];
-			} else {
-				$currentShare = $this->getShare((int)$currentShare['parent']);
-				$this->shareCache[$currentShare['id']] = $currentShare;
-			}
-		}
-
-		return $currentShare['uid_owner'];
-	}
-
-	/**
-	 * Get $n re-shares from the database
-	 *
-	 * @param int $n The max number of shares to fetch
-	 * @return \Doctrine\DBAL\Driver\Statement
-	 */
-	private function getReShares() {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['id', 'parent', 'uid_owner', 'share_type'])
-			->from($this->table)
-			->where($query->expr()->in(
-				'share_type',
-				$query->createNamedParameter(
-					[
-						\OCP\Share::SHARE_TYPE_USER,
-						\OCP\Share::SHARE_TYPE_GROUP,
-						\OCP\Share::SHARE_TYPE_LINK,
-						\OCP\Share::SHARE_TYPE_REMOTE,
-					],
-					Connection::PARAM_INT_ARRAY
-				)
-			))
-			->andWhere($query->expr()->in(
-				'item_type',
-				$query->createNamedParameter(
-					['file', 'folder'],
-					Connection::PARAM_STR_ARRAY
-				)
-			))
-			->andWhere($query->expr()->isNotNull('parent'))
-			->orderBy('id', 'asc');
-		return $query->execute();
-
-
-		$shares = $result->fetchAll();
-		$result->closeCursor();
-
-		$ordered = [];
-		foreach ($shares as $share) {
-			$ordered[(int)$share['id']] = $share;
-		}
-
-		return $ordered;
-	}
-
-	/**
-	 * Get $n re-shares from the database
-	 *
-	 * @param int $n The max number of shares to fetch
-	 * @return array
-	 */
-	private function getMissingInitiator($n = 1000) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['id', 'uid_owner', 'share_type'])
-			->from($this->table)
-			->where($query->expr()->in(
-				'share_type',
-				$query->createNamedParameter(
-					[
-						\OCP\Share::SHARE_TYPE_USER,
-						\OCP\Share::SHARE_TYPE_GROUP,
-						\OCP\Share::SHARE_TYPE_LINK,
-						\OCP\Share::SHARE_TYPE_REMOTE,
-					],
-					Connection::PARAM_INT_ARRAY
-				)
-			))
-			->andWhere($query->expr()->in(
-				'item_type',
-				$query->createNamedParameter(
-					['file', 'folder'],
-					Connection::PARAM_STR_ARRAY
-				)
-			))
-			->andWhere($query->expr()->isNull('uid_initiator'))
-			->orderBy('id', 'asc')
-			->setMaxResults($n);
-		$result = $query->execute();
-		$shares = $result->fetchAll();
-		$result->closeCursor();
-
-		$ordered = [];
-		foreach ($shares as $share) {
-			$ordered[(int)$share['id']] = $share;
-		}
-
-		return $ordered;
-	}
-
-	/**
-	 * get a specific share
-	 *
-	 * @param int $id
-	 * @return array
-	 */
-	private function getShare($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['id', 'parent', 'uid_owner'])
-			->from($this->table)
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-		$result = $query->execute();
-		$share = $result->fetchAll();
-		$result->closeCursor();
-
-		return $share[0];
-	}
-
-	/**
-	 * update database with the new owners
-	 *
-	 * @param array $owners
-	 * @throws \Exception
-	 */
-	private function updateOwners($owners) {
-
-		$this->connection->beginTransaction();
-
-		try {
-
-			foreach ($owners as $id => $owner) {
-				$query = $this->connection->getQueryBuilder();
-				$query->update($this->table)
-					->set('uid_owner', $query->createNamedParameter($owner['owner']))
-					->set('uid_initiator', $query->createNamedParameter($owner['initiator']));
-
-
-				if ((int)$owner['type'] !== \OCP\Share::SHARE_TYPE_LINK) {
-					$query->set('parent', $query->createNamedParameter(null));
-				}
-
-				$query->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-
-				$query->execute();
-			}
-
-			$this->connection->commit();
-
-		} catch (\Exception $e) {
-			$this->connection->rollBack();
-			throw $e;
-		}
-
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var  IConfig */
+    private $config;
+
+    /** @var  ICache with all shares we already saw */
+    private $shareCache;
+
+    /** @var string */
+    private $table = 'share';
+
+    public function __construct(IDBConnection $connection, IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+
+        // We cache up to 10k share items (~20MB)
+        $this->shareCache = new CappedMemoryCache(10000);
+    }
+
+    /**
+     * move all re-shares to the owner in order to have a flat list of shares
+     * upgrade from oC 8.2 to 9.0 with the new sharing
+     */
+    public function removeReShares() {
+
+        $stmt = $this->getReShares();
+
+        $owners = [];
+        while($share = $stmt->fetch()) {
+
+            $this->shareCache[$share['id']] = $share;
+
+            $owners[$share['id']] = [
+                    'owner' => $this->findOwner($share),
+                    'initiator' => $share['uid_owner'],
+                    'type' => $share['share_type'],
+            ];
+
+            if (count($owners) === 1000) {
+                $this->updateOwners($owners);
+                $owners = [];
+            }
+        }
+
+        $stmt->closeCursor();
+
+        if (count($owners)) {
+            $this->updateOwners($owners);
+        }
+    }
+
+    /**
+     * update all owner information so that all shares have an owner
+     * and an initiator for the upgrade from oC 8.2 to 9.0 with the new sharing
+     */
+    public function updateInitiatorInfo() {
+        while (true) {
+            $shares = $this->getMissingInitiator(1000);
+
+            if (empty($shares)) {
+                break;
+            }
+
+            $owners = [];
+            foreach ($shares as $share) {
+                $owners[$share['id']] = [
+                    'owner' => $share['uid_owner'],
+                    'initiator' => $share['uid_owner'],
+                    'type' => $share['share_type'],
+                ];
+            }
+            $this->updateOwners($owners);
+        }
+    }
+
+    /**
+     * this was dropped for Nextcloud 11 in favour of share by mail
+     */
+    public function removeSendMailOption() {
+        $this->config->deleteAppValue('core', 'shareapi_allow_mail_notification');
+        $this->config->deleteAppValue('core', 'shareapi_allow_public_notification');
+    }
+
+    public function addPasswordColumn() {
+        $query = $this->connection->getQueryBuilder();
+        $query
+            ->update('share')
+            ->set('password', 'share_with')
+            ->where($query->expr()->eq('share_type', $query->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)))
+            ->andWhere($query->expr()->isNotNull('share_with'));
+        $query->execute();
+
+        $clearQuery = $this->connection->getQueryBuilder();
+        $clearQuery
+            ->update('share')->set('share_with', $clearQuery->createNamedParameter(null))
+            ->where($clearQuery->expr()->eq('share_type', $clearQuery->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)));
+
+        $clearQuery->execute();
+
+    }
+
+    /**
+     * find the owner of a re-shared file/folder
+     *
+     * @param array $share
+     * @return array
+     */
+    private function findOwner($share) {
+        $currentShare = $share;
+        while(!is_null($currentShare['parent'])) {
+            if (isset($this->shareCache[$currentShare['parent']])) {
+                $currentShare = $this->shareCache[$currentShare['parent']];
+            } else {
+                $currentShare = $this->getShare((int)$currentShare['parent']);
+                $this->shareCache[$currentShare['id']] = $currentShare;
+            }
+        }
+
+        return $currentShare['uid_owner'];
+    }
+
+    /**
+     * Get $n re-shares from the database
+     *
+     * @param int $n The max number of shares to fetch
+     * @return \Doctrine\DBAL\Driver\Statement
+     */
+    private function getReShares() {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['id', 'parent', 'uid_owner', 'share_type'])
+            ->from($this->table)
+            ->where($query->expr()->in(
+                'share_type',
+                $query->createNamedParameter(
+                    [
+                        \OCP\Share::SHARE_TYPE_USER,
+                        \OCP\Share::SHARE_TYPE_GROUP,
+                        \OCP\Share::SHARE_TYPE_LINK,
+                        \OCP\Share::SHARE_TYPE_REMOTE,
+                    ],
+                    Connection::PARAM_INT_ARRAY
+                )
+            ))
+            ->andWhere($query->expr()->in(
+                'item_type',
+                $query->createNamedParameter(
+                    ['file', 'folder'],
+                    Connection::PARAM_STR_ARRAY
+                )
+            ))
+            ->andWhere($query->expr()->isNotNull('parent'))
+            ->orderBy('id', 'asc');
+        return $query->execute();
+
+
+        $shares = $result->fetchAll();
+        $result->closeCursor();
+
+        $ordered = [];
+        foreach ($shares as $share) {
+            $ordered[(int)$share['id']] = $share;
+        }
+
+        return $ordered;
+    }
+
+    /**
+     * Get $n re-shares from the database
+     *
+     * @param int $n The max number of shares to fetch
+     * @return array
+     */
+    private function getMissingInitiator($n = 1000) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['id', 'uid_owner', 'share_type'])
+            ->from($this->table)
+            ->where($query->expr()->in(
+                'share_type',
+                $query->createNamedParameter(
+                    [
+                        \OCP\Share::SHARE_TYPE_USER,
+                        \OCP\Share::SHARE_TYPE_GROUP,
+                        \OCP\Share::SHARE_TYPE_LINK,
+                        \OCP\Share::SHARE_TYPE_REMOTE,
+                    ],
+                    Connection::PARAM_INT_ARRAY
+                )
+            ))
+            ->andWhere($query->expr()->in(
+                'item_type',
+                $query->createNamedParameter(
+                    ['file', 'folder'],
+                    Connection::PARAM_STR_ARRAY
+                )
+            ))
+            ->andWhere($query->expr()->isNull('uid_initiator'))
+            ->orderBy('id', 'asc')
+            ->setMaxResults($n);
+        $result = $query->execute();
+        $shares = $result->fetchAll();
+        $result->closeCursor();
+
+        $ordered = [];
+        foreach ($shares as $share) {
+            $ordered[(int)$share['id']] = $share;
+        }
+
+        return $ordered;
+    }
+
+    /**
+     * get a specific share
+     *
+     * @param int $id
+     * @return array
+     */
+    private function getShare($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['id', 'parent', 'uid_owner'])
+            ->from($this->table)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+        $result = $query->execute();
+        $share = $result->fetchAll();
+        $result->closeCursor();
+
+        return $share[0];
+    }
+
+    /**
+     * update database with the new owners
+     *
+     * @param array $owners
+     * @throws \Exception
+     */
+    private function updateOwners($owners) {
+
+        $this->connection->beginTransaction();
+
+        try {
+
+            foreach ($owners as $id => $owner) {
+                $query = $this->connection->getQueryBuilder();
+                $query->update($this->table)
+                    ->set('uid_owner', $query->createNamedParameter($owner['owner']))
+                    ->set('uid_initiator', $query->createNamedParameter($owner['initiator']));
+
+
+                if ((int)$owner['type'] !== \OCP\Share::SHARE_TYPE_LINK) {
+                    $query->set('parent', $query->createNamedParameter(null));
+                }
+
+                $query->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+
+                $query->execute();
+            }
+
+            $this->connection->commit();
+
+        } catch (\Exception $e) {
+            $this->connection->rollBack();
+            throw $e;
+        }
+
+    }
 
 }

lib/private/Share20/ProviderFactory.php

Indentation +214 added lines, -214 removed lines

@@ -41,225 +41,225 @@
  */
 class ProviderFactory implements IProviderFactory {
 
-	/** @var IServerContainer */
-	private $serverContainer;
-	/** @var DefaultShareProvider */
-	private $defaultProvider = null;
-	/** @var FederatedShareProvider */
-	private $federatedProvider = null;
-	/** @var  ShareByMailProvider */
-	private $shareByMailProvider;
-	/** @var  \OCA\Circles\ShareByCircleProvider;
-	 * ShareByCircleProvider */
-	private $shareByCircleProvider;
-
-	/**
-	 * IProviderFactory constructor.
-	 *
-	 * @param IServerContainer $serverContainer
-	 */
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
-
-	/**
-	 * Create the default share provider.
-	 *
-	 * @return DefaultShareProvider
-	 */
-	protected function defaultShareProvider() {
-		if ($this->defaultProvider === null) {
-			$this->defaultProvider = new DefaultShareProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getGroupManager(),
-				$this->serverContainer->getLazyRootFolder()
-			);
-		}
-
-		return $this->defaultProvider;
-	}
-
-	/**
-	 * Create the federated share provider
-	 *
-	 * @return FederatedShareProvider
-	 */
-	protected function federatedShareProvider() {
-		if ($this->federatedProvider === null) {
-			/*
+    /** @var IServerContainer */
+    private $serverContainer;
+    /** @var DefaultShareProvider */
+    private $defaultProvider = null;
+    /** @var FederatedShareProvider */
+    private $federatedProvider = null;
+    /** @var  ShareByMailProvider */
+    private $shareByMailProvider;
+    /** @var  \OCA\Circles\ShareByCircleProvider;
+     * ShareByCircleProvider */
+    private $shareByCircleProvider;
+
+    /**
+     * IProviderFactory constructor.
+     *
+     * @param IServerContainer $serverContainer
+     */
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
+
+    /**
+     * Create the default share provider.
+     *
+     * @return DefaultShareProvider
+     */
+    protected function defaultShareProvider() {
+        if ($this->defaultProvider === null) {
+            $this->defaultProvider = new DefaultShareProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getGroupManager(),
+                $this->serverContainer->getLazyRootFolder()
+            );
+        }
+
+        return $this->defaultProvider;
+    }
+
+    /**
+     * Create the federated share provider
+     *
+     * @return FederatedShareProvider
+     */
+    protected function federatedShareProvider() {
+        if ($this->federatedProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('federatedfilesharing')) {
-				return null;
-			}
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('federatedfilesharing')) {
+                return null;
+            }
 
-			/*
+            /*
 			 * TODO: add factory to federated sharing app
 			 */
-			$l = $this->serverContainer->getL10N('federatedfilessharing');
-			$addressHandler = new AddressHandler(
-				$this->serverContainer->getURLGenerator(),
-				$l,
-				$this->serverContainer->getCloudIdManager()
-			);
-			$discoveryManager = new DiscoveryManager(
-				$this->serverContainer->getMemCacheFactory(),
-				$this->serverContainer->getHTTPClientService()
-			);
-			$notifications = new Notifications(
-				$addressHandler,
-				$this->serverContainer->getHTTPClientService(),
-				$discoveryManager,
-				$this->serverContainer->getJobList()
-			);
-			$tokenHandler = new TokenHandler(
-				$this->serverContainer->getSecureRandom()
-			);
-
-			$this->federatedProvider = new FederatedShareProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$addressHandler,
-				$notifications,
-				$tokenHandler,
-				$l,
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getConfig(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getCloudIdManager()
-			);
-		}
-
-		return $this->federatedProvider;
-	}
-
-	/**
-	 * Create the federated share provider
-	 *
-	 * @return ShareByMailProvider
-	 */
-	protected function getShareByMailProvider() {
-		if ($this->shareByMailProvider === null) {
-			/*
+            $l = $this->serverContainer->getL10N('federatedfilessharing');
+            $addressHandler = new AddressHandler(
+                $this->serverContainer->getURLGenerator(),
+                $l,
+                $this->serverContainer->getCloudIdManager()
+            );
+            $discoveryManager = new DiscoveryManager(
+                $this->serverContainer->getMemCacheFactory(),
+                $this->serverContainer->getHTTPClientService()
+            );
+            $notifications = new Notifications(
+                $addressHandler,
+                $this->serverContainer->getHTTPClientService(),
+                $discoveryManager,
+                $this->serverContainer->getJobList()
+            );
+            $tokenHandler = new TokenHandler(
+                $this->serverContainer->getSecureRandom()
+            );
+
+            $this->federatedProvider = new FederatedShareProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $addressHandler,
+                $notifications,
+                $tokenHandler,
+                $l,
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getConfig(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getCloudIdManager()
+            );
+        }
+
+        return $this->federatedProvider;
+    }
+
+    /**
+     * Create the federated share provider
+     *
+     * @return ShareByMailProvider
+     */
+    protected function getShareByMailProvider() {
+        if ($this->shareByMailProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('sharebymail')) {
-				return null;
-			}
-
-			$settingsManager = new SettingsManager($this->serverContainer->getConfig());
-
-			$this->shareByMailProvider = new ShareByMailProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getSecureRandom(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getL10N('sharebymail'),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getMailer(),
-				$this->serverContainer->getURLGenerator(),
-				$this->serverContainer->getActivityManager(),
-				$settingsManager
-			);
-		}
-
-		return $this->shareByMailProvider;
-	}
-
-
-	/**
-	 * Create the circle share provider
-	 *
-	 * @return FederatedShareProvider
-	 */
-	protected function getShareByCircleProvider() {
-
-		$appManager = $this->serverContainer->getAppManager();
-		if (!$appManager->isEnabledForUser('circles')) {
-			return null;
-		}
-
-
-		if ($this->shareByCircleProvider === null) {
-
-			$this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getSecureRandom(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getL10N('circles'),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getURLGenerator()
-			);
-		}
-
-		return $this->shareByCircleProvider;
-	}
-
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getProvider($id) {
-		$provider = null;
-		if ($id === 'ocinternal') {
-			$provider = $this->defaultShareProvider();
-		} else if ($id === 'ocFederatedSharing') {
-			$provider = $this->federatedShareProvider();
-		} else if ($id === 'ocMailShare') {
-			$provider = $this->getShareByMailProvider();
-		} else if ($id === 'ocCircleShare') {
-			$provider = $this->getShareByCircleProvider();
-		}
-
-		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
-		}
-
-		return $provider;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getProviderForType($shareType) {
-		$provider = null;
-
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER ||
-			$shareType === \OCP\Share::SHARE_TYPE_GROUP ||
-			$shareType === \OCP\Share::SHARE_TYPE_LINK
-		) {
-			$provider = $this->defaultShareProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
-			$provider = $this->federatedShareProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
-			$provider = $this->getShareByMailProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
-			$provider = $this->getShareByCircleProvider();
-		}
-
-
-		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
-		}
-
-		return $provider;
-	}
-
-	public function getAllProviders() {
-		$shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
-		$shareByMail = $this->getShareByMailProvider();
-		if ($shareByMail !== null) {
-			$shares[] = $shareByMail;
-		}
-		$shareByCircle = $this->getShareByCircleProvider();
-		if ($shareByCircle !== null) {
-			$shares[] = $shareByCircle;
-		}
-
-		return $shares;
-	}
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('sharebymail')) {
+                return null;
+            }
+
+            $settingsManager = new SettingsManager($this->serverContainer->getConfig());
+
+            $this->shareByMailProvider = new ShareByMailProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getSecureRandom(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getL10N('sharebymail'),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getMailer(),
+                $this->serverContainer->getURLGenerator(),
+                $this->serverContainer->getActivityManager(),
+                $settingsManager
+            );
+        }
+
+        return $this->shareByMailProvider;
+    }
+
+
+    /**
+     * Create the circle share provider
+     *
+     * @return FederatedShareProvider
+     */
+    protected function getShareByCircleProvider() {
+
+        $appManager = $this->serverContainer->getAppManager();
+        if (!$appManager->isEnabledForUser('circles')) {
+            return null;
+        }
+
+
+        if ($this->shareByCircleProvider === null) {
+
+            $this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getSecureRandom(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getL10N('circles'),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getURLGenerator()
+            );
+        }
+
+        return $this->shareByCircleProvider;
+    }
+
+
+    /**
+     * @inheritdoc
+     */
+    public function getProvider($id) {
+        $provider = null;
+        if ($id === 'ocinternal') {
+            $provider = $this->defaultShareProvider();
+        } else if ($id === 'ocFederatedSharing') {
+            $provider = $this->federatedShareProvider();
+        } else if ($id === 'ocMailShare') {
+            $provider = $this->getShareByMailProvider();
+        } else if ($id === 'ocCircleShare') {
+            $provider = $this->getShareByCircleProvider();
+        }
+
+        if ($provider === null) {
+            throw new ProviderException('No provider with id .' . $id . ' found.');
+        }
+
+        return $provider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getProviderForType($shareType) {
+        $provider = null;
+
+        if ($shareType === \OCP\Share::SHARE_TYPE_USER ||
+            $shareType === \OCP\Share::SHARE_TYPE_GROUP ||
+            $shareType === \OCP\Share::SHARE_TYPE_LINK
+        ) {
+            $provider = $this->defaultShareProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
+            $provider = $this->federatedShareProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
+            $provider = $this->getShareByMailProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
+            $provider = $this->getShareByCircleProvider();
+        }
+
+
+        if ($provider === null) {
+            throw new ProviderException('No share provider for share type ' . $shareType);
+        }
+
+        return $provider;
+    }
+
+    public function getAllProviders() {
+        $shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
+        $shareByMail = $this->getShareByMailProvider();
+        if ($shareByMail !== null) {
+            $shares[] = $shareByMail;
+        }
+        $shareByCircle = $this->getShareByCircleProvider();
+        if ($shareByCircle !== null) {
+            $shares[] = $shareByCircle;
+        }
+
+        return $shares;
+    }
 }

apps/sharebymail/lib/ShareByMailProvider.php

Indentation +790 added lines, -790 removed lines

@@ -50,808 +50,808 @@
  */
 class ShareByMailProvider implements IShareProvider {
 
-	/** @var  IDBConnection */
-	private $dbConnection;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var ISecureRandom */
-	private $secureRandom;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IL10N */
-	private $l;
-
-	/** @var IMailer */
-	private $mailer;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var IManager  */
-	private $activityManager;
-
-	/** @var SettingsManager */
-	private $settingsManager;
-
-	/**
-	 * Return the identifier of this provider.
-	 *
-	 * @return string Containing only [a-zA-Z0-9]
-	 */
-	public function identifier() {
-		return 'ocMailShare';
-	}
-
-	/**
-	 * DefaultShareProvider constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param ISecureRandom $secureRandom
-	 * @param IUserManager $userManager
-	 * @param IRootFolder $rootFolder
-	 * @param IL10N $l
-	 * @param ILogger $logger
-	 * @param IMailer $mailer
-	 * @param IURLGenerator $urlGenerator
-	 * @param IManager $activityManager
-	 * @param SettingsManager $settingsManager
-	 */
-	public function __construct(
-		IDBConnection $connection,
-		ISecureRandom $secureRandom,
-		IUserManager $userManager,
-		IRootFolder $rootFolder,
-		IL10N $l,
-		ILogger $logger,
-		IMailer $mailer,
-		IURLGenerator $urlGenerator,
-		IManager $activityManager,
-		SettingsManager $settingsManager
-	) {
-		$this->dbConnection = $connection;
-		$this->secureRandom = $secureRandom;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-		$this->l = $l;
-		$this->logger = $logger;
-		$this->mailer = $mailer;
-		$this->urlGenerator = $urlGenerator;
-		$this->activityManager = $activityManager;
-		$this->settingsManager = $settingsManager;
-	}
-
-	/**
-	 * Share a path
-	 *
-	 * @param IShare $share
-	 * @return IShare The share object
-	 * @throws ShareNotFound
-	 * @throws \Exception
-	 */
-	public function create(IShare $share) {
-
-		$shareWith = $share->getSharedWith();
-		/*
+    /** @var  IDBConnection */
+    private $dbConnection;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var ISecureRandom */
+    private $secureRandom;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IL10N */
+    private $l;
+
+    /** @var IMailer */
+    private $mailer;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var IManager  */
+    private $activityManager;
+
+    /** @var SettingsManager */
+    private $settingsManager;
+
+    /**
+     * Return the identifier of this provider.
+     *
+     * @return string Containing only [a-zA-Z0-9]
+     */
+    public function identifier() {
+        return 'ocMailShare';
+    }
+
+    /**
+     * DefaultShareProvider constructor.
+     *
+     * @param IDBConnection $connection
+     * @param ISecureRandom $secureRandom
+     * @param IUserManager $userManager
+     * @param IRootFolder $rootFolder
+     * @param IL10N $l
+     * @param ILogger $logger
+     * @param IMailer $mailer
+     * @param IURLGenerator $urlGenerator
+     * @param IManager $activityManager
+     * @param SettingsManager $settingsManager
+     */
+    public function __construct(
+        IDBConnection $connection,
+        ISecureRandom $secureRandom,
+        IUserManager $userManager,
+        IRootFolder $rootFolder,
+        IL10N $l,
+        ILogger $logger,
+        IMailer $mailer,
+        IURLGenerator $urlGenerator,
+        IManager $activityManager,
+        SettingsManager $settingsManager
+    ) {
+        $this->dbConnection = $connection;
+        $this->secureRandom = $secureRandom;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->mailer = $mailer;
+        $this->urlGenerator = $urlGenerator;
+        $this->activityManager = $activityManager;
+        $this->settingsManager = $settingsManager;
+    }
+
+    /**
+     * Share a path
+     *
+     * @param IShare $share
+     * @return IShare The share object
+     * @throws ShareNotFound
+     * @throws \Exception
+     */
+    public function create(IShare $share) {
+
+        $shareWith = $share->getSharedWith();
+        /*
 		 * Check if file is not already shared with the remote user
 		 */
-		$alreadyShared = $this->getSharedWith($shareWith, \OCP\Share::SHARE_TYPE_EMAIL, $share->getNode(), 1, 0);
-		if (!empty($alreadyShared)) {
-			$message = 'Sharing %s failed, this item is already shared with %s';
-			$message_t = $this->l->t('Sharing %s failed, this item is already shared with %s', array($share->getNode()->getName(), $shareWith));
-			$this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']);
-			throw new \Exception($message_t);
-		}
-
-		$shareId = $this->createMailShare($share);
-		$this->createActivity($share);
-		$data = $this->getRawShare($shareId);
-		return $this->createShareObject($data);
-
-	}
-
-	/**
-	 * create activity if a file/folder was shared by mail
-	 *
-	 * @param IShare $share
-	 */
-	protected function createActivity(IShare $share) {
-
-		$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-
-		$this->publishActivity(
-			Activity::SUBJECT_SHARED_EMAIL_SELF,
-			[$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
-			$share->getSharedBy(),
-			$share->getNode()->getId(),
-			$userFolder->getRelativePath($share->getNode()->getPath())
-		);
-
-		if ($share->getShareOwner() !== $share->getSharedBy()) {
-			$ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-			$fileId = $share->getNode()->getId();
-			$nodes = $ownerFolder->getById($fileId);
-			$ownerPath = $nodes[0]->getPath();
-			$this->publishActivity(
-				Activity::SUBJECT_SHARED_EMAIL_BY,
-				[$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
-				$share->getShareOwner(),
-				$fileId,
-				$ownerFolder->getRelativePath($ownerPath)
-			);
-		}
-
-	}
-
-	/**
-	 * publish activity if a file/folder was shared by mail
-	 *
-	 * @param $subject
-	 * @param $parameters
-	 * @param $affectedUser
-	 * @param $fileId
-	 * @param $filePath
-	 */
-	protected function publishActivity($subject, $parameters, $affectedUser, $fileId, $filePath) {
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('sharebymail')
-			->setType('shared')
-			->setSubject($subject, $parameters)
-			->setAffectedUser($affectedUser)
-			->setObject('files', $fileId, $filePath);
-		$this->activityManager->publish($event);
-
-	}
-
-	/**
-	 * @param IShare $share
-	 * @return int
-	 * @throws \Exception
-	 */
-	protected function createMailShare(IShare $share) {
-		$share->setToken($this->generateToken());
-		$shareId = $this->addShareToDB(
-			$share->getNodeId(),
-			$share->getNodeType(),
-			$share->getSharedWith(),
-			$share->getSharedBy(),
-			$share->getShareOwner(),
-			$share->getPermissions(),
-			$share->getToken()
-		);
-
-		try {
-			$link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare',
-				['token' => $share->getToken()]);
-			$this->sendMailNotification($share->getNode()->getName(),
-				$link,
-				$share->getShareOwner(),
-				$share->getSharedBy(), $share->getSharedWith());
-		} catch (HintException $hintException) {
-			$this->logger->error('Failed to send share by mail: ' . $hintException->getMessage());
-			$this->removeShareFromTable($shareId);
-			throw $hintException;
-		} catch (\Exception $e) {
-			$this->logger->error('Failed to send share by mail: ' . $e->getMessage());
-			$this->removeShareFromTable($shareId);
-			throw new HintException('Failed to send share by mail',
-				$this->l->t('Failed to send share by E-mail'));
-		}
-
-		return $shareId;
-
-	}
-
-	protected function sendMailNotification($filename, $link, $owner, $initiator, $shareWith) {
-		$ownerUser = $this->userManager->get($owner);
-		$initiatorUser = $this->userManager->get($initiator);
-		$ownerDisplayName = ($ownerUser instanceof IUser) ? $ownerUser->getDisplayName() : $owner;
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-		if ($owner === $initiator) {
-			$subject = (string)$this->l->t('%s shared »%s« with you', array($ownerDisplayName, $filename));
-		} else {
-			$subject = (string)$this->l->t('%s shared »%s« with you on behalf of %s', array($ownerDisplayName, $filename, $initiatorDisplayName));
-		}
-
-		$message = $this->mailer->createMessage();
-		$htmlBody = $this->createMailBody('mail', $filename, $link, $ownerDisplayName, $initiatorDisplayName);
-		$textBody = $this->createMailBody('altmail', $filename, $link, $ownerDisplayName, $initiatorDisplayName);
-		$message->setTo([$shareWith]);
-		$message->setSubject($subject);
-		$message->setBody($textBody, 'text/plain');
-		$message->setHtmlBody($htmlBody);
-		$this->mailer->send($message);
-
-	}
-
-	/**
-	 * create mail body
-	 *
-	 * @param $filename
-	 * @param $link
-	 * @param $owner
-	 * @param $initiator
-	 * @return string plain text mail
-	 * @throws HintException
-	 */
-	protected function createMailBody($template, $filename, $link, $owner, $initiator) {
-
-		$mailBodyTemplate = new Template('sharebymail', $template, '');
-		$mailBodyTemplate->assign ('filename', \OCP\Util::sanitizeHTML($filename));
-		$mailBodyTemplate->assign ('link', $link);
-		$mailBodyTemplate->assign ('owner', \OCP\Util::sanitizeHTML($owner));
-		$mailBodyTemplate->assign ('initiator', \OCP\Util::sanitizeHTML($initiator));
-		$mailBodyTemplate->assign ('onBehalfOf', $initiator !== $owner);
-		$mailBody = $mailBodyTemplate->fetchPage();
-
-		if (is_string($mailBody)) {
-			return $mailBody;
-		}
-
-		throw new HintException('Failed to create the E-mail',
-			$this->l->t('Failed to create the E-mail'));
-	}
-
-	/**
-	 * send password to recipient of a mail share
-	 *
-	 * @param string $filename
-	 * @param string $initiator
-	 * @param string $shareWith
-	 */
-	protected function sendPassword($filename, $initiator, $shareWith, $password) {
-
-		if ($this->settingsManager->sendPasswordByMail() === false) {
-			return;
-		}
-
-		$initiatorUser = $this->userManager->get($initiator);
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-		$subject = (string)$this->l->t('Password to access »%s« shared to you by %s', array($filename, $initiatorDisplayName));
-
-		$message = $this->mailer->createMessage();
-		$htmlBody = $this->createMailBodyToSendPassword('mailpassword', $filename, $initiatorDisplayName, $password);
-		$textBody = $this->createMailBodyToSendPassword('altmailpassword', $filename,$initiatorDisplayName, $password);
-		$message->setTo([$shareWith]);
-		$message->setSubject($subject);
-		$message->setBody($textBody, 'text/plain');
-		$message->setHtmlBody($htmlBody);
-		$this->mailer->send($message);
-
-	}
-
-	/**
-	 * create mail body to send password to recipient
-	 *
-	 * @param string $filename
-	 * @param string $initiator
-	 * @param string $password
-	 * @return string plain text mail
-	 * @throws HintException
-	 */
-	protected function createMailBodyToSendPassword($template, $filename, $initiator, $password) {
-
-		$mailBodyTemplate = new Template('sharebymail', $template, '');
-		$mailBodyTemplate->assign ('filename', \OCP\Util::sanitizeHTML($filename));
-		$mailBodyTemplate->assign ('password', \OCP\Util::sanitizeHTML($password));
-		$mailBodyTemplate->assign ('initiator', \OCP\Util::sanitizeHTML($initiator));
-		$mailBody = $mailBodyTemplate->fetchPage();
-
-		if (is_string($mailBody)) {
-			return $mailBody;
-		}
-
-		throw new HintException('Failed to create the E-mail',
-			$this->l->t('Failed to create the E-mail'));
-	}
-
-
-	/**
-	 * generate share token
-	 *
-	 * @return string
-	 */
-	protected function generateToken() {
-		$token = $this->secureRandom->generate(
-			15, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
-		return $token;
-	}
-
-	/**
-	 * Get all children of this share
-	 *
-	 * @param IShare $parent
-	 * @return IShare[]
-	 */
-	public function getChildren(IShare $parent) {
-		$children = [];
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
-			->orderBy('id');
-
-		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
-			$children[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $children;
-	}
-
-	/**
-	 * add share to the database and return the ID
-	 *
-	 * @param int $itemSource
-	 * @param string $itemType
-	 * @param string $shareWith
-	 * @param string $sharedBy
-	 * @param string $uidOwner
-	 * @param int $permissions
-	 * @param string $token
-	 * @return int
-	 */
-	protected function addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $uidOwner, $permissions, $token) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->insert('share')
-			->setValue('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL))
-			->setValue('item_type', $qb->createNamedParameter($itemType))
-			->setValue('item_source', $qb->createNamedParameter($itemSource))
-			->setValue('file_source', $qb->createNamedParameter($itemSource))
-			->setValue('share_with', $qb->createNamedParameter($shareWith))
-			->setValue('uid_owner', $qb->createNamedParameter($uidOwner))
-			->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
-			->setValue('permissions', $qb->createNamedParameter($permissions))
-			->setValue('token', $qb->createNamedParameter($token))
-			->setValue('stime', $qb->createNamedParameter(time()));
-
-		/*
+        $alreadyShared = $this->getSharedWith($shareWith, \OCP\Share::SHARE_TYPE_EMAIL, $share->getNode(), 1, 0);
+        if (!empty($alreadyShared)) {
+            $message = 'Sharing %s failed, this item is already shared with %s';
+            $message_t = $this->l->t('Sharing %s failed, this item is already shared with %s', array($share->getNode()->getName(), $shareWith));
+            $this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']);
+            throw new \Exception($message_t);
+        }
+
+        $shareId = $this->createMailShare($share);
+        $this->createActivity($share);
+        $data = $this->getRawShare($shareId);
+        return $this->createShareObject($data);
+
+    }
+
+    /**
+     * create activity if a file/folder was shared by mail
+     *
+     * @param IShare $share
+     */
+    protected function createActivity(IShare $share) {
+
+        $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+
+        $this->publishActivity(
+            Activity::SUBJECT_SHARED_EMAIL_SELF,
+            [$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
+            $share->getSharedBy(),
+            $share->getNode()->getId(),
+            $userFolder->getRelativePath($share->getNode()->getPath())
+        );
+
+        if ($share->getShareOwner() !== $share->getSharedBy()) {
+            $ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+            $fileId = $share->getNode()->getId();
+            $nodes = $ownerFolder->getById($fileId);
+            $ownerPath = $nodes[0]->getPath();
+            $this->publishActivity(
+                Activity::SUBJECT_SHARED_EMAIL_BY,
+                [$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
+                $share->getShareOwner(),
+                $fileId,
+                $ownerFolder->getRelativePath($ownerPath)
+            );
+        }
+
+    }
+
+    /**
+     * publish activity if a file/folder was shared by mail
+     *
+     * @param $subject
+     * @param $parameters
+     * @param $affectedUser
+     * @param $fileId
+     * @param $filePath
+     */
+    protected function publishActivity($subject, $parameters, $affectedUser, $fileId, $filePath) {
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('sharebymail')
+            ->setType('shared')
+            ->setSubject($subject, $parameters)
+            ->setAffectedUser($affectedUser)
+            ->setObject('files', $fileId, $filePath);
+        $this->activityManager->publish($event);
+
+    }
+
+    /**
+     * @param IShare $share
+     * @return int
+     * @throws \Exception
+     */
+    protected function createMailShare(IShare $share) {
+        $share->setToken($this->generateToken());
+        $shareId = $this->addShareToDB(
+            $share->getNodeId(),
+            $share->getNodeType(),
+            $share->getSharedWith(),
+            $share->getSharedBy(),
+            $share->getShareOwner(),
+            $share->getPermissions(),
+            $share->getToken()
+        );
+
+        try {
+            $link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare',
+                ['token' => $share->getToken()]);
+            $this->sendMailNotification($share->getNode()->getName(),
+                $link,
+                $share->getShareOwner(),
+                $share->getSharedBy(), $share->getSharedWith());
+        } catch (HintException $hintException) {
+            $this->logger->error('Failed to send share by mail: ' . $hintException->getMessage());
+            $this->removeShareFromTable($shareId);
+            throw $hintException;
+        } catch (\Exception $e) {
+            $this->logger->error('Failed to send share by mail: ' . $e->getMessage());
+            $this->removeShareFromTable($shareId);
+            throw new HintException('Failed to send share by mail',
+                $this->l->t('Failed to send share by E-mail'));
+        }
+
+        return $shareId;
+
+    }
+
+    protected function sendMailNotification($filename, $link, $owner, $initiator, $shareWith) {
+        $ownerUser = $this->userManager->get($owner);
+        $initiatorUser = $this->userManager->get($initiator);
+        $ownerDisplayName = ($ownerUser instanceof IUser) ? $ownerUser->getDisplayName() : $owner;
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+        if ($owner === $initiator) {
+            $subject = (string)$this->l->t('%s shared »%s« with you', array($ownerDisplayName, $filename));
+        } else {
+            $subject = (string)$this->l->t('%s shared »%s« with you on behalf of %s', array($ownerDisplayName, $filename, $initiatorDisplayName));
+        }
+
+        $message = $this->mailer->createMessage();
+        $htmlBody = $this->createMailBody('mail', $filename, $link, $ownerDisplayName, $initiatorDisplayName);
+        $textBody = $this->createMailBody('altmail', $filename, $link, $ownerDisplayName, $initiatorDisplayName);
+        $message->setTo([$shareWith]);
+        $message->setSubject($subject);
+        $message->setBody($textBody, 'text/plain');
+        $message->setHtmlBody($htmlBody);
+        $this->mailer->send($message);
+
+    }
+
+    /**
+     * create mail body
+     *
+     * @param $filename
+     * @param $link
+     * @param $owner
+     * @param $initiator
+     * @return string plain text mail
+     * @throws HintException
+     */
+    protected function createMailBody($template, $filename, $link, $owner, $initiator) {
+
+        $mailBodyTemplate = new Template('sharebymail', $template, '');
+        $mailBodyTemplate->assign ('filename', \OCP\Util::sanitizeHTML($filename));
+        $mailBodyTemplate->assign ('link', $link);
+        $mailBodyTemplate->assign ('owner', \OCP\Util::sanitizeHTML($owner));
+        $mailBodyTemplate->assign ('initiator', \OCP\Util::sanitizeHTML($initiator));
+        $mailBodyTemplate->assign ('onBehalfOf', $initiator !== $owner);
+        $mailBody = $mailBodyTemplate->fetchPage();
+
+        if (is_string($mailBody)) {
+            return $mailBody;
+        }
+
+        throw new HintException('Failed to create the E-mail',
+            $this->l->t('Failed to create the E-mail'));
+    }
+
+    /**
+     * send password to recipient of a mail share
+     *
+     * @param string $filename
+     * @param string $initiator
+     * @param string $shareWith
+     */
+    protected function sendPassword($filename, $initiator, $shareWith, $password) {
+
+        if ($this->settingsManager->sendPasswordByMail() === false) {
+            return;
+        }
+
+        $initiatorUser = $this->userManager->get($initiator);
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+        $subject = (string)$this->l->t('Password to access »%s« shared to you by %s', array($filename, $initiatorDisplayName));
+
+        $message = $this->mailer->createMessage();
+        $htmlBody = $this->createMailBodyToSendPassword('mailpassword', $filename, $initiatorDisplayName, $password);
+        $textBody = $this->createMailBodyToSendPassword('altmailpassword', $filename,$initiatorDisplayName, $password);
+        $message->setTo([$shareWith]);
+        $message->setSubject($subject);
+        $message->setBody($textBody, 'text/plain');
+        $message->setHtmlBody($htmlBody);
+        $this->mailer->send($message);
+
+    }
+
+    /**
+     * create mail body to send password to recipient
+     *
+     * @param string $filename
+     * @param string $initiator
+     * @param string $password
+     * @return string plain text mail
+     * @throws HintException
+     */
+    protected function createMailBodyToSendPassword($template, $filename, $initiator, $password) {
+
+        $mailBodyTemplate = new Template('sharebymail', $template, '');
+        $mailBodyTemplate->assign ('filename', \OCP\Util::sanitizeHTML($filename));
+        $mailBodyTemplate->assign ('password', \OCP\Util::sanitizeHTML($password));
+        $mailBodyTemplate->assign ('initiator', \OCP\Util::sanitizeHTML($initiator));
+        $mailBody = $mailBodyTemplate->fetchPage();
+
+        if (is_string($mailBody)) {
+            return $mailBody;
+        }
+
+        throw new HintException('Failed to create the E-mail',
+            $this->l->t('Failed to create the E-mail'));
+    }
+
+
+    /**
+     * generate share token
+     *
+     * @return string
+     */
+    protected function generateToken() {
+        $token = $this->secureRandom->generate(
+            15, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+        return $token;
+    }
+
+    /**
+     * Get all children of this share
+     *
+     * @param IShare $parent
+     * @return IShare[]
+     */
+    public function getChildren(IShare $parent) {
+        $children = [];
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
+            ->orderBy('id');
+
+        $cursor = $qb->execute();
+        while($data = $cursor->fetch()) {
+            $children[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $children;
+    }
+
+    /**
+     * add share to the database and return the ID
+     *
+     * @param int $itemSource
+     * @param string $itemType
+     * @param string $shareWith
+     * @param string $sharedBy
+     * @param string $uidOwner
+     * @param int $permissions
+     * @param string $token
+     * @return int
+     */
+    protected function addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $uidOwner, $permissions, $token) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->insert('share')
+            ->setValue('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL))
+            ->setValue('item_type', $qb->createNamedParameter($itemType))
+            ->setValue('item_source', $qb->createNamedParameter($itemSource))
+            ->setValue('file_source', $qb->createNamedParameter($itemSource))
+            ->setValue('share_with', $qb->createNamedParameter($shareWith))
+            ->setValue('uid_owner', $qb->createNamedParameter($uidOwner))
+            ->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
+            ->setValue('permissions', $qb->createNamedParameter($permissions))
+            ->setValue('token', $qb->createNamedParameter($token))
+            ->setValue('stime', $qb->createNamedParameter(time()));
+
+        /*
 		 * Added to fix https://github.com/owncloud/core/issues/22215
 		 * Can be removed once we get rid of ajax/share.php
 		 */
-		$qb->setValue('file_target', $qb->createNamedParameter(''));
+        $qb->setValue('file_target', $qb->createNamedParameter(''));
 
-		$qb->execute();
-		$id = $qb->getLastInsertId();
+        $qb->execute();
+        $id = $qb->getLastInsertId();
 
-		return (int)$id;
-	}
+        return (int)$id;
+    }
 
-	/**
-	 * Update a share
-	 *
-	 * @param IShare $share
-	 * @param string|null $plainTextPassword
-	 * @return IShare The share object
-	 */
-	public function update(IShare $share, $plainTextPassword = null) {
+    /**
+     * Update a share
+     *
+     * @param IShare $share
+     * @param string|null $plainTextPassword
+     * @return IShare The share object
+     */
+    public function update(IShare $share, $plainTextPassword = null) {
 
-		$originalShare = $this->getShareById($share->getId());
+        $originalShare = $this->getShareById($share->getId());
 
-		// a real password was given
-		$validPassword = $plainTextPassword !== null && $plainTextPassword !== '';
+        // a real password was given
+        $validPassword = $plainTextPassword !== null && $plainTextPassword !== '';
 
-		if($validPassword && $originalShare->getPassword() !== $share->getPassword()) {
-			$this->sendPassword($share->getNode()->getName(), $share->getSharedBy(), $share->getSharedWith(), $plainTextPassword);
-		}
-		/*
+        if($validPassword && $originalShare->getPassword() !== $share->getPassword()) {
+            $this->sendPassword($share->getNode()->getName(), $share->getSharedBy(), $share->getSharedWith(), $plainTextPassword);
+        }
+        /*
 		 * We allow updating the permissions and password of mail shares
 		 */
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->update('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-			->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-			->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-			->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-			->set('password', $qb->createNamedParameter($share->getPassword()))
-			->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-			->execute();
-
-		return $share;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function move(IShare $share, $recipient) {
-		/**
-		 * nothing to do here, mail shares are only outgoing shares
-		 */
-		return $share;
-	}
-
-	/**
-	 * Delete a share (owner unShares the file)
-	 *
-	 * @param IShare $share
-	 */
-	public function delete(IShare $share) {
-		$this->removeShareFromTable($share->getId());
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteFromSelf(IShare $share, $recipient) {
-		// nothing to do here, mail shares are only outgoing shares
-		return;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share');
-
-		$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)));
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			//Special case for old shares created via the web UI
-			$or1 = $qb->expr()->andX(
-				$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-				$qb->expr()->isNull('uid_initiator')
-			);
-
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)),
-					$or1
-				)
-			);
-		} 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->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareById($id, $recipientId = null) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)));
-
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		try {
-			$share = $this->createShareObject($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Get shares for a given path
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @return IShare[]
-	 */
-	public function getSharesByPath(Node $path) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
-			->execute();
-
-		$shares = [];
-		while($data = $cursor->fetch()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
-		/** @var IShare[] $shares */
-		$shares = [];
-
-		//Get shares directly with this user
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share');
-
-		// Order by id
-		$qb->orderBy('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_EMAIL)));
-		$qb->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)));
-
-		// 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()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-
-		return $shares;
-	}
-
-	/**
-	 * Get a share by token
-	 *
-	 * @param string $token
-	 * @return IShare
-	 * @throws ShareNotFound
-	 */
-	public function getShareByToken($token) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
-			->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->execute();
-
-		$data = $cursor->fetch();
-
-		if ($data === false) {
-			throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
-		}
-
-		try {
-			$share = $this->createShareObject($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
-		}
-
-		return $share;
-	}
-
-	/**
-	 * remove share from table
-	 *
-	 * @param string $shareId
-	 */
-	protected function removeShareFromTable($shareId) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)));
-		$qb->execute();
-	}
-
-	/**
-	 * Create a share object from an database row
-	 *
-	 * @param array $data
-	 * @return IShare
-	 * @throws InvalidShare
-	 * @throws ShareNotFound
-	 */
-	protected function createShareObject($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'])
-			->setMailSend((bool)$data['mail_send'])
-			->setToken($data['token']);
-
-		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
-		$share->setShareTime($shareTime);
-		$share->setSharedWith($data['share_with']);
-		$share->setPassword($data['password']);
-
-		if ($data['uid_initiator'] !== null) {
-			$share->setShareOwner($data['uid_owner']);
-			$share->setSharedBy($data['uid_initiator']);
-		} else {
-			//OLD SHARE
-			$share->setSharedBy($data['uid_owner']);
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
-
-			$owner = $path->getOwner();
-			$share->setShareOwner($owner->getUID());
-		}
-
-		if ($data['expiration'] !== null) {
-			$expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
-			if ($expiration !== false) {
-				$share->setExpirationDate($expiration);
-			}
-		}
-
-		$share->setNodeId((int)$data['file_source']);
-		$share->setNodeType($data['item_type']);
-
-		$share->setProviderId($this->identifier());
-
-		return $share;
-	}
-
-	/**
-	 * Get the node with file $id for $user
-	 *
-	 * @param string $userId
-	 * @param int $id
-	 * @return \OCP\Files\File|\OCP\Files\Folder
-	 * @throws InvalidShare
-	 */
-	private function getNode($userId, $id) {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($userId);
-		} catch (NotFoundException $e) {
-			throw new InvalidShare();
-		}
-
-		$nodes = $userFolder->getById($id);
-
-		if (empty($nodes)) {
-			throw new InvalidShare();
-		}
-
-		return $nodes[0];
-	}
-
-	/**
-	 * 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->dbConnection->getQueryBuilder();
-
-		$qb->delete('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
-			->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)))
-			->execute();
-	}
-
-	/**
-	 * This provider does not support group shares
-	 *
-	 * @param string $gid
-	 */
-	public function groupDeleted($gid) {
-		return;
-	}
-
-	/**
-	 * This provider does not support group shares
-	 *
-	 * @param string $uid
-	 * @param string $gid
-	 */
-	public function userDeletedFromGroup($uid, $gid) {
-		return;
-	}
-
-	/**
-	 * get database row of a give share
-	 *
-	 * @param $id
-	 * @return array
-	 * @throws ShareNotFound
-	 */
-	protected function getRawShare($id) {
-
-		// Now fetch the inserted share and create a complete share object
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound;
-		}
-
-		return $data;
-	}
-
-	public function getSharesInFolder($userId, Folder $node, $reshares) {
-		$qb = $this->dbConnection->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'))
-			))
-			->andWhere(
-				$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL))
-			);
-
-		/**
-		 * 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', '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->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->update('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+            ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+            ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+            ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+            ->set('password', $qb->createNamedParameter($share->getPassword()))
+            ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+            ->execute();
+
+        return $share;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function move(IShare $share, $recipient) {
+        /**
+         * nothing to do here, mail shares are only outgoing shares
+         */
+        return $share;
+    }
+
+    /**
+     * Delete a share (owner unShares the file)
+     *
+     * @param IShare $share
+     */
+    public function delete(IShare $share) {
+        $this->removeShareFromTable($share->getId());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteFromSelf(IShare $share, $recipient) {
+        // nothing to do here, mail shares are only outgoing shares
+        return;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share');
+
+        $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)));
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            //Special case for old shares created via the web UI
+            $or1 = $qb->expr()->andX(
+                $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                $qb->expr()->isNull('uid_initiator')
+            );
+
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)),
+                    $or1
+                )
+            );
+        } 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->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareById($id, $recipientId = null) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)));
+
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        try {
+            $share = $this->createShareObject($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        return $share;
+    }
+
+    /**
+     * Get shares for a given path
+     *
+     * @param \OCP\Files\Node $path
+     * @return IShare[]
+     */
+    public function getSharesByPath(Node $path) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
+            ->execute();
+
+        $shares = [];
+        while($data = $cursor->fetch()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
+        /** @var IShare[] $shares */
+        $shares = [];
+
+        //Get shares directly with this user
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share');
+
+        // Order by id
+        $qb->orderBy('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_EMAIL)));
+        $qb->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)));
+
+        // 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()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+
+        return $shares;
+    }
+
+    /**
+     * Get a share by token
+     *
+     * @param string $token
+     * @return IShare
+     * @throws ShareNotFound
+     */
+    public function getShareByToken($token) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
+            ->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->execute();
+
+        $data = $cursor->fetch();
+
+        if ($data === false) {
+            throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
+        }
+
+        try {
+            $share = $this->createShareObject($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
+        }
+
+        return $share;
+    }
+
+    /**
+     * remove share from table
+     *
+     * @param string $shareId
+     */
+    protected function removeShareFromTable($shareId) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)));
+        $qb->execute();
+    }
+
+    /**
+     * Create a share object from an database row
+     *
+     * @param array $data
+     * @return IShare
+     * @throws InvalidShare
+     * @throws ShareNotFound
+     */
+    protected function createShareObject($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'])
+            ->setMailSend((bool)$data['mail_send'])
+            ->setToken($data['token']);
+
+        $shareTime = new \DateTime();
+        $shareTime->setTimestamp((int)$data['stime']);
+        $share->setShareTime($shareTime);
+        $share->setSharedWith($data['share_with']);
+        $share->setPassword($data['password']);
+
+        if ($data['uid_initiator'] !== null) {
+            $share->setShareOwner($data['uid_owner']);
+            $share->setSharedBy($data['uid_initiator']);
+        } else {
+            //OLD SHARE
+            $share->setSharedBy($data['uid_owner']);
+            $path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
+
+            $owner = $path->getOwner();
+            $share->setShareOwner($owner->getUID());
+        }
+
+        if ($data['expiration'] !== null) {
+            $expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
+            if ($expiration !== false) {
+                $share->setExpirationDate($expiration);
+            }
+        }
+
+        $share->setNodeId((int)$data['file_source']);
+        $share->setNodeType($data['item_type']);
+
+        $share->setProviderId($this->identifier());
+
+        return $share;
+    }
+
+    /**
+     * Get the node with file $id for $user
+     *
+     * @param string $userId
+     * @param int $id
+     * @return \OCP\Files\File|\OCP\Files\Folder
+     * @throws InvalidShare
+     */
+    private function getNode($userId, $id) {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($userId);
+        } catch (NotFoundException $e) {
+            throw new InvalidShare();
+        }
+
+        $nodes = $userFolder->getById($id);
+
+        if (empty($nodes)) {
+            throw new InvalidShare();
+        }
+
+        return $nodes[0];
+    }
+
+    /**
+     * 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->dbConnection->getQueryBuilder();
+
+        $qb->delete('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
+            ->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)))
+            ->execute();
+    }
+
+    /**
+     * This provider does not support group shares
+     *
+     * @param string $gid
+     */
+    public function groupDeleted($gid) {
+        return;
+    }
+
+    /**
+     * This provider does not support group shares
+     *
+     * @param string $uid
+     * @param string $gid
+     */
+    public function userDeletedFromGroup($uid, $gid) {
+        return;
+    }
+
+    /**
+     * get database row of a give share
+     *
+     * @param $id
+     * @return array
+     * @throws ShareNotFound
+     */
+    protected function getRawShare($id) {
+
+        // Now fetch the inserted share and create a complete share object
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound;
+        }
+
+        return $data;
+    }
+
+    public function getSharesInFolder($userId, Folder $node, $reshares) {
+        $qb = $this->dbConnection->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'))
+            ))
+            ->andWhere(
+                $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL))
+            );
+
+        /**
+         * 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', '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->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
 
 }

apps/sharebymail/lib/Settings/Admin.php

Indentation +30 added lines, -30 removed lines

@@ -27,41 +27,41 @@
 
 class Admin implements ISettings {
 
-	/** @var SettingsManager */
-	private $settingsManager;
+    /** @var SettingsManager */
+    private $settingsManager;
 
-	public function __construct(SettingsManager $settingsManager) {
-		$this->settingsManager = $settingsManager;
-	}
+    public function __construct(SettingsManager $settingsManager) {
+        $this->settingsManager = $settingsManager;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
 
-		$parameters = [
-			'sendPasswordMail' => $this->settingsManager->sendPasswordByMail()
-		];
+        $parameters = [
+            'sendPasswordMail' => $this->settingsManager->sendPasswordByMail()
+        ];
 
-		return new TemplateResponse('sharebymail', 'settings-admin', $parameters, '');
-	}
+        return new TemplateResponse('sharebymail', 'settings-admin', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'sharing';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'sharing';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 40;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 40;
+    }
 
 }

apps/sharebymail/lib/Settings/SettingsManager.php

Indentation +18 added lines, -18 removed lines

@@ -27,23 +27,23 @@
 
 class SettingsManager {
 
-	/** @var IConfig */
-	private $config;
-
-	private $defaultSetting = 'yes';
-
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
-
-	/**
-	 * should the password for a mail share be send to the recipient
-	 *
-	 * @return bool
-	 */
-	public function sendPasswordByMail() {
-		$sendPasswordByMail = $this->config->getAppValue('sharebymail', 'sendpasswordmail', $this->defaultSetting);
-		return $sendPasswordByMail === 'yes';
-	}
+    /** @var IConfig */
+    private $config;
+
+    private $defaultSetting = 'yes';
+
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
+
+    /**
+     * should the password for a mail share be send to the recipient
+     *
+     * @return bool
+     */
+    public function sendPasswordByMail() {
+        $sendPasswordByMail = $this->config->getAppValue('sharebymail', 'sendpasswordmail', $this->defaultSetting);
+        return $sendPasswordByMail === 'yes';
+    }
 
 }

apps/sharebymail/templates/settings-admin.php

Braces +4 added lines, -1 removed lines

@@ -10,7 +10,10 @@
 	<em><?php p($l->t('Send a personalized link to a file or folder by mail.')); ?></em>
 
 	<p>
-		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) p('checked'); ?> />
+		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) {
+    p('checked');
+}
+?> />
 		<label for="sendPasswordMail"><?php p($l->t('Send password by mail')); ?></label>
 	</p>
 

lib/private/Share20/DefaultShareProvider.php

Indentation +990 added lines, -990 removed lines

@@ -47,1027 +47,1027 @@
  */
 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;
-
-	/**
-	 * DefaultShareProvider constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IRootFolder $rootFolder
-	 */
-	public function __construct(
-			IDBConnection $connection,
-			IUserManager $userManager,
-			IGroupManager $groupManager,
-			IRootFolder $rootFolder) {
-		$this->dbConn = $connection;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->rootFolder = $rootFolder;
-	}
-
-	/**
-	 * 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 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()));
-			}
-
-			//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();
-		}
-
-		$share = $this->createShare($data);
-		return $share;
-	}
-
-	/**
-	 * Update a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare The share object
-	 */
-	public function update(\OCP\Share\IShare $share) {
-		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;
+
+    /**
+     * DefaultShareProvider constructor.
+     *
+     * @param IDBConnection $connection
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IRootFolder $rootFolder
+     */
+    public function __construct(
+            IDBConnection $connection,
+            IUserManager $userManager,
+            IGroupManager $groupManager,
+            IRootFolder $rootFolder) {
+        $this->dbConn = $connection;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->rootFolder = $rootFolder;
+    }
+
+    /**
+     * 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 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()));
+            }
+
+            //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();
+        }
+
+        $share = $this->createShare($data);
+        return $share;
+    }
+
+    /**
+     * Update a share
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare The share object
+     */
+    public function update(\OCP\Share\IShare $share) {
+        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))
-				->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))
-				->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))
+                ->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))
+                ->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))
-				->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))
+                ->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('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))
-				->execute();
-		}
-
-		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('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))
+                ->execute();
+        }
+
+        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->getNode() instanceof \OCP\Files\File ? 'file' : 'folder';
-
-				//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->getNode()->getId()),
-						'file_source' => $qb->createNamedParameter($share->getNode()->getId()),
-						'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
-	 */
-	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->getNode() instanceof File ? 'file' : 'folder'),
-						'item_source' => $qb->createNamedParameter($share->getNode()->getId()),
-						'file_source' => $qb->createNamedParameter($share->getNode()->getId()),
-						'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', '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_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->getNode() instanceof \OCP\Files\File ? 'file' : 'folder';
+
+                //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->getNode()->getId()),
+                        'file_source' => $qb->createNamedParameter($share->getNode()->getId()),
+                        '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
+     */
+    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->getNode() instanceof File ? 'file' : 'folder'),
+                        'item_source' => $qb->createNamedParameter($share->getNode()->getId()),
+                        'file_source' => $qb->createNamedParameter($share->getNode()->getId()),
+                        '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', '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_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'])
-			->setMailSend((bool)$data['mail_send']);
-
-		$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->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());
-
-		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']);
-			}
-
-			$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'])
+            ->setMailSend((bool)$data['mail_send']);
+
+        $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->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());
+
+        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']);
+            }
+
+            $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();
-			}
-		}
-	}
+                $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();
+            }
+        }
+    }
 }