hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 05:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix wording

Browse Source
This commit is contained in:
aynsix
2020-03-04 10:58:43 +03:00
parent b83e5500f0
commit 87d6ea0eb3
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Alchemy/Phrasea/Command/User/UserPasswordCommand.php
View File

@@ -39,7 +39,7 @@ class UserPasswordCommand extends Command
->addOption('send_renewal_email', null, InputOption::VALUE_NONE, 'Send email link to user for password renewing, work only if --password or --generate are not define') ->addOption('send_renewal_email', null, InputOption::VALUE_NONE, 'Send email link to user for password renewing, work only if --password or --generate are not define')
->addOption('password_hash', null, InputOption::VALUE_OPTIONAL, 'Define a password hashed, work only with password_nonce') ->addOption('password_hash', null, InputOption::VALUE_OPTIONAL, 'Define a password hashed, work only with password_nonce')
->addOption('password_nonce', null, InputOption::VALUE_OPTIONAL, 'Define a password nonce, work only with password_hash') ->addOption('password_nonce', null, InputOption::VALUE_OPTIONAL, 'Define a password nonce, work only with password_hash')
->addOption('get_hash', null, InputOption::VALUE_NONE, 'Return the password hashed and nonce') ->addOption('dump', null, InputOption::VALUE_NONE, 'Return the password hashed and nonce')
->addOption('jsonformat', null, InputOption::VALUE_NONE, 'Output in json format') ->addOption('jsonformat', null, InputOption::VALUE_NONE, 'Output in json format')
->addOption('yes', 'y', InputOption::VALUE_NONE, 'Answer yes to all questions') ->addOption('yes', 'y', InputOption::VALUE_NONE, 'Answer yes to all questions')
@@ -58,7 +58,7 @@ class UserPasswordCommand extends Command
$password = $input->getOption('password'); $password = $input->getOption('password');
$generate = $input->getOption('generate'); $generate = $input->getOption('generate');
$sendRenewalEmail = $input->getOption('send_renewal_email'); $sendRenewalEmail = $input->getOption('send_renewal_email');
$getHash = $input->getOption('get_hash'); $dump = $input->getOption('dump');
$passwordHash = $input->getOption('password_hash'); $passwordHash = $input->getOption('password_hash');
$passwordNonce = $input->getOption('password_nonce'); $passwordNonce = $input->getOption('password_nonce');
$jsonformat = $input->getOption('jsonformat'); $jsonformat = $input->getOption('jsonformat');
@@ -80,7 +80,7 @@ class UserPasswordCommand extends Command
return 0; return 0;
} }
if ($getHash) { if ($dump) {
$oldHash = $user->getPassword(); $oldHash = $user->getPassword();
$oldNonce = $user->getNonce(); $oldNonce = $user->getNonce();
} }
@@ -96,7 +96,7 @@ class UserPasswordCommand extends Command
$output->writeln('<info>email link sended for password renewing!</info>'); $output->writeln('<info>email link sended for password renewing!</info>');
return 0; return 0;
} elseif (!$password && !$sendRenewalEmail && ! $getHash) { } elseif (!$password && !$sendRenewalEmail && ! $dump) {
$output->writeln('<error>choose one option to set a password!</error>'); $output->writeln('<error>choose one option to set a password!</error>');
return 0; return 0;
@@ -121,25 +121,34 @@ class UserPasswordCommand extends Command
$userManipulator->setPassword($user,$password); $userManipulator->setPassword($user,$password);
} }
if (($password || $generate || $getHash) && $oldHash) { if ($dump) {
if ($jsonformat) { if ($jsonformat) {
if ($password) {
$hash['new_password'] = $password;
}
$hash['password_hash'] = $oldHash; $hash['password_hash'] = $oldHash;
$hash['nonce'] = $oldNonce; $hash['nonce'] = $oldNonce;
echo json_encode($hash); echo json_encode($hash);
return 0;
} else { } else {
if ($password) {
$output->writeln('<info>new_password :</info>' . $password);
}
$output->writeln('<info>password_hash :</info>' . $oldHash); $output->writeln('<info>password_hash :</info>' . $oldHash);
$output->writeln('<info>nonce :</info>' . $oldNonce); $output->writeln('<info>nonce :</info>' . $oldNonce);
return 0;
}
} }
} elseif (is_null($password)) { if (($password || $generate)) {
$output->writeln('<info>password undefined</info>'); if ($jsonformat) {
$hash['new_password'] = $password;
$hash['previous_password_hash'] = $oldHash;
$hash['previous_nonce'] = $oldNonce;
echo json_encode($hash);
} else {
$output->writeln('<info>new_password :</info>' . $password);
$output->writeln('<info>previous_password_hash :</info>' . $oldHash);
$output->writeln('<info>previous_nonce :</info>' . $oldNonce);
}
} }
return 0; return 0;