Merge pull request #56664 from cristianscheid/feat/54790/transfer-ownership-use-user-id

feat(files): add --use-user-id option to transfer-ownership command

Author: sorbaugh

apps/files/lib/Command/TransferOwnership.php

@@ -76,6 +76,12 @@ protected function configure(): void {
 				null,
 				InputOption::VALUE_NONE,
 				'don\'t ask for confirmation for transferring external storages',
+			)
+			->addOption(
+				'use-user-id',
+				null,
+				InputOption::VALUE_NONE,
+				'use user ID instead of display name in the transferred folder name',
 			);
 	}
 
@@ -137,6 +143,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$input->getOption('move') === true,
 				false,
 				$includeExternalStorage,
+				$input->getOption('use-user-id') === true,
 			);
 		} catch (TransferOwnershipException $e) {
 			$output->writeln('<error>' . $e->getMessage() . '</error>');

apps/files/lib/Service/OwnershipTransferService.php

@@ -73,6 +73,7 @@ public function transfer(
 		bool $move = false,
 		bool $firstLogin = false,
 		bool $includeExternalStorage = false,
+		bool $useUserId = false,
 	): void {
 		$output = $output ?? new NullOutput();
 		$sourceUid = $sourceUser->getUID();
@@ -104,7 +105,15 @@ public function transfer(
 			$l = $this->l10nFactory->get('files', $this->l10nFactory->getUserLanguage($destinationUser));
 			$date = date('Y-m-d H-i-s');
 
-			$cleanUserName = $this->sanitizeFolderName($sourceUser->getDisplayName()) ?: $sourceUid;
+			if ($useUserId) {
+				$cleanUserName = $sourceUid;
+			} else {
+				$cleanUserName = $this->sanitizeFolderName($sourceUser->getDisplayName());
+				if ($cleanUserName === '') {
+					$cleanUserName = $sourceUid;
+				}
+			}
+
 			$finalTarget = "$destinationUid/files/" . $this->sanitizeFolderName($l->t('Transferred from %1$s on %2$s', [$cleanUserName, $date]));
 			try {
 				$view->verifyPath(dirname($finalTarget), basename($finalTarget));