diff --git a/acl/CHANGELOG b/acl/CHANGELOG index 68c1c351a..d5cb83e9f 100644 --- a/acl/CHANGELOG +++ b/acl/CHANGELOG @@ -40,3 +40,5 @@ When editing a user who inherits some modules and ACL settings from a group, the ---- Changes since 1.380 ---- Fixed a bug that prevented cloning from copying detailed access control settings, and ensured that other user attributes like the group, theme, language and access times are cloned too. Added back the ability to edit the global ACL for groups. +---- Changes since 1.390 ---- +Updated the user interface to use the Webmin UI library. diff --git a/acl/index.cgi b/acl/index.cgi index e67806216..a1bf181e8 100755 --- a/acl/index.cgi +++ b/acl/index.cgi @@ -64,26 +64,26 @@ else { if ($access{'create'}); print &ui_links_row(\@rowlinks); - print "\n"; - print "\n"; - print "\n"; + print &ui_columns_start([ $text{'index_user'}, + $text{'index_modules'} ], 100); foreach $u (@canulist) { - print "\n"; - print "\n"; if ($ingroup{$u->{'name'}}) { # Is a member of a group - &show_modules("user", $u->{'name'}, $u->{'ownmods'}, 0, - &text('index_modgroups', - "$ingroup{$u->{'name'}}->{'name'}")); + $smods = &show_modules( + "user", $u->{'name'}, $u->{'ownmods'}, 0, + &text('index_modgroups', + "$ingroup{$u->{'name'}}->{'name'}")); } else { # Is a stand-alone user - &show_modules("user", $u->{'name'}, $u->{'modules'}, 1); + $smods = &show_modules( + "user", $u->{'name'}, $u->{'modules'}, 1); } + print &ui_columns_row([ &user_link($u, "edit_user.cgi", "user"), + $smods ], [ "valign=top" ]); } - print "
$text{'index_user'}$text{'index_modules'}
", - &user_link($u, "edit_user.cgi", "user"),"
\n"; + print &ui_columns_end(); print &ui_links_row(\@rowlinks); if (!$config{'select'}) { print &ui_form_end([ [ "delete", $text{'index_delete'} ] ]); @@ -105,10 +105,11 @@ if ($access{'groups'}) { print "$text{'index_gcreate'}

\n"; } elsif ($config{'display'}) { + # Show just group names print &ui_form_start("delete_groups.cgi", "post"); &show_name_table(\@glist, "edit_group.cgi", $text{'index_gcreate'}, - $text{'index_group'}, "group"); + $text{'index_groups'}, "group"); print &ui_form_end([ [ "delete", $text{'index_delete'} ] ]); $form++; } @@ -200,59 +201,50 @@ if (@icons) { sub show_modules { local ($type, $who, $mods, $global, $prefix) = @_; +local $rv; if ($config{'select'}) { # Show as drop-down menu - print "

\n"; - print "\n"; - print $prefix,"
\n" if ($prefix); + $rv .= &ui_form_start("edit_acl.cgi"); + $rv .= $prefix."
\n" if ($prefix); if (@$mods) { - print "\n"; + $rv .= &ui_hidden($type, $who); if ($access{'acl'}) { - print "\n"; + $rv .= &ui_submit($text{'index_edit'}); } - print "\n"; + $rv .= &ui_select("mod", undef, \@opts); } - print "
\n"; + $rv .= &ui_form_end(); } else { # Show as table - print "\n"; - print $prefix,"
\n" if ($prefix); - print "\n"; - print ""; - $done = 1; + push(@grid, "$text{'index_global'}"); } foreach $m (sort { $modname{$a} cmp $modname{$b} } @$mods) { if ($modname{$m}) { - if ($done%3 == 0) { print "\n"; } - print "\n"; - if ($done%3 == 2) { print "\n"; } - $done++; } } - while($done++ % 3) { print "\n"; } - print "
\n"; + $rv .= $prefix."
\n" if ($prefix); + local @grid; if ($access{'acl'}) { - print "$text{'index_global'}
"; if ($mcan{$m} && $access{'acl'}) { - print "$modname{$m}"; + push(@grid, "$modname{$m}"); } else { - print $modname{$m}; + push(@grid, $modname{$m}); } - print "
\n"; - print " \n"; + $rv .= &ui_grid_table(\@grid, 3, 100); } +return $rv; } # show_name_table(&users|&groups, cgi, create-text, header-text, param) @@ -263,24 +255,11 @@ local @rowlinks = ( &select_all_link("d", $form), &select_invert_link("d", $form) ); push(@rowlinks, "$_[2]") if ($_[2]); print &ui_links_row(\@rowlinks); -print "\n"; -print "\n"; -print "
$_[3]
\n"; - -for($i=0; $i<@{$_[0]}; $i++) { - print "\n" if ($i%4 == 0); - print "\n"; - print "\n"; - print "\n" if ($i%4 == 3); +local @links; +for(my $i=0; $i<@{$_[0]}; $i++) { + push(@links, &user_link($_[0]->[$i], $_[1], $_[4])); } -if ($i%4) { - while($i++%4) { - print "\n"; - } - print "\n"; - } - -print "
",&user_link($_[0]->[$i], $_[1], $_[4]),"
\n"; +print &ui_grid_table(\@links, 4, 100, undef, undef, $_[3]); print &ui_links_row(\@rowlinks); } diff --git a/acl/list_sessions.cgi b/acl/list_sessions.cgi index 2a028802e..3b7874132 100755 --- a/acl/list_sessions.cgi +++ b/acl/list_sessions.cgi @@ -17,38 +17,35 @@ foreach $u (&list_users()) { $haslog = &foreign_available("webminlog"); print "$text{'sessions_desc'}

\n"; -print "\n"; -print " ", - " ", - " ", - $haslog ? " " : "", - "\n"; +print &ui_columns_start([ $text{'sessions_id'}, + $text{'sessions_user'}, + $text{'sessions_host'}, + $haslog ? ( $text{'sessions_login'} ) : ( ), + "" ], 100); foreach $k (sort { @a=split(/\s+/, $sessiondb{$a}); @b=split(/\s+/, $sessiondb{$b}); $b[1] <=> $a[1] } keys %sessiondb) { next if ($k =~ /^1111111/); local ($user, $ltime, $lip) = split(/\s+/, $sessiondb{$k}); next if ($miniserv{'logouttime'} && $time_now - $ltime > $miniserv{'logouttime'}*60); - print "\n"; - print "\n"; + local @cols; + push(@cols, "$k"); if ($hasuser{$user}) { - print "\n"; + push(@cols, "$user"); } elsif ($miniserv{'unixauth'}) { - print "\n"; + push(@cols, "$user ($miniserv{'unixauth'})"); } else { - print "\n"; + push(@cols, $user); } - print "\n"; - local $tm = localtime($ltime); - print "\n"; + push(@cols, $lip); + push(@cols, &make_date($ltime)); if ($haslog) { - print "\n"; + push(@cols, "$text{'sessions_lview'}"); } - print "\n"; + print &ui_columns_row(\@cols); } -print "
$text{'sessions_id'}$text{'sessions_user'}$text{'sessions_host'}$text{'sessions_login'}
$k$user$user ($miniserv{'unixauth'})$user",($lip || "
"),"		$tm$text{'sessions_lview'}

\n"; +print &ui_columns_end(); &ui_print_footer("", $text{'index_return'});