From 850f5673bcb0d7f7fa2e4f8776dd2f94d95fc281 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Mon, 2 Dec 2013 17:56:22 -0800
Subject: [PATCH] ui-lib conversion

---
 acl/convert.cgi | 16 +++++++++-------
 acl/lang/en     |  2 ++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/acl/convert.cgi b/acl/convert.cgi
index dfd88cf36..9048118e7 100755
--- a/acl/convert.cgi
+++ b/acl/convert.cgi
@@ -65,8 +65,8 @@ else {
 
 # Convert matching users
 &ui_print_header(undef, $text{'convert_title'}, "");
-print &ui_subheading($text{'convert_msg'});
-print "<table border width=100%><tr><td bgcolor=#c0c0c0><pre>\n";
+print $text{'convert_msg'},"<p>\n";
+print &ui_columns_start([ $text{'convert_user'}, $text{'convert_action'} ]);
 map { $exists{$_->{'name'}}++ } &list_users();
 $skipped = $exists = $invalid = $converted = 0;
 foreach $u (@users) {
@@ -90,19 +90,20 @@ foreach $u (@users) {
 		}
 	if (!$ok) {
 		#print &text('convert_skip', $u->{'user'}),"\n";
+		$msg = undef;
 		$skipped++;
 		}
 	elsif ($exists{$u->{'user'}}) {
-		print "<i>",&text('convert_exists', $u->{'user'}),"</i>\n";
+		$msg = "<i>".&text('convert_exists', $u->{'user'})."</i>";
 		$exists++;
 		}
 	elsif ($u->{'user'} !~ /^[A-z0-9\-\_\.]+$/) {
-		print "<i>",&text('convert_invalid', $u->{'user'}),"</i>\n";
+		$msg = "<i>".&text('convert_invalid', $u->{'user'})."</i>";
 		$invalid++;
 		}
 	else {
 		# Actually add the user
-		print "<b>",&text('convert_added', $u->{'user'}),"</b>\n";
+		$msg = "<b>".&text('convert_added', $u->{'user'})."</b>";
 		local $user = { 'name' => $u->{'user'},
 				'pass' => $in{'sync'} ? 'x' : $u->{'pass'},
 				'modules' => $group->{'modules'} };
@@ -121,8 +122,10 @@ foreach $u (@users) {
 		$exists{$u->{'user'}}++;
 		$converted++;
 		}
+	print &ui_columns_row([ $u->{'user'}, $msg ]) if ($msg);
 	}
-endpwent() if ($gconfig{'os_type'} ne 'hpux');
+endpwent();
+print &ui_columns_end();
 
 # Finish off
 &modify_group($group->{'name'}, $group);
@@ -131,6 +134,5 @@ endpwent() if ($gconfig{'os_type'} ne 'hpux');
 # Print summary
 print &text('convert_done', $converted, $invalid, $exists, $skipped),"<p>\n";
 
-print "</pre></td></tr></table><br>\n";
 &ui_print_footer("", $text{'index_return'});
 
diff --git a/acl/lang/en b/acl/lang/en
index 40b1479e0..a884c333f 100644
--- a/acl/lang/en
+++ b/acl/lang/en
@@ -284,6 +284,8 @@ convert_exists=$1 already exists
 convert_invalid=$1 is not a valid Webmin username
 convert_added=$1 being added
 convert_msg=Converting Unix users...
+convert_user=Unix user
+convert_action=Action taken
 convert_done=$1 users converted, $2 invalid, $3 already exist, $4 excluded.
 
 sync_title=Unix User Synchronization