diff --git a/acl/convert.cgi b/acl/convert.cgi index 115849881..dfd88cf36 100755 --- a/acl/convert.cgi +++ b/acl/convert.cgi @@ -68,6 +68,7 @@ else { print &ui_subheading($text{'convert_msg'}); print "
\n";
map { $exists{$_->{'name'}}++ } &list_users();
+$skipped = $exists = $invalid = $converted = 0;
foreach $u (@users) {
local $ok;
if ($in{'conv'} == 0) {
@@ -88,13 +89,16 @@ foreach $u (@users) {
$u->{'uid'} <= $in{'max'};
}
if (!$ok) {
- print &text('convert_skip', $u->{'user'}),"\n";
+ #print &text('convert_skip', $u->{'user'}),"\n";
+ $skipped++;
}
elsif ($exists{$u->{'user'}}) {
print "",&text('convert_exists', $u->{'user'}),"\n";
+ $exists++;
}
elsif ($u->{'user'} !~ /^[A-z0-9\-\_\.]+$/) {
print "",&text('convert_invalid', $u->{'user'}),"\n";
+ $invalid++;
}
else {
# Actually add the user
@@ -115,6 +119,7 @@ foreach $u (@users) {
push(@{$group->{'members'}}, $u->{'user'});
$exists{$u->{'user'}}++;
+ $converted++;
}
}
endpwent() if ($gconfig{'os_type'} ne 'hpux');
@@ -123,6 +128,9 @@ endpwent() if ($gconfig{'os_type'} ne 'hpux');
&modify_group($group->{'name'}, $group);
&restart_miniserv();
+# Print summary
+print &text('convert_done', $converted, $invalid, $exists, $skipped)," |