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

Merge pull request #23743 from owncloud/issue-23686-files-transferownership-share-unmount 

Unmount the share before deleting it, so we don't try to use it later on
This commit is contained in:
Björn Schießle 2016-04-04 11:11:24 +02:00
parent 62a5952a72 ac330daef2
commit 53c1902706
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/files/appinfo/register_command.php
View File

@ -24,8 +24,9 @@
$dbConnection = \OC::$server->getDatabaseConnection(); $dbConnection = \OC::$server->getDatabaseConnection();
$userManager = OC::$server->getUserManager(); $userManager = OC::$server->getUserManager();
$shareManager = \OC::$server->getShareManager(); $shareManager = \OC::$server->getShareManager();
$mountManager = \OC::$server->getMountManager();
/** @var Symfony\Component\Console\Application $application */ /** @var Symfony\Component\Console\Application $application */
$application->add(new OCA\Files\Command\Scan($userManager)); $application->add(new OCA\Files\Command\Scan($userManager));
$application->add(new OCA\Files\Command\DeleteOrphanedFiles($dbConnection)); $application->add(new OCA\Files\Command\DeleteOrphanedFiles($dbConnection));
$application->add(new OCA\Files\Command\TransferOwnership($userManager, $shareManager)); $application->add(new OCA\Files\Command\TransferOwnership($userManager, $shareManager, $mountManager));

13
apps/files/command/transferownership.php
View File

@ -24,7 +24,7 @@ namespace OCA\Files\Command;
use OC\Files\Filesystem; use OC\Files\Filesystem;
use OC\Files\View; use OC\Files\View;
use OCP\Files\FileInfo; use OCP\Files\FileInfo;
use OCP\Files\Folder; use OCP\Files\Mount\IMountManager;
use OCP\IUserManager; use OCP\IUserManager;
use OCP\Share\IManager; use OCP\Share\IManager;
use OCP\Share\IShare; use OCP\Share\IShare;
@ -42,6 +42,9 @@ class TransferOwnership extends Command {
/** @var IManager */ /** @var IManager */
private $shareManager; private $shareManager;
/** @var IMountManager */
private $mountManager;
/** @var FileInfo[] */ /** @var FileInfo[] */
private $allFiles = []; private $allFiles = [];
@ -60,9 +63,10 @@ class TransferOwnership extends Command {
/** @var string */ /** @var string */
private $finalTarget; private $finalTarget;
public function __construct(IUserManager $userManager, IManager $shareManager) { public function __construct(IUserManager $userManager, IManager $shareManager, IMountManager $mountManager) {
$this->userManager = $userManager; $this->userManager = $userManager;
$this->shareManager = $shareManager; $this->shareManager = $shareManager;
$this->mountManager = $mountManager;
parent::__construct(); parent::__construct();
} }
@ -206,6 +210,11 @@ class TransferOwnership extends Command {
foreach($this->shares as $share) { foreach($this->shares as $share) {
if ($share->getSharedWith() === $this->destinationUser) { if ($share->getSharedWith() === $this->destinationUser) {
// Unmount the shares before deleting, so we don't try to get the storage later on.
$shareMountPoint = $this->mountManager->find('/' . $this->destinationUser . '/files' . $share->getTarget());
if ($shareMountPoint) {
$this->mountManager->removeMount($shareMountPoint->getMountPoint());
}
$this->shareManager->deleteShare($share); $this->shareManager->deleteShare($share);
} else { } else {
if ($share->getShareOwner() === $this->sourceUser) { if ($share->getShareOwner() === $this->sourceUser) {