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

Merge pull request #1766 from nextcloud/force-uid-casing-on-transfer-ownership 

Make sure the UID is correctly cased
This commit is contained in:
Morris Jobke 2016-10-17 14:29:19 +02:00 committed by GitHub
parent c1b2d90ed8 77a5491d9d
commit 6375790263
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/files/lib/Command/TransferOwnership.php
View File

@ -28,6 +28,7 @@ use OC\Files\Filesystem;
use OC\Files\View; use OC\Files\View;
use OCP\Files\FileInfo; use OCP\Files\FileInfo;
use OCP\Files\Mount\IMountManager; use OCP\Files\Mount\IMountManager;
use OCP\IUser;
use OCP\IUserManager; use OCP\IUserManager;
use OCP\Share\IManager; use OCP\Share\IManager;
use OCP\Share\IShare; use OCP\Share\IShare;
@ -92,15 +93,22 @@ class TransferOwnership extends Command {
protected function execute(InputInterface $input, OutputInterface $output) { protected function execute(InputInterface $input, OutputInterface $output) {
$this->sourceUser = $input->getArgument('source-user'); $this->sourceUser = $input->getArgument('source-user');
$this->destinationUser = $input->getArgument('destination-user'); $this->destinationUser = $input->getArgument('destination-user');
if (!$this->userManager->userExists($this->sourceUser)) { $source = $this->userManager->get($this->sourceUser);
$destination = $this->userManager->get($this->destinationUser);
if (!$source instanceof IUser) {
$output->writeln("<error>Unknown source user $this->sourceUser</error>"); $output->writeln("<error>Unknown source user $this->sourceUser</error>");
return; return;
} }
if (!$this->userManager->userExists($this->destinationUser)) {
if (!$destination instanceof IUser) {
$output->writeln("<error>Unknown destination user $this->destinationUser</error>"); $output->writeln("<error>Unknown destination user $this->destinationUser</error>");
return; return;
} }
$this->sourceUser = $source->getUID();
$this->destinationUser = $destination->getUID();
// target user has to be ready // target user has to be ready
if (!\OC::$server->getEncryptionManager()->isReadyForUser($this->destinationUser)) { if (!\OC::$server->getEncryptionManager()->isReadyForUser($this->destinationUser)) {
$output->writeln("<error>The target user is not ready to accept files. The user has at least to be logged in once.</error>"); $output->writeln("<error>The target user is not ready to accept files. The user has at least to be logged in once.</error>");