Skip to content

Fix Decrypt message via occ #24992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 3 commits into from
Jun 8, 2016
Merged

Fix Decrypt message via occ #24992

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaeb5d6
Fix Decrypt message via occ
davitol Jun 6, 2016
f9b3865
Comments fixed
davitol Jun 6, 2016
67c9e59
Fixed reviews
SergioBertolinSG Jun 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion core/Command/Encryption/DecryptAll.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,16 @@ protected function execute(InputInterface $input, OutputInterface $output) {
return;
}

$uid = $input->getArgument('user');
//FIXME WHEN https://github.com/owncloud/core/issues/24994 is fixed
if ($uid === null) {
$message = 'your ownCloud';
} else {
$message = "$uid's account";
}

$output->writeln("\n");
$output->writeln('You are about to start to decrypt all files stored in your ownCloud.');
$output->writeln("You are about to start to decrypt all files stored in $message.");
Copy link
Contributor

@nickvergessen nickvergessen Jun 6, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

string concatenation is bad for translating

Copy link
Contributor

@nickvergessen nickvergessen Jun 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah we dont translate occ stuff, right

$output->writeln('It will depend on the encryption module and your setup if this is possible.');
$output->writeln('Depending on the number and size of your files this can take some time');
$output->writeln('Please make sure that no user access his files during this process!');
Expand All @@ -140,6 +148,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
$result = $this->decryptAll->decryptAll($input, $output, $user);
if ($result === false) {
$output->writeln(' aborted.');
$output->writeln('Server side encryption remains enabled');
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
}
$this->resetSingleUserAndTrashbin();
Expand Down