michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finished off ui conversion of samba module

Browse Source
This commit is contained in:
Jamie Cameron
2012-05-01 22:04:38 -07:00
parent 8cf0e03a14
commit 4d27e5266d
4 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samba/CHANGELOG
View File

@@ -30,3 +30,5 @@ Try to use the smbpasswd command to create or delete users, if installed.
Add support for the locked account flag for users, thanks to Juan Miguel Corral Cano.
---- Changes since 1.550 ----
Added improved Winbind support, thanks to Caspar Smit.
---- Changes since 1.590 ----
Converted all pages to Webmin's new common UI functions, for a more consistent layout. Also reduced the length of icon titles.

12
samba/lang/en
View File

@@ -327,11 +327,15 @@ esync_egid=Missing group SID or RID
mkpass_title=Convert Users
mkpass_convfail=Failed to convert user
mkpass_msg=Converting Unix users...
mkpass_skip=being skipped
mkpass_same=is already the same
mkpass_update=being updated
mkpass_del=being deleted
mkpass_skip=Skipped
mkpass_same=Already the same
mkpass_update=Updated
mkpass_added=Added
mkpass_del=Deleted
mkpass_passfail=Failed to set password
mkpass_user=Username
mkpass_action=Action taken
mkpass_skipcount=$1 users were skipped for conversion.
savecopy_fail=Failed to create copy
savecopy_global=The name 'global' cannot be used for a share

32
samba/make_epass.cgi
View File

@@ -24,7 +24,7 @@ map { $suser{$_->{'name'}} = $_ } @ulist;
print "$text{'mkpass_msg'}<p>\n";
@skip = split(/[ \t,]/ , $in{"skip_list"});
@include = split(/[ \t,]/ , $in{"include_list"});
print "<table border width=100%><tr><td bgcolor=#c0c0c0><pre>\n";
print &ui_columns_start([ $text{'mkpass_user'}, $text{'mkpass_action'} ]);
setpwent();
while(@uinfo = getpwent()) {
# Get new and existing user details
@@ -36,20 +36,20 @@ while(@uinfo = getpwent()) {
# Check if this user would be skipped
if ($in{'who'} == 1 && &check_user_list(\@uinfo, \@skip) ||
$in{'who'} == 0 && !&check_user_list(\@uinfo, \@include)) {
$m = "$huinfo $text{'mkpass_skip'}";
$skipcount++;
}
elsif ($su && $in{"update"}) {
if ($su->{'opts'}) {
# new-style user
if ($uinfo[2] == $su->{'uid'}) {
$m = "$huinfo $text{'mkpass_same'}";
$m = $text{'mkpass_same'};
}
else {
$su->{'uid'} = $uinfo[2];
$su->{'real'} = $uinfo[6];
&modify_user($su);
$m = "$huinfo $text{'mkpass_update'}";
$m = $text{'mkpass_update'};
$c1 = "<i>"; $c2 = "</i>";
$modified++;
}
@@ -60,7 +60,7 @@ while(@uinfo = getpwent()) {
$uinfo[6] eq $su->{'real'} &&
$uinfo[7] eq $su->{'home'} &&
$uinfo[8] eq $su->{'shell'}) {
$m = "$huinfo $text{'mkpass_same'}";
$m = $text{'mkpass_same'};
}
else {
$su->{'uid'} = $uinfo[2];
@@ -68,7 +68,7 @@ while(@uinfo = getpwent()) {
$su->{'home'} = $uinfo[7];
$su->{'shell'} = $uinfo[8];
&modify_user($su);
$m = "$huinfo $text{'mkpass_update'}";
$m = $text{'mkpass_update'};
$c1 = "<i>"; $c2 = "</i>";
$modified++;
}
@@ -79,7 +79,7 @@ while(@uinfo = getpwent()) {
'uid' => $uinfo[2] };
local @flags = ("U");
$c1 = "<b>"; $c2 = "</b>";
$m = "$huinfo being added";
$m = $text{'mkpass_add'};
if ($in{'newmode'} == 0) {
$nu->{'pass1'} = "NO PASSWORDXXXXXXXXXXXXXXXXXXXXX";
$nu->{'pass2'} = $nu->{'pass1'};
@@ -103,7 +103,11 @@ while(@uinfo = getpwent()) {
&create_user($nu);
$created++;
}
if ($m) { printf "$c1%-40.40s$c2%s", $m, ++$c%2 ? "" : "\n"; }
if ($m) {
print &ui_columns_row([
&html_escape($uinfo[0]),
$c1.$m.$c2 ]);
}
}
endpwent() if ($gconfig{'os_type'} ne 'hpux');
@@ -112,14 +116,19 @@ if ($in{"delete"}) {
foreach $u (@ulist) {
if (!$uexists{$u->{'name'}}) {
# delete this samba user..
$m = &html_escape($u->{'name'})." $text{'mkpass_del'}";
&delete_user($u);
printf "<b><font color=#ff0000>%-40.40s</font></b>%s",
$m, ++$c%2 ? "" : "\n";
print &ui_columns_row([
&html_escape($u->{'name'}),
"<font color=#ff0000>$text{'mkpass_del'}</font>",
]);
$deleted++;
}
}
}
print &ui_columns_end();
if ($skipcount) {
print &text('mkpass_skipcount', $skipcount),"<p>\n";
}
# Update the passwords of new users
foreach $u (keys %setpass) {
@@ -131,7 +140,6 @@ foreach $u (keys %setpass) {
'created' => $created,
'deleted' => $deleted } );
print "</pre></td></tr></table>\n";
&ui_print_footer("", $text{'index_sharelist'});
# check_user_list(&uinfo, &list)

26
samba/swat.cgi
View File

@@ -102,18 +102,20 @@ if (%swat) {
else {
print $text{'swat_msg2'}, " <br>\n";
}
print "<form action=swat_save.cgi>\n";
print "<center><table border>\n";
print "<tr $tb> <td><b>$text{'swat_list'}</b></td> </tr>\n";
print "<tr $cb> <td><table cellpadding=2>\n";
print "<tr> <td><b>$text{'swat_username'}</b></td>\n";
print "<td><input name=user size=20 value='$swat{'user'}'></td> </tr>\n";
print "<tr> <td><b>$text{'swat_password'}</b></td>\n";
print "<td><input name=pass size=20 type=password></td> </tr>\n";
print "</table></td></tr></table>\n";
print "<input type=submit value=\"", $text{'swat_login'},
"\"> <input type=reset value=\"", $text{'swat_clear'}, "\">\n";
print "</center></form>\n";
print "<center>\n";
print &ui_form_start("swat_save.cgi");
print &ui_table_start($text{'swat_list'}, undef, 2);
print &ui_table_row($text{'swat_username'},
&ui_textbox("user", $swat{'user'}, 20));
print &ui_table_row($text{'swat_password'},
&ui_password("pass", undef, 20));
print &ui_table_end();
print &ui_form_end([ [ undef, $text{'swat_login'} ] ]);
print "</center>\n";
&ui_print_footer("", $text{'index_sharelist'});
exit;
}