diff options
author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-07-01 12:30:39 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-01 12:30:39 +0300 |
commit | 4ac256ea6cd14f531dad0841ce7a9c5f5ffdeb51 (patch) | |
tree | ac79e6d294c44e0cbfc4a96001c87fb240f1ff15 /core | |
parent | 4a4103b92375b191700b9e0f52fe363d3fe989ff (diff) |
[stable9] Fix decrypt message stable9 (#25188)
* Fix Decrypt message via occ
* Comments fixed
* Fixed reviews
* Originally:
commit 2304e4bda027e61ff1302c55c2f70f8e4c8f47d0
Author: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue Jun 7 09:13:11 2016 +0200
Allow to decrypt user '0' files only
* Fix uid comparison
Diffstat (limited to 'core')
-rw-r--r-- | core/command/encryption/decryptall.php | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/core/command/encryption/decryptall.php b/core/command/encryption/decryptall.php index 0a126db5b17..83c6c1dc168 100644 --- a/core/command/encryption/decryptall.php +++ b/core/command/encryption/decryptall.php @@ -1,6 +1,6 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @author Björn Schießle <bjoern@schiessle.org> * @author Joas Schilling <nickvergessen@owncloud.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. @@ -111,7 +111,8 @@ class DecryptAll extends Command { $this->addArgument( 'user', InputArgument::OPTIONAL, - 'user for which you want to decrypt all files (optional)' + 'user for which you want to decrypt all files (optional)', + '' ); } @@ -127,8 +128,15 @@ class DecryptAll extends Command { return; } + $uid = $input->getArgument('user'); + if ($uid === '') { + $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."); $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!'); @@ -140,6 +148,7 @@ class DecryptAll extends Command { $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(); |