diff --git a/iscsi-server/delete_users.cgi b/iscsi-server/delete_users.cgi new file mode 100644 index 000000000..41547d23a --- /dev/null +++ b/iscsi-server/delete_users.cgi @@ -0,0 +1,35 @@ +#!/usr/local/bin/perl +# Delete multiple users + +use strict; +use warnings; +require './iscsi-server-lib.pl'; +our (%text, %in, %config); +&error_setup($text{'dusers_err'}); +&lock_file($config{'auths_file'}); +&ReadParse(); + +# Get the users +my @users = &list_iscsi_users(); +my @delusers; +foreach my $d (split(/\0/, $in{'d'})) { + my ($user) = grep { $_->{'user'} eq $d } @users; + if ($user) { + push(@delusers, $user); + } + } +@delusers || &error($text{'dusers_enone'}); + +# Delete them, in reverse line order +foreach my $user (sort { $b->{'line'} cmp $a->{'line'} } @delusers) { + &delete_iscsi_user($user); + } + +&unlock_file($config{'auths_file'}); +if (@delusers == 1) { + &webmin_log("delete", "user", $delusers[0]->{'user'}); + } +else { + &webmin_log("delete", "users", scalar(@delusers)); + } +&redirect("list_users.cgi"); diff --git a/iscsi-server/list_users.cgi b/iscsi-server/list_users.cgi index 452f33ef4..5cc30f90d 100644 --- a/iscsi-server/list_users.cgi +++ b/iscsi-server/list_users.cgi @@ -12,7 +12,7 @@ my @users = &list_iscsi_users(); my @links = ( "$text{'users_add'}" ); if (@users) { unshift(@links, &select_all_link("d"), &select_invert_link("d")); - print &ui_form_start("delete_devices.cgi"); + print &ui_form_start("delete_users.cgi"); print &ui_links_row(\@links); my @tds = ( "width=5" ); print &ui_columns_start([ undef, diff --git a/iscsi-server/log_parser.pl b/iscsi-server/log_parser.pl index 59bc178f1..fcf6bf464 100755 --- a/iscsi-server/log_parser.pl +++ b/iscsi-server/log_parser.pl @@ -13,7 +13,8 @@ if ($type eq 'extent' || $type eq 'device' || $type eq 'target' || return &text('log_'.$action.'_'.$type, "".&html_escape($object).""); } -elsif ($type eq 'extents' || $type eq 'devices' || $type eq 'targets') { +elsif ($type eq 'extents' || $type eq 'devices' || $type eq 'targets' || + $type eq 'users') { return &text('log_'.$action.'_'.$type, $object); } else {