Skip to content

Commit

Permalink
Use proper paramsand my instead of local in delete_webmin
Browse files Browse the repository at this point in the history
  • Loading branch information
jcameron committed Jan 9, 2025
1 parent 13408d9 commit e0668f3
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions feature-webmin.pl
Original file line number Diff line number Diff line change
Expand Up @@ -65,29 +65,30 @@ sub webmin_password
# Delete the webmin user for the domain, and all his permissions
sub delete_webmin
{
my ($d) = @_;
&$first_print($text{'delete_webmin'});
&obtain_lock_webmin($_[0]);
&obtain_lock_webmin($d);
&require_acl();

# Delete the user
&acl::delete_user($_[0]->{'user'});
&update_extra_webmin($_[0]);
&acl::delete_user($d->{'user'});
&update_extra_webmin($d);

# Delete from any groups
foreach my $group (&acl::list_groups()) {
local $idx = &indexof($_[0]->{'user'}, @{$group->{'members'}});
my $idx = &indexof($d->{'user'}, @{$group->{'members'}});
if ($idx >= 0) {
splice(@{$group->{'members'}}, $idx, 1);
&acl::modify_group($group->{'name'}, $group);
}
}

# Clear Webmin sessions
local %miniserv;
my %miniserv;
&get_miniserv_config(\%miniserv);
&acl::delete_session_user(\%miniserv, $_[0]->{'user'});
&acl::delete_session_user(\%miniserv, $d->{'user'});

&release_lock_webmin($_[0]);
&release_lock_webmin($d);
&register_post_action(\&restart_webmin);
&$second_print($text{'setup_done'});
return 1;
Expand Down

0 comments on commit e0668f3

Please sign in to comment.