Skip to content
Snippets Groups Projects
Commit c74acb7f authored by André Noack's avatar André Noack Committed by Jan-Hendrik Willms
Browse files

Resolve #2786 "cli Kommando user:delete wirft unverständliche Fehlermeldung"

Closes #2786

Merge request studip/studip!1883
parent ce8b9a1e
No related branches found
No related tags found
No related merge requests found
...@@ -16,14 +16,7 @@ class UserDelete extends Command ...@@ -16,14 +16,7 @@ class UserDelete extends Command
{ {
$this->setDescription('Delete users.'); $this->setDescription('Delete users.');
$this->setHelp('Delete multiple studip user accounts'); $this->setHelp('Delete multiple studip user accounts');
$this->addArgument('range', InputArgument::REQUIRED, 'Username or path to csv-file'); $this->addArgument('range', InputArgument::REQUIRED, 'Path to csv-file or - to read from STDIN');
$this->addOption(
'file_range',
'f',
InputOption::VALUE_OPTIONAL,
'Set to true, if you want use a txt file with username',
true
);
$this->addOption('email', 'e', InputOption::VALUE_OPTIONAL, 'Send a deletion email', true); $this->addOption('email', 'e', InputOption::VALUE_OPTIONAL, 'Send a deletion email', true);
$this->addOption( $this->addOption(
'delete_admins', 'delete_admins',
...@@ -37,39 +30,32 @@ class UserDelete extends Command ...@@ -37,39 +30,32 @@ class UserDelete extends Command
protected function execute(InputInterface $input, OutputInterface $output): int protected function execute(InputInterface $input, OutputInterface $output): int
{ {
$range = $input->getArgument('range'); $range = $input->getArgument('range');
$file_range = $input->getOption('file_range');
$email = $input->getOption('email'); $email = $input->getOption('email');
$delete_admins = $input->getOption('delete_admins'); $delete_admins = $input->getOption('delete_admins');
if ($email && !($MAIL_LOCALHOST && $MAIL_HOST_NAME && $ABSOLUTE_URI_STUDIP)) { if ($range === '-') {
$output->writeln( $file = STDIN;
"<error>To use this script you MUST set correct values for $MAIL_LOCALHOST, $MAIL_HOST_NAME and $ABSOLUTE_URI_STUDIP in local.inc!</error>" } elseif (is_file($range)) {
); $file = fopen($range, 'r');
}
if (!(bool) $file_range) {
$usernames = [$range];
} else { } else {
if (!is_file($range)) {
$output->writeln(sprintf('<error>File not found: %s</error>', $range)); $output->writeln(sprintf('<error>File not found: %s</error>', $range));
return Command::FAILURE; return Command::FAILURE;
} }
$file = fopen($range, 'r');
$list = ''; $list = '';
while (!feof($file)) { while (!feof($file)) {
$list .= fgets($file, 1024); $list .= fgets($file, 1024);
} }
$usernames = preg_split('/[\s,;]+/', $list, -1, PREG_SPLIT_NO_EMPTY); $usernames = preg_split('/[\s,;]+/', $list, -1, PREG_SPLIT_NO_EMPTY);
$usernames = array_unique($usernames); $usernames = array_unique($usernames);
}
$users = \User::findBySQL('username IN (?)', [$usernames]); \User::findEachBySQL(
function (\User $user) use ($output, $delete_admins, $email) {
if (!empty($users)) {
foreach ($users as $user) {
if (!$delete_admins && ($user->perms == 'admin' || $user->perms == 'root')) { if (!$delete_admins && ($user->perms == 'admin' || $user->perms == 'root')) {
$output->writeln(sprintf('User: %s is %s, NOT deleted', $user->username, $user->perms)); $output->writeln(sprintf('User: %s is %s, NOT deleted', $user->username, $user->perms));
} else { return;
}
$umanager = new \UserManagement($user->id); $umanager = new \UserManagement($user->id);
//wenn keine Email gewünscht, Adresse aus den Daten löschen //wenn keine Email gewünscht, Adresse aus den Daten löschen
if (!$email) { if (!$email) {
...@@ -81,9 +67,11 @@ class UserDelete extends Command ...@@ -81,9 +67,11 @@ class UserDelete extends Command
$output->writeln(sprintf('<error>User: %s NOT deleted</error>', $user->username)); $output->writeln(sprintf('<error>User: %s NOT deleted</error>', $user->username));
} }
$output->writeln(parse_msg_to_clean_text($umanager->msg)); $output->writeln(parse_msg_to_clean_text($umanager->msg));
} },
} 'username IN (?)',
} [$usernames]
);
return Command::SUCCESS; return Command::SUCCESS;
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment