mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2542 from nextcloud/followup-2516-undefined-provider 

Make sure $provider is defined when we use it
This commit is contained in:
Lukas Reschke 2016-12-07 10:34:19 +01:00 committed by GitHub
parent ea801d7d7c 815d349afe
commit 4bfd4bdd2d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/private/Share20/Manager.php
View File

@ -486,6 +486,7 @@ class Manager implements IManager {
if (method_exists($share, 'setParent')) {
$storage = $share->getNode()->getStorage();
if ($storage->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
/** @var \OCA\Files_Sharing\SharedStorage $storage */
$share->setParent($storage->getShareId());
}
};
@ -1040,6 +1041,7 @@ class Manager implements IManager {
* @return Share[]
*/
public function getSharesByPath(\OCP\Files\Node $path, $page=0, $perPage=50) {
return [];
}
/**
@ -1051,27 +1053,22 @@ class Manager implements IManager {
* @throws ShareNotFound
*/
public function getShareByToken($token) {
$share = null;
try {
$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_LINK);
$share = $provider->getShareByToken($token);
} catch (ProviderException $e) {
} catch (ShareNotFound $e) {
}
try {
$share = $provider->getShareByToken($token);
} catch (ShareNotFound $e) {
$share = null;
}
// If it is not a link share try to fetch a federated share by token
if ($share === null) {
try {
$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_REMOTE);
} catch (ProviderException $e) {
}
try {
$share = $provider->getShareByToken($token);
} catch (ProviderException $e) {
} catch (ShareNotFound $e) {
$share = null;
}
}
@ -1079,9 +1076,14 @@ class Manager implements IManager {
if ($share === null && $this->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
try {
$provider = $this->factory->getProviderForType(\OCP\Share::SHARE_TYPE_EMAIL);
} catch (ProviderException $e) {
}
$share = $provider->getShareByToken($token);
} catch (ProviderException $e) {
} catch (ShareNotFound $e) {
}
}
if ($share === null) {
throw new ShareNotFound();
}
if ($share->getExpirationDate() !== null &&