tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8849 from MrPetovan/task/8846-console-user-tweaks

Browse source 
Rename -q option to -y for user delete console command
This commit is contained in:
Michael Vogel 2020-07-07 07:02:05 +02:00 committed by GitHub
parent afdb827bd7 6cde7afa53
commit 01db4881aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Console/User.php
View file

@ -59,7 +59,7 @@ console user - Modify user settings per console commands.
Usage Usage
bin/console user password <nickname> [<password>] [-h|--help|-?] [-v] bin/console user password <nickname> [<password>] [-h|--help|-?] [-v]
bin/console user add [<name> [<nickname> [<email> [<language>]]]] [-h|--help|-?] [-v] bin/console user add [<name> [<nickname> [<email> [<language>]]]] [-h|--help|-?] [-v]
bin/console user delete [<nickname>] [-q] [-h|--help|-?] [-v] bin/console user delete [<nickname>] [-y] [-h|--help|-?] [-v]
bin/console user allow [<nickname>] [-h|--help|-?] [-v] bin/console user allow [<nickname>] [-h|--help|-?] [-v]
bin/console user deny [<nickname>] [-h|--help|-?] [-v] bin/console user deny [<nickname>] [-h|--help|-?] [-v]
bin/console user block [<nickname>] [-h|--help|-?] [-v] bin/console user block [<nickname>] [-h|--help|-?] [-v]
@ -78,8 +78,8 @@ Description
Options Options
-h|--help|-? Show help information -h|--help|-? Show help information
-v Show more debug information. -v Show more debug information
-q Quiet mode (don't ask for a command). -y Non-interactive mode, assume "yes" as answer to the user deletion prompt
HELP; HELP;
return $help; return $help;
} }
@ -314,7 +314,7 @@ HELP;
return true; return true;
} }
if (!$this->getOption('q')) { if (!$this->getOption('y')) {
$this->out($this->l10n->t('Type "yes" to delete %s', $nick)); $this->out($this->l10n->t('Type "yes" to delete %s', $nick));
if (CliPrompt::prompt() !== 'yes') { if (CliPrompt::prompt() !== 'yes') {
throw new RuntimeException($this->l10n->t('Deletion aborted.')); throw new RuntimeException($this->l10n->t('Deletion aborted.'));

1
src/Model/User.php
View file

@ -1321,6 +1321,7 @@ class User
$condition = []; $condition = [];
switch ($type) { switch ($type) {
case 'active': case 'active':
$condition['account_removed'] = false;
$condition['blocked'] = false; $condition['blocked'] = false;
break; break;
case 'blocked': case 'blocked':