From f75c863257e32b19e7e18be5019a983ac5df8232 Mon Sep 17 00:00:00 2001 From: kondou Date: Tue, 13 May 2014 15:56:25 +0200 Subject: [PATCH] Add doc, check return-value, fix spacing, require interactive --- core/command/resetpassword.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/core/command/resetpassword.php b/core/command/resetpassword.php index 1dca7c5ee8..1580bdffa5 100644 --- a/core/command/resetpassword.php +++ b/core/command/resetpassword.php @@ -29,24 +29,33 @@ class ResetPassword extends Command { protected function execute(InputInterface $input, OutputInterface $output) { $username = $input->getArgument('user'); if ($input->isInteractive()) { + /** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */ $dialog = $this->getHelperSet()->get('dialog'); $password = $dialog->askHiddenResponse( $output, 'Enter a new password: ', false ); + /** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */ $dialog = $this->getHelperSet()->get('dialog'); $confirm = $dialog->askHiddenResponse( $output, - 'Confirm the new password: ', + 'Confirm the new password: ', false ); - } - if ($password === $confirm) { - \OC_User::setPassword($username, $password); - $output->writeln("Successfully reset password for " . $username); + + if ($password === $confirm) { + $success = \OC_User::setPassword($username, $password); + if ($success) { + $output->writeln("Successfully reset password for " . $username); + } else { + $output->writeln("There is no user called " . $username); + } + } else { + $output->writeln("Passwords did not match!"); + } } else { - $output->writeln("Passwords did not match!"); + $output->writeln("Interactive input is needed for entering a new password!"); } } }