upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Set share owner and share initiator on upate as well

Browse source
This commit is contained in:
Thomas Müller 2016-02-08 16:18:15 +01:00
parent cbb7934fb3
commit 10b9bf15f4
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/federatedfilesharing/lib/federatedshareprovider.php
View file

@ -220,6 +220,8 @@ class FederatedShareProvider implements IShareProvider {
$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()))
->execute();
return $share;

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

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

8
apps/files/command/transferownership.php
View file

@ -25,7 +25,6 @@ use OC\Files\Filesystem;
use OC\Files\View;
use OCP\Files\FileInfo;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\IUserManager;
use OCP\Share\IManager;
use OCP\Share\IShare;
@ -61,13 +60,9 @@ class TransferOwnership extends Command {
/** @var string */
private $finalTarget;
/** @var IRootFolder */
private $rootFolder;
public function __construct(IUserManager $userManager, IManager $shareManager, IRootFolder $rootFolder) {
public function __construct(IUserManager $userManager, IManager $shareManager) {
$this->userManager = $userManager;
$this->shareManager = $shareManager;
$this->rootFolder = $rootFolder;
parent::__construct();
}
@ -208,7 +203,6 @@ class TransferOwnership extends Command {
private function restoreShares(OutputInterface $output) {
$output->writeln("Restoring shares ...");
$progress = new ProgressBar($output, count($this->shares));
/** @var Folder $sourceRoot */
foreach($this->shares as $share) {
if ($share->getSharedWith() === $this->destinationUser) {