michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-20 11:20:30 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

ui-lib conversion

Browse Source
This commit is contained in:
Jamie Cameron
2013-12-02 17:56:22 -08:00
parent 303ea8ea8a
commit 850f5673bc
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
acl/convert.cgi
View File

@@ -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'});

2
acl/lang/en
View File

@@ -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