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

[sharing] handle shares of users that aren't available anymore 

* properly handle the case where an abandoned share is left and
  simply skip it
This commit is contained in:
Morris Jobke 2015-06-23 17:09:00 +02:00
parent cce841c665
commit 4f2f8a6f28
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/files_sharing/lib/mountprovider.php
View File

@ -9,6 +9,7 @@
namespace OCA\Files_Sharing;
use OC\Files\Filesystem;
use OC\User\NoUserException;
use OCA\Files_Sharing\Propagation\PropagationManager;
use OCP\Files\Config\IMountProvider;
use OCP\Files\Storage\IStorageFactory;
@ -50,8 +51,13 @@ class MountProvider implements IMountProvider {
$shares = array_filter($shares, function ($share) {
return $share['permissions'] > 0;
});
return array_map(function ($share) use ($user, $storageFactory) {
Filesystem::initMountPoints($share['uid_owner']);
$shares = array_map(function ($share) use ($user, $storageFactory) {
try {
Filesystem::initMountPoints($share['uid_owner']);
} catch(NoUserException $e) {
\OC::$server->getLogger()->warning('The user \'' . $share['uid_owner'] . '\' of share with ID \'' . $share['id'] . '\' can\'t be retrieved.', array('app' => 'files_sharing'));
return null;
}
// for updating etags for the share owner when we make changes to this share.
$ownerPropagator = $this->propagationManager->getChangePropagator($share['uid_owner']);
@ -68,5 +74,7 @@ class MountProvider implements IMountProvider {
$storageFactory
);
}, $shares);
// array_filter removes the null values from the array
return array_filter($shares);
}
}

1
lib/private/files/filesystem.php
View File

@ -365,6 +365,7 @@ class Filesystem {
* Initialize system and personal mount points for a user
*
* @param string $user
* @throws \OC\User\NoUserException if the user is not available
*/
public static function initMountPoints($user = '') {
if ($user == '') {