Make ResetAdminPass to ResetPassword

core/command/resetadminpass.php → core/command/resetpassword.php

@@ -13,24 +13,40 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class ResetAdminPass extends Command {
+class ResetPassword extends Command {
 	protected function configure() {
 		$this
-			->setName('resetadminpass')
-			->setDescription('Resets the password of the first user')
+			->setName('resetpassword')
+			->setDescription('Resets the password of the named user')
 			->addArgument(
-				'password',
+				'user',
 				InputArgument::REQUIRED,
-				'Password to reset to'
+				'Username to reset password'
 			);
 		;
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		$password = $input->getArgument('password');
-		$query = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` LIMIT 1');
-		$username = $query->execute()->fetchOne();
-		\OC_User::setPassword($username, $password);
-		$output->writeln("Successfully reset password for " . $username . " to " . $password);
+		$username = $input->getArgument('user');
+		if ($input->isInteractive()) {
+			$dialog = $this->getHelperSet()->get('dialog');
+			$password = $dialog->askHiddenResponse(
+				$output,
+				'<question>Enter a new password: </question>',
+				false
+			);
+			$dialog = $this->getHelperSet()->get('dialog');
+			$confirm = $dialog->askHiddenResponse(
+				$output,
+                                '<question>Confirm the new password: </question>',
+				false
+			);
+		}
+		if ($password === $confirm) {
+			\OC_User::setPassword($username, $password);
+			$output->writeln("Successfully reset password for " . $username);
+		} else {
+			$output->writeln("Passwords did not match!");
+		}
 	}
 }

core/register_command.php

@@ -10,7 +10,7 @@
 $application->add(new OC\Core\Command\Status);
 $application->add(new OC\Core\Command\Db\GenerateChangeScript());
 $application->add(new OC\Core\Command\Upgrade());
-$application->add(new OC\Core\Command\ResetAdminPass());
+$application->add(new OC\Core\Command\ResetPassword());
 $application->add(new OC\Core\Command\Maintenance\SingleUser());
 $application->add(new OC\Core\Command\App\Disable());
 $application->add(new OC\Core\Command\App\Enable());