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/altmailpassword.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 ?>
 
 	--
-<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
+<?php p($theme->getName().' - '.$theme->getSlogan()); ?>
 <?php print_unescaped("\n".$theme->getBaseUrl());

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>

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 	<tr><td>
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
 				<tr>
-					<td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor());?>">
+					<td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor()); ?>">
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 					</td>
 				</tr>
@@ -27,7 +27,7 @@ 
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
 						<?php p($theme->getName()); ?> -
 						<?php p($theme->getSlogan()); ?>
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
 					</td>
 				</tr>
 				<tr>

apps/files_sharing/lib/Controller/ShareAPIController.php

Spacing +9 added lines, -9 removed lines

@@ -216,7 +216,7 @@ 
 		// FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
 		$result = \OC::$server->getContactsManager()->search($query, [$property]);
 		foreach ($result as $r) {
-			foreach($r[$property] as $value) {
+			foreach ($r[$property] as $value) {
 				if ($value === $query) {
 					return $r['FN'];
 				}
@@ -494,7 +494,7 @@ 
 
 		$shares = array_merge($userShares, $groupShares, $circleShares);
 
-		$shares = array_filter($shares, function (IShare $share) {
+		$shares = array_filter($shares, function(IShare $share) {
 			return $share->getShareOwner() !== $this->currentUser;
 		});
 
@@ -529,7 +529,7 @@ 
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $node, false, -1, 0));
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $node, false, -1, 0));
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_LINK, $node, false, -1, 0));
-			if($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
+			if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
 				$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_EMAIL, $node, false, -1, 0));
 			}
 			if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
@@ -685,7 +685,7 @@ 
 			}
 
 			if ($permissions !== null) {
-				$newPermissions = (int)$permissions;
+				$newPermissions = (int) $permissions;
 			}
 
 			if ($newPermissions !== null &&
@@ -742,7 +742,7 @@ 
 
 		} else {
 			if ($permissions !== null) {
-				$permissions = (int)$permissions;
+				$permissions = (int) $permissions;
 				$share->setPermissions($permissions);
 			}
 
@@ -874,7 +874,7 @@ 
 
 		// First check if it is an internal share.
 		try {
-			$share = $this->shareManager->getShareById('ocinternal:' . $id);
+			$share = $this->shareManager->getShareById('ocinternal:'.$id);
 			return $share;
 		} catch (ShareNotFound $e) {
 			// Do nothing, just try the other share type
@@ -883,7 +883,7 @@ 
 
 		try {
 			if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_CIRCLE)) {
-				$share = $this->shareManager->getShareById('ocCircleShare:' . $id);
+				$share = $this->shareManager->getShareById('ocCircleShare:'.$id);
 				return $share;
 			}
 		} catch (ShareNotFound $e) {
@@ -892,7 +892,7 @@ 
 
 		try {
 			if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
-				$share = $this->shareManager->getShareById('ocMailShare:' . $id);
+				$share = $this->shareManager->getShareById('ocMailShare:'.$id);
 				return $share;
 			}
 		} catch (ShareNotFound $e) {
@@ -902,7 +902,7 @@ 
 		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
 			throw new ShareNotFound();
 		}
-		$share = $this->shareManager->getShareById('ocFederatedSharing:' . $id);
+		$share = $this->shareManager->getShareById('ocFederatedSharing:'.$id);
 
 		return $share;
 	}

Indentation +866 added lines, -866 removed lines

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

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;
+        }
+
+    }
 
 }

apps/sharebymail/lib/ShareByMailProvider.php

Doc Comments +13 added lines, -4 removed lines

@@ -193,10 +193,10 @@ 
 	 * publish activity if a file/folder was shared by mail
 	 *
 	 * @param $subject
-	 * @param $parameters
-	 * @param $affectedUser
+	 * @param string[] $parameters
+	 * @param string $affectedUser
 	 * @param $fileId
-	 * @param $filePath
+	 * @param string $filePath
 	 */
 	protected function publishActivity($subject, $parameters, $affectedUser, $fileId, $filePath) {
 		$event = $this->activityManager->generateEvent();
@@ -248,6 +248,12 @@ 
 
 	}
 
+	/**
+	 * @param string $link
+	 * @param string $owner
+	 * @param string $initiator
+	 * @param string $shareWith
+	 */
 	protected function sendMailNotification($filename, $link, $owner, $initiator, $shareWith) {
 		$ownerUser = $this->userManager->get($owner);
 		$initiatorUser = $this->userManager->get($initiator);
@@ -277,6 +283,7 @@ 
 	 * @param $link
 	 * @param $owner
 	 * @param $initiator
+	 * @param string $template
 	 * @return string plain text mail
 	 * @throws HintException
 	 */
@@ -304,6 +311,7 @@ 
 	 * @param string $filename
 	 * @param string $initiator
 	 * @param string $shareWith
+	 * @param string $password
 	 */
 	protected function sendPassword($filename, $initiator, $shareWith, $password) {
 
@@ -332,6 +340,7 @@ 
 	 * @param string $filename
 	 * @param string $initiator
 	 * @param string $password
+	 * @param string $template
 	 * @return string plain text mail
 	 * @throws HintException
 	 */
@@ -790,7 +799,7 @@ 
 	/**
 	 * get database row of a give share
 	 *
-	 * @param $id
+	 * @param integer $id
 	 * @return array
 	 * @throws ShareNotFound
 	 */

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', [$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', [$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;
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -234,11 +234,11 @@ 
 				$share->getShareOwner(),
 				$share->getSharedBy(), $share->getSharedWith());
 		} catch (HintException $hintException) {
-			$this->logger->error('Failed to send share by mail: ' . $hintException->getMessage());
+			$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->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'));
@@ -254,9 +254,9 @@ 
 		$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));
+			$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));
+			$subject = (string) $this->l->t('%s shared »%s« with you on behalf of %s', array($ownerDisplayName, $filename, $initiatorDisplayName));
 		}
 
 		$message = $this->mailer->createMessage();
@@ -283,11 +283,11 @@ 
 	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);
+		$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)) {
@@ -313,11 +313,11 @@ 
 
 		$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', [$filename, $initiatorDisplayName]);
+		$subject = (string) $this->l->t('Password to access »%s« shared to you by %s', [$filename, $initiatorDisplayName]);
 
 		$message = $this->mailer->createMessage();
 		$htmlBody = $this->createMailBodyToSendPassword('mailpassword', $filename, $initiatorDisplayName, $password);
-		$textBody = $this->createMailBodyToSendPassword('altmailpassword', $filename,$initiatorDisplayName, $password);
+		$textBody = $this->createMailBodyToSendPassword('altmailpassword', $filename, $initiatorDisplayName, $password);
 		$message->setTo([$shareWith]);
 		$message->setSubject($subject);
 		$message->setBody($textBody, 'text/plain');
@@ -338,9 +338,9 @@ 
 	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));
+		$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)) {
@@ -359,7 +359,7 @@ 
 	 */
 	protected function generateToken() {
 		$token = $this->secureRandom->generate(
-			15, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+			15, ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
 		return $token;
 	}
 
@@ -380,7 +380,7 @@ 
 			->orderBy('id');
 
 		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$children[] = $this->createShareObject($data);
 		}
 		$cursor->closeCursor();
@@ -423,7 +423,7 @@ 
 		$qb->execute();
 		$id = $qb->getLastInsertId();
 
-		return (int)$id;
+		return (int) $id;
 	}
 
 	/**
@@ -440,7 +440,7 @@ 
 		// a real password was given
 		$validPassword = $plainTextPassword !== null && $plainTextPassword !== '';
 
-		if($validPassword && $originalShare->getPassword() !== $share->getPassword()) {
+		if ($validPassword && $originalShare->getPassword() !== $share->getPassword()) {
 			$this->sendPassword($share->getNode()->getName(), $share->getSharedBy(), $share->getSharedWith(), $plainTextPassword);
 		}
 		/*
@@ -534,7 +534,7 @@ 
 
 		$cursor = $qb->execute();
 		$shares = [];
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$shares[] = $this->createShareObject($data);
 		}
 		$cursor->closeCursor();
@@ -586,7 +586,7 @@ 
 			->execute();
 
 		$shares = [];
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$shares[] = $this->createShareObject($data);
 		}
 		$cursor->closeCursor();
@@ -625,7 +625,7 @@ 
 
 		$cursor = $qb->execute();
 
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$shares[] = $this->createShareObject($data);
 		}
 		$cursor->closeCursor();
@@ -688,15 +688,15 @@ 
 	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'])
+		$share->setId((int) $data['id'])
+			->setShareType((int) $data['share_type'])
+			->setPermissions((int) $data['permissions'])
 			->setTarget($data['file_target'])
-			->setMailSend((bool)$data['mail_send'])
+			->setMailSend((bool) $data['mail_send'])
 			->setToken($data['token']);
 
 		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
+		$shareTime->setTimestamp((int) $data['stime']);
 		$share->setShareTime($shareTime);
 		$share->setSharedWith($data['share_with']);
 		$share->setPassword($data['password']);
@@ -707,7 +707,7 @@ 
 		} else {
 			//OLD SHARE
 			$share->setSharedBy($data['uid_owner']);
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
+			$path = $this->getNode($share->getSharedBy(), (int) $data['file_source']);
 
 			$owner = $path->getOwner();
 			$share->setShareOwner($owner->getUID());
@@ -720,7 +720,7 @@ 
 			}
 		}
 
-		$share->setNodeId((int)$data['file_source']);
+		$share->setNodeId((int) $data['file_source']);
 		$share->setNodeType($data['item_type']);
 
 		$share->setProviderId($this->identifier());
@@ -839,7 +839,7 @@ 
 			);
 		}
 
-		$qb->innerJoin('s', 'filecache' ,'f', 's.file_source = f.fileid');
+		$qb->innerJoin('s', 'filecache', 'f', 's.file_source = f.fileid');
 		$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
 
 		$qb->orderBy('id');

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/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';
+    }
 
 }