upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

Uses early returns.

Browse source 
To improve code readability.

Signed-off-by: Faraz Samapoor <fsa@adlas.at>
This commit is contained in:
Faraz Samapoor 2023-08-03 14:50:33 +03:30 committed by John Molakvoæ
parent fc8b886295
commit 6b795da540
3 changed files with 44 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/encryption/lib/Command/DisableMasterKey.php
View file

@ -33,21 +33,23 @@ class DisableMasterKey extends Command {
if (!$isMasterKeyEnabled) {
$output->writeln('Master key already disabled');
} else {
$question = new ConfirmationQuestion(
'Warning: Only perform this operation for a fresh installations with no existing encrypted data! '
. 'There is no way to enable the master key again. '
. 'We strongly recommend to keep the master key, it provides significant performance improvements '
. 'and is easier to handle for both, users and administrators. '
. 'Do you really want to switch to per-user keys? (y/n) ', false);
if ($this->questionHelper->ask($input, $output, $question)) {
$this->config->setAppValue('encryption', 'useMasterKey', '0');
$output->writeln('Master key successfully disabled.');
} else {
$output->writeln('aborted.');
return self::FAILURE;
}
return self::SUCCESS;
}
return self::SUCCESS;
$question = new ConfirmationQuestion(
'Warning: Only perform this operation for a fresh installations with no existing encrypted data! '
. 'There is no way to enable the master key again. '
. 'We strongly recommend to keep the master key, it provides significant performance improvements '
. 'and is easier to handle for both, users and administrators. '
. 'Do you really want to switch to per-user keys? (y/n) ', false);
if ($this->questionHelper->ask($input, $output, $question)) {
$this->config->setAppValue('encryption', 'useMasterKey', '0');
$output->writeln('Master key successfully disabled.');
return self::SUCCESS;
}
$output->writeln('aborted.');
return self::FAILURE;
}
}

26
apps/encryption/lib/Command/EnableMasterKey.php
View file

@ -35,18 +35,20 @@ class EnableMasterKey extends Command {
if ($isAlreadyEnabled) {
$output->writeln('Master key already enabled');
} else {
$question = new ConfirmationQuestion(
'Warning: Only available for fresh installations with no existing encrypted data! '
. 'There is also no way to disable it again. Do you want to continue? (y/n) ', false);
if ($this->questionHelper->ask($input, $output, $question)) {
$this->config->setAppValue('encryption', 'useMasterKey', '1');
$output->writeln('Master key successfully enabled.');
} else {
$output->writeln('aborted.');
return self::FAILURE;
}
return self::SUCCESS;
}
return self::SUCCESS;
$question = new ConfirmationQuestion(
'Warning: Only available for fresh installations with no existing encrypted data! '
. 'There is also no way to disable it again. Do you want to continue? (y/n) ', false);
if ($this->questionHelper->ask($input, $output, $question)) {
$this->config->setAppValue('encryption', 'useMasterKey', '1');
$output->writeln('Master key successfully enabled.');
return self::SUCCESS;
}
$output->writeln('aborted.');
return self::FAILURE;
}
}

24
apps/encryption/lib/Command/FixEncryptedVersion.php
View file

@ -79,6 +79,11 @@ class FixEncryptedVersion extends Command {
$all = $input->getOption('all');
$pathOption = \trim(($input->getOption('path') ?? ''), '/');
if (!$user && !$all) {
$output->writeln("Either a user id or --all needs to be provided");
return self::FAILURE;
}
if ($user) {
if ($all) {
$output->writeln("Specifying a user id and --all are mutually exclusive");
@ -91,18 +96,15 @@ class FixEncryptedVersion extends Command {
}
return $this->runForUser($user, $pathOption, $output);
} elseif ($all) {
$result = 0;
$this->userManager->callForSeenUsers(function (IUser $user) use ($pathOption, $output, &$result) {
$output->writeln("Processing files for " . $user->getUID());
$result = $this->runForUser($user->getUID(), $pathOption, $output);
return $result === 0;
});
return $result;
} else {
$output->writeln("Either a user id or --all needs to be provided");
return self::FAILURE;
}
$result = 0;
$this->userManager->callForSeenUsers(function (IUser $user) use ($pathOption, $output, &$result) {
$output->writeln("Processing files for " . $user->getUID());
$result = $this->runForUser($user->getUID(), $pathOption, $output);
return $result === 0;
});
return $result;
}
private function runForUser(string $user, string $pathOption, OutputInterface $output): int {