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

Merge branch 'master' of git@github.com:webmin/webmin

Browse Source
This commit is contained in:
Jamie Cameron
2013-12-19 14:40:45 -08:00
parent 44a1e87d73 92671ff9f2
commit 985d91ccba
45 changed files with 154 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
at/edit_job.cgi
View File

@@ -39,8 +39,7 @@ else {
print &ui_table_row($text{'edit_shortcmd'},
"<pre>".&html_escape(
join("\n", &wrap_lines($job->{'realcmd'}, 80)))."</pre>".
"<a href='edit_job.cgi?full=1&id=".&urlize($in{'id'})."'>".
$text{'edit_showfull'}."</a>", 3);
&ui_link("edit_job.cgi?full=1&id=".&urlize($in{'id'}), $text{'edit_showfull'}), 3);
}
print &ui_table_end();

3
at/index.cgi
View File

@@ -35,8 +35,7 @@ if (@jobs) {
$text{'index_cmd'} ], 100, 0, \@tds);
foreach $j (@jobs) {
local @cols;
push(@cols, "<a href='edit_job.cgi?id=$j->{'id'}'>".
"$j->{'id'}</a>");
push(@cols, &ui_link("edit_job.cgi?id=".$j->{'id'}, $j->{'id'}) );
push(@cols, &html_escape($j->{'user'}));
$date = localtime($j->{'date'});
push(@cols, "<tt>$date</tt>");

4
certmgr/certmgr-lib.pl
View File

@@ -61,7 +61,9 @@ sub print_sign_form {
print &ui_table_row($text{'signcsr_csrfile'}, &ui_textbox("csrfile", $in{'csrfile'}, 40), undef, $valign_middle);
print &ui_table_row($text{'signcsr_signfile'}, &ui_textbox("signfile", $in{'signfile'}, 40), undef, $valign_middle);
print &ui_table_row($text{'signcsr_keyfile'}, &ui_textbox("keycertfile", $in{'keycertfile'}, 40), undef, $valign_middle);
print &ui_table_row("<a onClick='window.open(\"/help.cgi/certmgr/signcsr_ca_pass\", \"help\", \"toolbar=no,menubar=no,scrollbars=yes,width=400,height=300,resizable=yes\"); return false' href=\"/help.cgi/certmgr/signcsr_ca_pass\"><b>$text{'signcsr_ca_passphrase'}</b></a>",
print &ui_table_row(&ui_link("/help.cgi/certmgr/signcsr_ca_pass",
"<b>$text{'signcsr_ca_passphrase'}</b>", undef,
"onClick='window.open(\"/help.cgi/certmgr/signcsr_ca_pass\", \"help\", \"toolbar=no,menubar=no,scrollbars=yes,width=400,height=300,resizable=yes\"); return false;'"),
&ui_password("password", $in{'password'}, 40), undef, $valign_middle);
print &ui_table_row($text{'signcsr_days'}, &ui_textbox("days", $in{'days'}, 40), undef, $valign_middle);
print &ui_table_row("&nbsp;",

10
certmgr/config_info.pl
View File

@@ -2,14 +2,4 @@
# do 'certmgr-lib.pl';
require 'certmgr-lib.pl';
sub show_cfile
{
local ($value) = @_;
return "<input name=cfile size=30 value='$value'> ". &file_chooser_button("cfile")." "."<a href='/certmgr/edit_file.cgi?file=$value'>Edit..</a>";
}
sub parse_cfile
{
return $in{'cfile'};
}

2
certmgr/index.cgi
View File

@@ -13,7 +13,7 @@ print &ui_table_start($text{'index_header'}, undef, 2);
foreach $p (@pages) {
next if (!$access{$p});
$txt = $text{'index_'.$p};
print &ui_columns_row(["<a href=$p.cgi><img src=images/$p.gif border=0></a>", "<a href=$p.cgi>$txt</a>"], ["valign=middle width=5%","valign=middle style='padding-right:10px;'"]);
print &ui_columns_row([ &ui_link("$p.cgi", "<img src='images/$p.gif' border=0>"), &ui_link("$p.cgi", $txt) ], ["valign=middle width=5%","valign=middle style='padding-right:10px;'"]);
}
print ui_table_end();

29
cron/index.cgi
View File

@@ -47,14 +47,11 @@ if ($config{'show_run'}) {
# Work out creation links
@crlinks = ( );
if ($access{'create'}) {
push(@crlinks,
"<a href=\"edit_cron.cgi?new=1\">$text{'index_create'}</a>");
push(@crlinks,
"<a href=\"edit_env.cgi?new=1\">$text{'index_ecreate'}</a>")
if ($env_support);
push(@crlinks, &ui_link("edit_cron.cgi?new=1", $text{'index_create'}) );
push(@crlinks, &ui_link("edit_env.cgi?new=1", $text{'index_ecreate'}) ) if ($env_support);
}
if ($config{cron_allow_file} && $config{cron_deny_file} && $access{'allow'}) {
push(@crlinks, "<a href=edit_allow.cgi>$text{'index_allow'}</a>");
push(@crlinks, &ui_link("edit_allow.cgi", $text{'index_allow'}) );
}
# Build a list of cron job rows to show
@@ -101,17 +98,17 @@ foreach $u (@ulist) {
if ($job->{'name'}) {
# An environment variable - show the name only
$cmdidx = scalar(@cols);
push(@cols, "<a href=\"edit_env.cgi?idx=$idx\">".
push(@cols, &ui_link("edit_env.cgi?idx=".$idx,
"<i>$text{'index_env'}</i> ".
"<tt>$job->{'name'} = $job->{'value'}</tt>");
"<tt>$job->{'name'} = $job->{'value'}</tt>") );
$donelink = 1;
}
elsif (@exp && $access{'command'}) {
# A multi-part command
$cmdidx = scalar(@cols);
@exp = map { &html_escape($_) } @exp;
push(@cols, "<a href=\"edit_cron.cgi?idx=$idx\">".
join("<br>",@exp)."</a>");
push(@cols, &ui_link("edit_cron.cgi?idx=".$idx,
join("<br>",@exp)) );
$donelink = 1;
}
elsif ($access{'command'}) {
@@ -123,8 +120,7 @@ foreach $u (@ulist) {
$cmd = length($cmd) > $max ?
&html_escape(substr($cmd, 0, $max))." ..." :
$cmd !~ /\S/ ? "BLANK" : &html_escape($cmd);
push(@cols,
"<a href=\"edit_cron.cgi?idx=$idx\">$cmd</a>");
push(@cols, &ui_link("edit_cron.cgi?idx=".$idx, $cmd) );
$donelink = 1;
}
@@ -138,8 +134,7 @@ foreach $u (@ulist) {
push(@cols, $when);
}
else {
push(@cols,
"<a href='edit_cron.cgi?idx=$idx'>$when</a>");
push(@cols, &ui_link("edit_cron.cgi?idx=".$idx, $when) );
}
}
@@ -163,7 +158,7 @@ foreach $u (@ulist) {
if ($config{'show_run'} == 2 &&
($access{'kill'} || !$proc)) {
$lnk = $proc ? "kill_cron.cgi?idx=$idx" : "exec_cron.cgi?idx=$idx&bg=1";
push(@cols, "<a href='$lnk'>$txt</a>");
push(@cols, &ui_link($lnk, $txt) );
}
else {
push(@cols, $txt);
@@ -215,7 +210,7 @@ elsif (@rows) {
if ($in{'search'}) {
print "<b>",&text('index_searchres',
"<i>".&html_escape($in{'search'})."</i>"),"</b><p>\n";
push(@links, "<a href='index.cgi'>$text{'index_reset'}</a>");
push(@links, &ui_link("index.cgi", $text{'index_reset'}) );
}
print &ui_form_start("delete_jobs.cgi", "post");
print &ui_links_row(\@links);
@@ -245,7 +240,7 @@ elsif (@rows) {
else {
# Show message
if ($in{'search'}) {
push(@crlinks, "<a href='index.cgi'>$text{'index_reset'}</a>");
push(@crlinks, &ui_link("index.cgi", $text{'index_reset'}) );
}
print $in{'search'} ? "<b>".&text('index_esearch',
"<i>".&html_escape($in{'search'})."</i>")."</b> <p>" :

12
fsdump/index.cgi
View File

@@ -37,8 +37,7 @@ if (@dumps) {
@dirs = &dump_directories($d);
$dirs = join("<br>", map { &html_escape($_) } @dirs);
if ($access{'edit'}) {
push(@cols, "<a href='edit_dump.cgi?id=$d->{'id'}'>".
"<tt>$dirs</tt></a>");
push(@cols, &ui_link("edit_dump.cgi?id=".$d->{'id'}, "<tt>$dirs</tt>") );
}
else {
push(@cols, "<tt>$dirs</tt>");
@@ -57,8 +56,7 @@ if (@dumps) {
else {
push(@cols, &cron::when_text($d, 1));
}
push(@cols, "<a href='backup.cgi?id=$d->{'id'}'>".
"$text{'index_now'}</a>");
push(@cols, &ui_link("backup.cgi?id=".$d->{'id'}, $text{'index_now'}) );
print &ui_checked_columns_row(\@cols, \@tds, "d", $d->{'id'});
}
print &ui_columns_end();
@@ -134,11 +132,13 @@ if (@running) {
local $action;
if ($d->{'status'}->{'status'} eq 'running' ||
$d->{'status'}->{'status'} eq 'tape') {
$action .= "<a href='kill.cgi?id=$d->{'id'}&pid=$d->{'pid'}'>$text{'index_kill'}</a>\n";
$action .= &ui_link("kill.cgi?id=$d->{'id'}&pid=".$d->{'pid'}, $text{'index_kill'});
$action .= "\n";
}
if ($d->{'status'}->{'status'} eq 'tape') {
$action .= "&nbsp;|&nbsp;\n";
$action .= "<a href='newtape.cgi?id=$d->{'id'}&pid=$d->{'pid'}'>$text{'index_newtape'}</a>\n";
$action .= &ui_link("newtape.cgi?id=".$d->{'id'}."&pid=".$d->{'pid'}, $text{'index_newtape'});
$action .= "\n";
}
if ($d->{'status'}->{'status'} eq 'complete' ||
$d->{'status'}->{'status'} eq 'failed' ||

5
inittab/index.cgi
View File

@@ -10,7 +10,7 @@ require './inittab-lib.pl';
print &ui_form_start("delete.cgi", "post");
@links = ( &select_all_link("d"),
&select_invert_link("d"),
"<a href=edit_inittab.cgi?new=1>$text{'inittab_new'}</a>" );
&ui_link("edit_inittab.cgi?new=1", $text{'inittab_new'}) );
print &ui_links_row(\@links);
@tds = ( "width=5" );
print &ui_columns_start([ "",
@@ -22,8 +22,7 @@ print &ui_columns_start([ "",
100, 0, \@tds);
foreach $i (&parse_inittab()) {
local @cols;
push(@cols, "<a href='edit_inittab.cgi?id=$i->{'id'}'>".
&html_escape($i->{'id'})."</a>");
push(@cols, &ui_link("edit_inittab.cgi?id=".$i->{'id'}, &html_escape($i->{'id'})) );
push(@cols, $i->{'comment'} ? "<font color=#ff0000>$text{'no'}</font>"
: $text{'yes'});
local @rls = @{$i->{'levels'}};

9
logrotate/index.cgi
View File

@@ -52,9 +52,9 @@ foreach $c ($config{'sort_mode'} ?
local $p = &get_period($c->{'members'}) || $defp;
local $r = &find_value("postrotate", $c->{'members'});
$r =~ s/\n/<br>\n/g;
push(@table, [ "<a href='edit_log.cgi?idx=$c->{'index'}'>".
push(@table, [ &ui_link("edit_log.cgi?idx=".$c->{'index'},
join(" ", map { "<tt>$_</tt><br>" }
@{$c->{'name'}})."</a>",
@{$c->{'name'}}) ),
$text{'period_'.$p} ||
"<i>$text{'index_notset'}</i>",
$r ? "<tt><font size=-1>$r</font></tt>"
@@ -66,7 +66,7 @@ if (@table) {
print &ui_form_start("delete_logs.cgi", "post");
@links = ( &select_all_link("d"),
&select_invert_link("d"),
"<a href='edit_log.cgi?new=1'>$text{'index_add'}</a>" );
&ui_link("edit_log.cgi?new=1", $text{'index_add'}) );
print &ui_links_row(\@links);
@tds = ( "width=5", "nowrap valign=top", "valign=top", "valign=top" );
print &ui_columns_start([ "",
@@ -85,7 +85,8 @@ if (@table) {
}
else {
print "<p><b>$text{'index_none'}</b><p>\n";
print "<a href='edit_log.cgi?new=1'>$text{'index_add'}</a><p>\n";
print &ui_link("edit_log.cgi?new=1", $text{'index_add'});
print "<p>\n";
}
# Show buttons for editing global config and scheduling

7
mailcap/index.cgi
View File

@@ -9,7 +9,7 @@ if (@mailcap) {
print &ui_form_start("delete.cgi", "post");
@links = ( &select_all_link("d"),
&select_invert_link("d"),
"<a href='edit.cgi?new=1'>$text{'index_add'}</a>" );
&ui_link("edit.cgi?new=1", $text{'index_add'}) );
print &ui_links_row(\@links);
@tds = ( "width=5" );
@@ -22,7 +22,7 @@ if (@mailcap) {
], 100, 0, \@tds);
foreach $m (@mailcap) {
print &ui_checked_columns_row([
"<a href='edit.cgi?index=$m->{'index'}'>$m->{'type'}</a>",
&ui_link("edit.cgi?index=".$m->{'index'}, $m->{'type'}),
$m->{'program'},
$m->{'cmt'} || $m->{'args'}->{'description'},
$m->{'enabled'} ? $text{'yes'} :
@@ -39,7 +39,8 @@ if (@mailcap) {
}
else {
print "<b>$text{'index_none'}</b><p>\n";
print "<a href='edit.cgi?new=1'>$text{'index_add'}</a><p>\n";
print &ui_link("edit.cgi?new=1", $text{'index_add'});
print "<p>\n";
}
&ui_print_footer("/", $text{'index'});

6
man/search.cgi
View File

@@ -276,12 +276,10 @@ if (@rv) {
foreach $r (@rv) {
local @cols;
if ($r->[1] =~ /^(http|ftp|https):/) {
push(@cols, "<a href='$r->[1]' target=_blank>".
&html_escape($r->[2])."</a>");
push(@cols, &ui_link($r->[1], &html_escape($r->[2]), undef, "target=_blank") );
}
else {
push(@cols, "<a href='$r->[1]&for=".&urlize($in{'for'}).
"'>".&html_escape($r->[2])."</a>");
push(@cols, &ui_link($r->[1]."&for=".&urlize($in{'for'}), &html_escape($r->[2]) ) );
}
push(@cols, $r->[0]);
push(@cols, &html_escape($r->[3]));

8
package-updates/index.cgi
View File

@@ -23,9 +23,9 @@ foreach $m ('current', 'updates', 'new',
push(@mlinks, "<b>$mmsg</b>");
}
else {
push(@mlinks, "<a href='index.cgi?mode=$m&all=".
push(@mlinks, &ui_link("index.cgi?mode=$m&all=".
&urlize($in{'all'})."&search=".
&urlize($in{'search'})."'>$mmsg</a>");
&urlize($in{'search'}), $mmsg) );
}
}
push(@grid, $text{'index_mode'}, &ui_links_row(\@mlinks));
@@ -109,10 +109,10 @@ foreach $p (sort { $a->{'name'} cmp $b->{'name'} } (@current, @avail)) {
{ 'type' => 'checkbox', 'name' => 'u',
'value' => $p->{'update'}."/".$p->{'system'},
'checked' => $need },
"<a href='view.cgi?mode=$in{'mode'}&name=".
&ui_link("view.cgi?mode=$in{'mode'}&name=".
&urlize($p->{'name'})."&system=".
&urlize($p->{'system'})."&search=".
&urlize($in{'search'})."'>$p->{'name'}</a>",
&urlize($in{'search'}), $p->{'name'}),
$p->{'desc'},
$msg,
$source ? ( $source ) : $anysource ? ( "") : ( ),

23
pam/edit_pam.cgi
View File

@@ -49,16 +49,15 @@ foreach $t ('auth', 'account', 'session', 'password') {
local @cols;
if ($m->{'control'} eq 'include') {
# Included module
push(@cols, "<a href='edit_inc.cgi?".
"idx=$pam->{'index'}&midx=$m->{'index'}'>".
&text('edit_inc', "<tt>$mn</tt>")."</a>");
push(@cols, &ui_link("edit_inc.cgi?".
"idx=".$pam->{'index'}."&midx=".$m->{'index'},
&text('edit_inc', "<tt>$mn</tt>")) );
@rtds = ( "colspan=4", "width=5%" );
}
else {
# Regular PAM module
push(@cols, "<a href='edit_mod.cgi?".
"idx=$pam->{'index'}&midx=$m->{'index'}'>".
"$mn</a>");
push(@cols, &ui_link("edit_mod.cgi?".
"idx=".$pam->{'index'}."&midx=".$m->{'index'}, $mn) );
push(@cols, $text{$mn});
push(@cols, $text{'control_'.$m->{'control'}});
push(@cols, $m->{'args'});
@@ -69,17 +68,15 @@ foreach $t ('auth', 'account', 'session', 'password') {
$mv .= "<img src=images/gap.gif>";
}
else {
$mv .= "<a href='move.cgi?idx=$pam->{'index'}&".
"midx=$m->{'index'}&down=1'><img ".
"src=images/down.gif border=0></a>";
$mv .= &ui_link("move.cgi?idx=$pam->{'index'}&".
"midx=".$m->{'index'}."&down=1", "<img src='images/down.gif' border=0>");
}
if ($m eq $mods[0]) {
$mv .= "<img src=images/gap.gif>";
$mv .= "<img src='images/gap.gif'>";
}
else {
$mv .= "<a href='move.cgi?idx=$pam->{'index'}&".
"midx=$m->{'index'}&up=1'><img ".
"src=images/up.gif border=0></a>";
$mv .= &ui_link("move.cgi?idx=".$pam->{'index'}."&".
"midx=".$m->{'index'}."&up=1", "<img src='images/up.gif' border=0>");
}
push(@cols, $mv);
$ptable .= &ui_columns_row(\@cols, \@rtds);

5
pam/index.cgi
View File

@@ -14,7 +14,7 @@ if (!@pams) {
exit;
}
@links = ( "<a href='create_form.cgi'>$text{'index_add'}</a>" );
@links = ( &ui_link("create_form.cgi", $text{'index_add'}) );
print &ui_links_row(\@links);
$mid = int((@pams-1) / 2);
print "<table width=100%><tr> <td width=50% valign=top>\n";
@@ -32,8 +32,7 @@ print &ui_columns_start([ $text{'index_name'}, $text{'index_desc'} ], 100);
foreach $p (@_) {
local $t = $text{'desc_'.$p->{'name'}};
print &ui_columns_row([
"<a href='edit_pam.cgi?idx=$p->{'index'}'>".
&html_escape($p->{'name'})."</a>",
&ui_link("edit_pam.cgi?idx=".$p->{'index'}, &html_escape($p->{'name'}) ),
$p->{'desc'} || $t
]);
}

6
proc/edit_proc.cgi
View File

@@ -28,8 +28,8 @@ print &ui_table_row($text{'pid'}, $pinfo{pid});
if ($pinfo{ppid}) {
local %ppinfo = &process_info($pinfo{ppid});
print &ui_table_row($text{'parent'},
"<a href=\"edit_proc.cgi?$ppinfo{pid}\">".
&cut_string($ppinfo{'args'}, 30)."</a>");
&ui_link("edit_proc.cgi?".$ppinfo{pid},
&cut_string($ppinfo{'args'}, 30)) );
}
else {
print &ui_table_row($text{'parent'}, $text{'edit_none'});
@@ -139,7 +139,7 @@ if (@sub) {
foreach $s (@sub) {
local $p = $s->{'pid'};
print &ui_columns_row([
"<a href=\"edit_proc.cgi?$p\">$p</a>",
&ui_link("edit_proc.cgi?".$p, $p),
&cut_string($s->{args}, 80),
]);
}

2
proc/index_cpu.cgi
View File

@@ -37,7 +37,7 @@ foreach $pr (@procs) {
$p = $pr->{'pid'};
local @cols;
if (&can_edit_process($pr->{'user'})) {
push(@cols, "<a href=\"edit_proc.cgi?$p\">$p</a>");
push(@cols, &ui_link("edit_proc.cgi?".$p, $p) );
}
else {
push(@cols, $p);

2
proc/index_search.cgi
View File

@@ -158,7 +158,7 @@ if (%in) {
push(@pidlist, $p);
local @cols;
if (&can_edit_process($d->{'user'})) {
push(@cols, "<a href=\"edit_proc.cgi?$p\">$p</a>");
push(@cols, &ui_link("edit_proc.cgi?".$p, $p) );
}
else {
push(@cols, $p);

2
proc/index_size.cgi
View File

@@ -34,7 +34,7 @@ foreach $pr (@procs) {
$p = $pr->{'pid'};
local @cols;
if (&can_edit_process($pr->{'user'})) {
push(@cols, "<a href=\"edit_proc.cgi?$p\">$p</a>");
push(@cols, &ui_link("edit_proc.cgi?".$p, $p) );
}
else {
push(@cols, $p);

2
proc/index_tree.cgi
View File

@@ -40,7 +40,7 @@ local(@ch, $_, $args);
if (&can_view_process($usermap{$_[1]})) {
local @cols;
if (&can_edit_process($usermap{$_[1]})) {
push(@cols, "$_[0]<a href=\"edit_proc.cgi?$_[1]\">$_[1]</a>");
push(@cols, $_[0].&ui_link("edit_proc.cgi?".$_[1], $_[1]) );
}
else {
push(@cols, "$_[0]$_[1]");

2
proc/index_user.cgi
View File

@@ -23,7 +23,7 @@ foreach $u (@users) {
$p = $pr->{'pid'};
local @cols;
if (&can_edit_process($pr->{'user'})) {
push(@cols, "<a href=\"edit_proc.cgi?$p\">$p</a>");
push(@cols, &ui_link("edit_proc.cgi?".$p, $p) );
}
else {
push(@cols, $p);

4
proc/index_zone.cgi
View File

@@ -21,7 +21,9 @@ foreach $z (@zones) {
$p = $pr->{'pid'};
print "<tr $cb>\n";
if (&can_edit_process($pr->{'user'})) {
print "<td><a href=\"edit_proc.cgi?$p\">$p</a></td>\n";
print "<td>";
print &ui_link("edit_proc.cgi?".$p, $p);
print "</td>\n";
}
else {
print "<td>$p</td>\n";

7
proc/proc-lib.pl
View File

@@ -66,12 +66,7 @@ local @links;
foreach $l ("tree", "user", "size", "cpu", ($has_zone ? ("zone") : ()),
"search", "run") {
next if ($l eq "run" && !$access{'run'});
local $link;
if ($l ne $_[0]) { $link .= "<a href=index_$l.cgi>"; }
else { $link .= "<b>"; }
$link .= $text{"index_$l"};
if ($l ne $_[0]) { $link .= "</a>"; }
else { $link .= "</b>"; }
my $link = ( $l ne $_[0] ? &ui_link("index_".$l.".cgi", $text{"index_$l"}) : "<b>".$text{"index_$l"}."</b>" );
push(@links, $link);
}
print &ui_links_row(\@links);

2
quota/group_filesys.cgi
View File

@@ -54,7 +54,7 @@ if ($n) {
$bsize = &block_size($f);
local @cols;
if ($fslist{$f} && !$access{'ro'}) {
push(@cols, "<a href=\"edit_group_quota.cgi?filesys=$f&group=$u&source=1\">$f</a>");
push(@cols, &ui_link("edit_group_quota.cgi?filesys=$f&group=$u&source=1", $f) );
}
else {
push(@cols, $f);

16
quota/index.cgi
View File

@@ -71,19 +71,15 @@ if (@list) {
push(@cols, $dir);
}
elsif ($qc == 1) {
push(@cols, "<a href=\"list_users.cgi?dir=".
&urlize($dir)."&can=",&urlize($qc),"\">$dir</a>");
push(@cols, &ui_link("list_users.cgi?dir=".&urlize($dir)."&can=".&urlize($qc), $dir) );
}
elsif ($qc == 2) {
push(@cols, "<a href=\"list_groups.cgi?dir=".
&urlize($dir)."&can=",&urlize($qc),"\">$dir</a>");
push(@cols, &ui_link("list_groups.cgi?dir=".&urlize($dir)."&can=".&urlize($qc), $dir) );
}
elsif ($qc == 3) {
push(@cols, "<a href=\"list_users.cgi?dir=".
&urlize($dir)."&can=".&urlize($qc).
"\">$dir (users)</a><br>".
"<a href=\"list_groups.cgi?dir=".&urlize($dir).
"&can=".&urlize($qc)."\">$dir (groups)</a>");
push(@cols, &ui_link("list_users.cgi?dir=".&urlize($dir)."&can=".&urlize($qc), $dir." (users)").
"<br>".
&ui_link("list_groups.cgi?dir=".&urlize($dir)."&can=".&urlize($qc), $dir." (groups)") );
}
push(@cols, &foreign_call("mount", "fstype_name", $f->[2]));
@@ -91,7 +87,7 @@ if (@list) {
push(@cols, $msg);
if ($access{'enable'}) {
if ($canactivate) {
push(@cols, "<a href=\"activate.cgi?dir=$dir&active=$qn&mode=$qc\">$chg</a>");
push(@cols, &ui_link("activate.cgi?dir=$dir&active=$qn&mode=$qc", $chg) );
}
else {
push(@cols, $chg);

11
quota/list_groups.cgi
View File

@@ -30,11 +30,9 @@ print &ui_tabs_start(\@tabs, "mode", $in{'mode'} || 'list', 1);
# Build user list links
@ulinks = ( );
if ($access{'ggrace'}) {
push(@ulinks, "<a href='group_grace_form.cgi?filesys=".&urlize($f).
"'>$text{'lusers_egrace'}</a>");
push(@ulinks, &ui_link("group_grace_form.cgi?filesys=".&urlize($f), $text{'lusers_egrace'}) );
}
push(@ulinks, "<a href='check_quotas.cgi?filesys=".&urlize($f).
"&source=group'>$text{'lusers_check'}</a>");
push(@ulinks, &ui_link("check_quotas.cgi?filesys=".&urlize($f)."&source=group", $text{'lusers_check'}) );
# Groups list, in a tab
print &ui_tabs_start_tab("mode", "list");
@@ -151,10 +149,9 @@ elsif ($n) {
push(@cols, $group{$i,'group'});
}
else {
push(@cols, "<a href=\"edit_group_quota.cgi?group=".
push(@cols, &ui_link("edit_group_quota.cgi?group=".
&urlize($group{$i,'group'})."&filesys=".
&urlize($f)."&source=0\">$group{$i,'group'}".
"</a>");
&urlize($f)."&source=0", $group{$i,'group'}) );
}
my $pc_hblocks=0;
my $pc_sblocks=0;

11
quota/list_users.cgi
View File

@@ -30,11 +30,9 @@ print &ui_tabs_start(\@tabs, "mode", $in{'mode'} || 'list', 1);
# Build user list links
@ulinks = ( );
if ($access{'ugrace'}) {
push(@ulinks, "<a href='user_grace_form.cgi?filesys=".&urlize($f).
"'>$text{'lusers_egrace'}</a>");
push(@ulinks, &ui_link("user_grace_form.cgi?filesys=".&urlize($f), $text{'lusers_egrace'}) );
}
push(@ulinks, "<a href='check_quotas.cgi?filesys=".&urlize($f).
"&source=user'>$text{'lusers_check'}</a>");
push(@ulinks, &ui_link("check_quotas.cgi?filesys=".&urlize($f)."&source=user", $text{'lusers_check'}) );
# Users list, in a tab
print &ui_tabs_start_tab("mode", "list");
@@ -153,10 +151,9 @@ elsif ($n) {
push(@cols, $user{$i,'user'});
}
else {
push(@cols, "<a href=\"edit_user_quota.cgi?user=".
push(@cols, &ui_link("edit_user_quota.cgi?user=".
&urlize($user{$i,'user'})."&filesys=".
&urlize($f)."&source=0\">$user{$i,'user'}".
"</a>");
&urlize($f)."&source=0", $user{$i,'user'}) );
}
my $pc_hblocks=0;
my $pc_sblocks=0;

2
quota/user_filesys.cgi
View File

@@ -54,7 +54,7 @@ if ($n) {
$bsize = &block_size($f);
local @cols;
if ($fslist{$f} && !$access{'ro'}) {
push(@cols, "<a href=\"edit_user_quota.cgi?filesys=$f&user=$u&source=1\">$f</a>");
push(@cols, &ui_link("edit_user_quota.cgi?filesys=$f&user=$u&source=1", $f) );
}
else {
push(@cols, $f);

5
software/file_info.cgi
View File

@@ -62,9 +62,8 @@ else {
$packages{$i,'version'} ne $vers[$j] ||
$packages{$i,'name'} ne $pkgs[$j]);
local @cols;
push(@cols, "<a href=\"edit_pack.cgi?package=".
&urlize($pkgs[$j])."&version=".&urlize($vers[$j]).
"\">$pkgs[$j]</a>");
push(@cols, &ui_link("edit_pack.cgi?package=".
&urlize($pkgs[$j])."&version=".&urlize($vers[$j]), $pkgs[$j]) );
$c = $packages{$i,'class'};
push(@cols, $c || $text{'file_none'});
push(@cols, $packages{$i,'desc'});

2
software/find.cgi
View File

@@ -55,7 +55,7 @@ if (defined($search)) {
$sel = $a->{'select'} || $a->{'name'};
$epoch = $a->{'epoch'} ? "$a->{'epoch'}:" : "";
print &ui_columns_row(
[ "<a href='' onClick='sel(\"$sel\")'>$a->{'name'}</a>",
[ &ui_link("#", $a->{'name'}, undef, "onClick='sel(\"$sel\");'"),
$hasver ? ($epoch.$a->{'version'}) : ( ),
$hasdesc ? ($a->{'desc'}) : ( ) ]);
}

18
software/list_pack.cgi
View File

@@ -21,23 +21,21 @@ for($i=0; $i<$n; $i++) {
$sz = $files{$i,'size'};
$ty = $files{$i,'type'};
local @cols;
$ls = "<a href=\"file_info.cgi?file=".&urlize($files{$i,'path'})."\">";
$ls = "file_info.cgi?file=".&urlize($files{$i,'path'});
$le = "</a>";
if ($ty == 3 || $ty == 4) {
# Hard or soft link
push(@cols, $ls.&html_escape($files{$i,'path'}).
" -> ".&html_escape($files{$i,'link'}).$le);
push(@cols, &ui_link($ls, &html_escape($files{$i,'path'}).
" -> ".&html_escape($files{$i,'link'})) );
push(@cols, "", "");
}
else {
$table = "<table width=100% cellpadding=0 ".
"cellspacing=0><tr><td>$ls".
&html_escape($files{$i,'path'}).
"$le</td> <td align=right>\n";
$table = "<table width=100% cellpadding=0 cellspacing=0><tr><td>".
&ui_link($ls, &html_escape($files{$i,'path'}) ).
"</td><td align=right>\n";
if ($ty == 0 || $ty == 5) {
$table .= "<a href='view.cgi".
&html_escape($files{$i,'path'}).
"'>$text{'list_view'}</a>";
$table .= &ui_link("view.cgi".
&html_escape($files{$i,'path'}), $text{'list_view'});
}
$table .= "</td></tr></table>";
push(@cols, $table);

4
software/rhn.cgi
View File

@@ -35,7 +35,9 @@ else {
"$text{'rhn_version'}</b></td> </tr>\n";
}
print "<tr>\n";
print "<td><a href='' onClick='sel(\"$1\")'>$1</a></td>\n";
print "<td>";
print &ui_link("#", $1, undef, "onClick='sel(\"$1\");'");
print "</td>\n";
print "<td align=right>$2 - $3</td>\n";
print "</tr>\n";
}

3
software/rpmfind.cgi
View File

@@ -70,8 +70,7 @@ if ($in{'search'}) {
$text{'rpm_finddesc'} ], 100);
foreach $r (@rv) {
print &ui_columns_row([
"<a href='' onClick='sel(\"$r->{'url'}\")'>".
"$r->{'file'}</a>",
&ui_link("#", $r->{'file'}, undef, "onClick='sel(\"$r->{'url'}\");'"),
$r->{'dist'},
$r->{'desc'}
]);

6
software/search.cgi
View File

@@ -49,10 +49,10 @@ if (@match) {
local @cols;
local $v = $packages{$i,'shortversion'} ||
$packages{$i,'version'};
push(@cols, "<a href=\"edit_pack.cgi?search=$s&package=".
push(@cols, &ui_link("edit_pack.cgi?search=$s&package=".
&urlize($packages{$i,'name'})."&version=".
&urlize($packages{$i,'version'})."\">".&html_escape(
$packages{$i,'name'}.($v ? " $v" : ""))."</a>");
&urlize($packages{$i,'version'}), &html_escape(
$packages{$i,'name'}.($v ? " $v" : "")) ) );
$c = $packages{$i,'class'};
push(@cols, $c ? &html_escape($c)
: $text{'search_none'});

19
software/tree.cgi
View File

@@ -44,8 +44,10 @@ print "<table width=100%>\n";
&traverse("", 0);
print "</table>\n";
if ($hasclasses) {
print "<a href=closeall.cgi>$text{'index_close'}</a>\n";
print "<a href=openall.cgi>$text{'index_open'}</a><p>\n";
print &ui_link("closeall.cgi", $text{'index_close'});
print "\n";
print &ui_link("openall.cgi", $text{'index_open'});
print "<p>\n";
}
&ui_print_footer("", $text{'index_return'});
@@ -59,9 +61,10 @@ print "<tr> <td>", $spacer x $_[1];
if ($_[0]) {
print "<a name=\"$_[0]\"></a>\n";
$act = $heiropen{$_[0]} ? "close" : "open";
print "<a href=\"$act.cgi?what=",&urlize($_[0]),"\">";
my $link = "$act.cgi?what=".&urlize($_[0]);
$_[0] =~ /([^\/]+)$/;
print "<img border=0 src=images/$act.gif></a>&nbsp; $1</td>\n";
print &ui_link($link, "<img border=0 src='images/$act.gif'>");
print "&nbsp; $1</td>\n";
}
else {
print "<img src=images/close.gif> <i>$text{'index_all'}</i></td>\n";
@@ -74,10 +77,10 @@ if ($heiropen{$_[0]}) {
if ($class[$i] eq $_[0]) {
print "<tr> <td nowrap>", $spacer x ($_[1]+1);
print "<img border=0 src=images/pack.gif></a>&nbsp;\n";
print "<a href=\"edit_pack.cgi?package=",
&urlize($pack[$i]),"&version=",
&urlize($vers[$i]),"\">",&html_escape($pack[$i].
($svers[$i] ? " $svers[$i]" : "")),"</a></td>\n";
print &ui_link("edit_pack.cgi?package=".
&urlize($pack[$i])."&version=".
&urlize($vers[$i]), &html_escape($pack[$i].
($svers[$i] ? " $svers[$i]" : "")) )."</td>\n";
print "<td>",&html_escape($desc[$i]),"</td>\n";
print "</tr>\n";
}

18
syslog/index.cgi
View File

@@ -30,8 +30,7 @@ if (!-r $config{'syslog_conf'}) {
@links = ( );
if ($access{'syslog'}) {
$conf = &get_config();
push(@links, "<a href='edit_log.cgi?new=1'>$text{'index_add'}</a>")
if (!$access{'noedit'});
push(@links, &ui_link("edit_log.cgi?new=1", $text{'index_add'}) ) if (!$access{'noedit'});
}
print &ui_links_row(\@links);
print &ui_columns_start([
@@ -77,8 +76,8 @@ if ($access{'syslog'}) {
push(@cols, $name);
}
else {
push(@cols, "<a href='edit_log.cgi?".
"idx=$c->{'index'}'>$name</a>");
push(@cols, &ui_link("edit_log.cgi?".
"idx=".$c->{'index'}, $name) );
}
if ($config{'tags'}) {
push(@cols, $c->{'section'}->{'tag'} eq '*' ?
@@ -89,8 +88,8 @@ if ($access{'syslog'}) {
push(@cols, join("&nbsp;;&nbsp;",
map { &html_escape($_) } @{$c->{'sel'}}));
if ($c->{'file'} && -f $c->{'file'}) {
push(@cols, "<a href='save_log.cgi?idx=$c->{'index'}&".
"view=1'>$text{'index_view'}</a>\n");
push(@cols, &ui_link("save_log.cgi?idx=".$c->{'index'}."&".
"view=1", $text{'index_view'}) );
}
else {
push(@cols, "");
@@ -120,8 +119,8 @@ if (@others) {
push(@cols, $o->{'active'} ? $text{'yes'} :
"<font color=#ff0000>$text{'no'}</font>");
push(@cols, $o->{'desc'});
push(@cols, "<a href='save_log.cgi?oidx=$o->{'mindex'}".
"&omod=$o->{'mod'}&view=1'>$text{'index_view'}</a>");
push(@cols, &ui_link("save_log.cgi?oidx=$o->{'mindex'}".
"&omod=$o->{'mod'}&view=1", $text{'index_view'}) );
print &ui_columns_row(\@cols);
}
}
@@ -136,8 +135,7 @@ foreach $e (&extra_log_files()) {
}
push(@cols, $text{'yes'});
push(@cols, $e->{'desc'});
push(@cols, "<a href='save_log.cgi?extra=$e->{'file'}&view=1'>".
"$text{'index_view'}</a>");
push(@cols, &ui_link("save_log.cgi?extra=$e->{'file'}&view=1", $text{'index_view'}) );
print &ui_columns_row(\@cols);
}

4
useradmin/edit_group.cgi
View File

@@ -100,8 +100,8 @@ if ($n ne "") {
@uprilinks = ( );
foreach $u (@upri) {
if (&can_edit_user(\%access, $u)) {
push(@uprilinks, "<a href='edit_user.cgi?".
"user=$u->{'user'}'>".&html_escape($u->{'user'})."</a>");
push(@uprilinks, &ui_link("edit_user.cgi?".
"user=$u->{'user'}", &html_escape($u->{'user'}) ) );
}
else {
push(@uprilinks, $u->{'user'});

13
useradmin/index.cgi
View File

@@ -221,16 +221,15 @@ if ($access{'ucreate'}) {
}
else { $cancreate = 1; }
if ($cancreate) {
push(@rv, "<a href=\"edit_user.cgi\">".
"$text{'index_createuser'}</a>");
push(@rv, &ui_link("edit_user.cgi", $text{'index_createuser'}) );
}
else {
push(@rv, $text{'index_nomoreusers'});
}
}
push(@rv, "<a href=\"batch_form.cgi\">$text{'index_batch'}</a>")
push(@rv, &ui_link("batch_form.cgi", $text{'index_batch'}) )
if ($access{'batch'});
push(@rv, "<a href=\"export_form.cgi\">$text{'index_export'}</a>")
push(@rv, &ui_link("export_form.cgi", $text{'index_export'}) )
if ($access{'export'});
return @rv;
}
@@ -259,15 +258,15 @@ if ($access{'gcreate'} == 1) {
}
else { $cancreate = 1; }
if ($cancreate) {
push(@rv, "<a href=\"edit_group.cgi\">$text{'index_creategroup'}</a>");
push(@rv, &ui_link("edit_group.cgi", $text{'index_creategroup'}) );
}
else {
push(@rv, $text{'index_nomoregroups'});
}
}
push(@rv, "<a href=\"gbatch_form.cgi\">$text{'index_batch'}</a>")
push(@rv, &ui_link("gbatch_form.cgi", $text{'index_batch'}) )
if ($access{'batch'});
push(@rv, "<a href=\"gexport_form.cgi\">$text{'index_export'}</a>")
push(@rv, &ui_link("gexport_form.cgi", $text{'index_export'}) )
if ($access{'export'});
return @rv;
}

4
useradmin/list_who.cgi
View File

@@ -17,8 +17,8 @@ foreach $w (@whos) {
$tm = defined(&mailboxes::parse_mail_date) ?
&mailboxes::parse_mail_date($w->{'when'}) : undef;
push(@table, [
"<a href='list_logins.cgi?username=".&urlize($w->{'user'})."'>".
&html_escape($w->{'user'})."</a>",
&ui_link("list_logins.cgi?username=".&urlize($w->{'user'}),
&html_escape($w->{'user'}) ),
&html_escape($w->{'tty'}),
&html_escape($tm ? &make_date($tm) : $w->{'when'}),
$w->{'from'} ? &html_escape($w->{'from'})

8
useradmin/my_group_chooser.cgi
View File

@@ -68,7 +68,9 @@ if ($in{'multi'}) {
foreach $u (&get_groups_list()) {
if ($in{'group'} eq $u->[0]) { print "<tr class='filter_match' $cb>\n"; }
else { print "<tr class='filter_match'>\n"; }
print "<td width=20%><a href=\"\" onClick='return addgroup(\"$u->[0]\", \"$u->[3]\")'>$u->[0]</a></td>\n";
print "<td width=20%>";
print &ui_link("#", $u->[0], undef, "onClick='return addgroup(\"$u->[0]\", \"$u->[3]\");'");
print "</td>\n";
print "<td>$u->[3]</td> </tr>\n";
$cnt++;
}
@@ -155,7 +157,9 @@ else {
foreach $u (&get_groups_list()) {
if ($in{'group'} eq $u->[0]) { print "<tr class='filter_match' $cb>\n"; }
else { print "<tr class='filter_match'>\n"; }
print "<td width=20%><a href=\"\" onClick='return select(\"$u->[0]\")'>".&html_escape($u->[0])."</a></td>\n";
print "<td width=20%>";
print &ui_link("#", &html_escape($u->[0]), undef, "onClick='return select(\"$u->[0]\");'");
print "</td>\n";
print "<td>".&html_escape($u->[3])."</td> </tr>\n";
$cnt++;
}

8
useradmin/my_user_chooser.cgi
View File

@@ -61,7 +61,9 @@ if ($in{'multi'}) {
if ($in{'user'} eq $u->[0]) { print "<tr class='filter_match' $cb>\n"; }
else { print "<tr class='filter_match'>\n"; }
$u->[6] =~ s/'/&#39;/g;
print "<td width=20%><a href=\"\" onClick='return adduser(\"$u->[0]\", \"$u->[6]\")'>$u->[0]</a></td>\n";
print "<td width=20%>";
print &ui_link("#", $u->[0], undef, "onClick='return adduser(\"$u->[0]\", \"$u->[6]\");'");
print "</td>\n";
print "<td>$u->[6]</td> </tr>\n";
$cnt++;
}
@@ -148,7 +150,9 @@ else {
foreach $u (&get_users_list()) {
if ($in{'user'} eq $u->[0]) { print "<tr class='filter_match' $cb>\n"; }
else { print "<tr class='filter_match'>\n"; }
print "<td width=20%><a href=\"\" onClick='return select(\"$u->[0]\")'>$u->[0]</a></td>\n";
print "<td width=20%>";
print &ui_link("#", $u->[0], undef, "onClick='return select(\"$u->[0]\");'");
print "</td>\n";
print "<td>$u->[6]</td> </tr>\n";
$cnt++;
}

12
useradmin/user-lib.pl
View File

@@ -2520,12 +2520,10 @@ if ($_[0]->{'noedit'}) {
return $dis;
}
elsif ($_[0]->{'dn'}) {
return "<a href='edit_user.cgi?dn=".&urlize($_[0]->{'dn'})."'>".
"$dis</a>";
return &ui_link("edit_user.cgi?dn=".&urlize($_[0]->{'dn'}), $dis);
}
else {
return "<a href='edit_user.cgi?user=".&urlize($_[0]->{'user'})."'>".
"$dis</a>";
return &ui_link("edit_user.cgi?user=".&urlize($_[0]->{'user'}), $dis);
}
}
@@ -2540,12 +2538,10 @@ if ($_[0]->{'noedit'}) {
return &html_escape($_[0]->{'group'});
}
elsif ($_[0]->{'dn'}) {
return "<a href='edit_group.cgi?dn=".&urlize($_[0]->{'dn'})."'>".
&html_escape($_[0]->{'group'})."</a>";
return &ui_link("edit_group.cgi?dn=".&urlize($_[0]->{'dn'}), &html_escape($_[0]->{'group'}) );
}
else {
return "<a href='edit_group.cgi?group=".&urlize($_[0]->{'group'})."'>".
&html_escape($_[0]->{'group'})."</a>";
return &ui_link("edit_group.cgi?group=".&urlize($_[0]->{'group'}), &html_escape($_[0]->{'group'}) );
}
}

13
webmin/edit_ssl.cgi
View File

@@ -98,10 +98,8 @@ foreach $i ('cn', 'o', 'email', 'issuer_cn', 'issuer_o', 'issuer_email',
}
}
@clinks = (
"<a href='download_cert.cgi/cert.pem'>".
"$text{'ssl_pem'}</a>",
"<a href='download_cert.cgi/cert.p12'>".
"$text{'ssl_pkcs12'}</a>"
&ui_link("download_cert.cgi/cert.pem", $text{'ssl_pem'}),
&ui_link("download_cert.cgi/cert.p12", $text{'ssl_pkcs12'})
);
print &ui_table_row($text{'ssl_download'}, &ui_links_row(\@clinks), undef, [ "valign=middle","valign=middle" ]);
print &ui_table_end();
@@ -116,8 +114,8 @@ if (@ipkeys) {
$text{'ssl_cert'} ]);
foreach $k (@ipkeys) {
print &ui_columns_row([
"<a href='edit_ipkey.cgi?idx=$k->{'index'}'>".
join(", ", @{$k->{'ips'}})."</a>",
&ui_link("edit_ipkey.cgi?idx=".$k->{'index'},
join(", ", @{$k->{'ips'}}) ),
"<tt>$k->{'key'}</tt>",
$k->{'cert'} ? "<tt>$k->{'cert'}</tt>"
: $text{'ssl_cert_def'},
@@ -128,7 +126,8 @@ if (@ipkeys) {
else {
print "<b>$text{'ssl_ipkeynone'}</b><p>\n";
}
print "<a href='edit_ipkey.cgi?new=1'>$text{'ssl_addipkey'}</a><p>\n";
print &ui_link("edit_ipkey.cgi?new=1", $text{'ssl_addipkey'});
print "<p>\n";
print &ui_tabs_end_tab();
# SSL key generation form

4
webmin/edit_webmincron.cgi
View File

@@ -27,8 +27,8 @@ if (@wcrons) {
foreach my $w (@wcrons) {
my %minfo = &get_module_info($w->{'module'});
print &ui_checked_columns_row([
"<a href='view_webmincron.cgi?id=$w->{'id'}'>".
($minfo{'desc'} || $w->{'module'})."</a>",
&ui_link("view_webmincron.cgi?id=".$w->{'id'},
($minfo{'desc'} || $w->{'module'}) ),
$w->{'func'},
join(" ", @{$w->{'args'}}),
&cron::when_text($w, 1),

2
webmin/standard_chooser.cgi
View File

@@ -30,7 +30,7 @@ else {
my $minfo = { 'os_support' => $m->[3] };
next if (!&check_os_support($minfo));
push(@table, [
"<a href='' onClick='return select(\"$m->[0]\")'>$m->[0]</a>",
&ui_link("#", $m->[0], undef, "onClick='return select(\"$m->[0]\");'"),
&html_escape($m->[4]),
]);
$cnt++;

2
webmin/third_chooser.cgi
View File

@@ -26,7 +26,7 @@ else {
$cnt = 0;
foreach $m (@$mods) {
push(@table, [
"<a href='' onClick='return select(\"$m->[2]\")'>$m->[0]</a>",
&ui_link("#", $m->[0], undef, "onClick='return select(\"$m->[2]\");'"),
$m->[1] eq "NONE" ? "" : &html_escape($m->[1]),
$m->[3],
]);