From f088a0525cb81a1febe288f0fb3eb600102c646d Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Fri, 20 Dec 2013 16:51:19 -0800
Subject: [PATCH] strict conversion

---
 acl/delete_groups.cgi | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/acl/delete_groups.cgi b/acl/delete_groups.cgi
index 3f9ef8505..7f80e0979 100755
--- a/acl/delete_groups.cgi
+++ b/acl/delete_groups.cgi
@@ -1,19 +1,22 @@
 #!/usr/local/bin/perl
 # Delete a bunch of Webmin groups
 
+use strict;
+use warnings;
 require './acl-lib.pl';
+our (%in, %text, %config, %access, $base_remote_user);
 &ReadParse();
 &error_setup($text{'gdeletes_err'});
 $access{'groups'} || &error($text{'gdelete_ecannot'});
 
 # Validate inputs
-@d = split(/\0/, $in{'d'});
+my @d = split(/\0/, $in{'d'});
 @d || &error($text{'udeletes_enone'});
-@glist = &list_groups();
-$ucount = 0;
-foreach $g (@d) {
-	($group) = grep { $_->{'name'} eq $g } @glist;
-	foreach $m (@{$group->{'members'}}) {
+my @glist = &list_groups();
+my $ucount = 0;
+foreach my $g (@d) {
+	my ($group) = grep { $_->{'name'} eq $g } @glist;
+	foreach my $m (@{$group->{'members'}}) {
 		&error($text{'gdelete_esub'}) if ($m =~ /^\@/);
 		&error($text{'gdelete_euser'}) if ($m eq $base_remote_user);
 		$ucount++;
@@ -22,10 +25,10 @@ foreach $g (@d) {
 
 if ($in{'confirm'}) {
 	# Do it
-	foreach $g (@d) {
-		($group) = grep { $_->{'name'} eq $g } @glist;
+	foreach my $g (@d) {
+		my ($group) = grep { $_->{'name'} eq $g } @glist;
 		&delete_group($g);
-		foreach $m (@{$group->{'members'}}) {
+		foreach my $u (@{$group->{'members'}}) {
 			if ($u =~ /^\@(.*)/) {
 				&delete_group("$1");
 				}
@@ -44,18 +47,14 @@ else {
 	# Ask the user if he is sure
 	&ui_print_header(undef, $text{'gdeletes_title'}, "");
 
-	print "<center>\n";
-	print &ui_form_start("delete_groups.cgi", "post");
-	foreach $g (@d) {
-		print &ui_hidden("d", $g),"\n";
-		}
-	print &text('gdeletes_rusure', scalar(@d), $ucount),"<p>\n";
-
-	print &ui_form_end([ [ "confirm", $text{'gdeletes_ok'} ] ]);
-
-	print &text('gdeletes_users', join(" ", map { "<tt>$_</tt>" } @d)),
-	      "<p>\n";
-	print "</center>\n";
+	print &ui_confirmation_form(
+		"delete_groups.cgi",
+		&text('gdeletes_rusure', scalar(@d), $ucount),
+		[ map { [ "d", $_ ] } @d ],
+		[ [ "confirm", $text{'gdeletes_ok'} ] ],
+		undef,
+		&text('gdeletes_users', join(" ", map { "<tt>$_</tt>" } @d)),
+		);
 
 	&ui_print_footer("", $text{'index_return'});
 	}