*Replace more links with &ui_link call

This commit is contained in:
Derrick Hammer
2014-06-08 17:56:01 -04:00
parent 95b0bc7d83
commit 990d7d387d
64 changed files with 110 additions and 110 deletions

View File

@@ -1317,10 +1317,10 @@ if (!$job) {
}
else {
if ($j) {
return "<a href='edit_gjob.cgi?name=".&urlize($j)."'>$j ($c)</a>";
return &ui_link("edit_gjob.cgi?name=".&urlize($j)."","$j ($c)");
}
else {
return "<a href='edit_job.cgi?name=".&urlize($name)."'>$name</a>";
return &ui_link("edit_job.cgi?name=".&urlize($name)."",$name);
}
}
}

View File

@@ -34,7 +34,7 @@ if (@clients) {
}
else {
print "<b>$text{'clients_none'}</b><p>\n";
print "<a href='edit_client.cgi?new=1'>$text{'clients_add'}</a><br>\n";
print &ui_link("edit_client.cgi?new=1",$text{'clients_add'})<br>\n";
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -34,7 +34,7 @@ if (@devices) {
}
else {
print "<b>$text{'devices_none'}</b><p>\n";
print "<a href='edit_device.cgi?new=1'>$text{'devices_add'}</a><br>\n";
print &ui_link("edit_device.cgi?new=1",$text{'devices_add'})<br>\n";
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -11,7 +11,7 @@ if (@fdirectors) {
print &ui_form_start("delete_fdirectors.cgi", "post");
print &select_all_link("d"),"\n";
print &select_invert_link("d"),"\n";
print "<a href='edit_fdirector.cgi?new=1'>$text{'fdirectors_add'}</a><br>\n";
print &ui_link("edit_fdirector.cgi?new=1",$text{'fdirectors_add'})<br>\n";
@tds = ( "width=5", "width=30%", "width=70%" );
print &ui_columns_start([ "", $text{'fdirectors_name'},
$text{'fdirectors_pass'} ], "100%", 0, \@tds);
@@ -28,12 +28,12 @@ if (@fdirectors) {
print &ui_columns_end();
print &select_all_link("d"),"\n";
print &select_invert_link("d"),"\n";
print "<a href='edit_fdirector.cgi?new=1'>$text{'fdirectors_add'}</a><br>\n";
print &ui_link("edit_fdirector.cgi?new=1",$text{'fdirectors_add'})<br>\n";
print &ui_form_end([ [ "delete", $text{'fdirectors_delete'} ] ]);
}
else {
print "<b>$text{'fdirectors_none'}</b><p>\n";
print "<a href='edit_fdirector.cgi?new=1'>$text{'fdirectors_add'}</a><br>\n";
print &ui_link("edit_fdirector.cgi?new=1",$text{'fdirectors_add'})<br>\n";
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -36,7 +36,7 @@ if (@filesets) {
}
else {
print "<b>$text{'filesets_none'}</b><p>\n";
print "<a href='edit_fileset.cgi?new=1'>$text{'filesets_add'}</a><br>\n";
print &ui_link("edit_fileset.cgi?new=1",$text{'filesets_add'})<br>\n";
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -40,7 +40,7 @@ if (@jobs) {
}
else {
print "<b>$text{'jobs_none'}</b><p>\n";
print "<a href='edit_gjob.cgi?new=1'>$text{'gjobs_add'}</a><br>\n";
print &ui_link("edit_gjob.cgi?new=1",$text{'gjobs_add'})<br>\n";
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -44,7 +44,7 @@ if (@jobs) {
}
else {
print "<b>$text{'jobs_none'}</b><p>\n";
print "<a href='edit_job.cgi?new=1'>$text{'jobs_add'}</a><br>\n";
print &ui_link("edit_job.cgi?new=1",$text{'jobs_add'})<br>\n";
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -34,7 +34,7 @@ if (@pools) {
}
else {
print "<b>$text{'pools_none'}</b><p>\n";
print "<a href='edit_pool.cgi?new=1'>$text{'pools_add'}</a><br>\n";
print &ui_link("edit_pool.cgi?new=1",$text{'pools_add'})<br>\n";
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -34,7 +34,7 @@ if (@schedules) {
}
else {
print "<b>$text{'schedules_none'}</b><p>\n";
print "<a href='edit_schedule.cgi?new=1'>$text{'schedules_add'}</a><br>\n";
print &ui_link("edit_schedule.cgi?new=1",$text{'schedules_add'})<br>\n";
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -11,7 +11,7 @@ if (@sdirectors) {
print &ui_form_start("delete_sdirectors.cgi", "post");
print &select_all_link("d"),"\n";
print &select_invert_link("d"),"\n";
print "<a href='edit_sdirector.cgi?new=1'>$text{'sdirectors_add'}</a><br>\n";
print &ui_link("edit_sdirector.cgi?new=1",$text{'sdirectors_add'})<br>\n";
@tds = ( "width=5", "width=30%", "width=70%" );
print &ui_columns_start([ "", $text{'sdirectors_name'},
$text{'sdirectors_pass'} ], "100%", 0, \@tds);
@@ -28,12 +28,12 @@ if (@sdirectors) {
print &ui_columns_end();
print &select_all_link("d"),"\n";
print &select_invert_link("d"),"\n";
print "<a href='edit_sdirector.cgi?new=1'>$text{'sdirectors_add'}</a><br>\n";
print &ui_link("edit_sdirector.cgi?new=1",$text{'sdirectors_add'})<br>\n";
print &ui_form_end([ [ "delete", $text{'sdirectors_delete'} ] ]);
}
else {
print "<b>$text{'sdirectors_none'}</b><p>\n";
print "<a href='edit_sdirector.cgi?new=1'>$text{'sdirectors_add'}</a><br>\n";
print &ui_link("edit_sdirector.cgi?new=1",$text{'sdirectors_add'})<br>\n";
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -38,7 +38,7 @@ if (@storages) {
}
else {
print "<b>$text{'storages_none'}</b><p>\n";
print "<a href='edit_storage.cgi?new=1'>$text{'storages_add'}</a><br>\n";
print &ui_link("edit_storage.cgi?new=1",$text{'storages_add'})<br>\n";
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -65,6 +65,6 @@ if ($in{'pool'}) {
sub joblink
{
return $jobs{$_[0]} ? "<a href='edit_job.cgi?name=".&urlize($_[0])."'>$_[0]</a>" : $_[0];
return $jobs{$_[0]} ? &ui_link("edit_job.cgi?name=".&urlize($_[0])."","$_[0]") : $_[0];
}

View File

@@ -298,11 +298,11 @@ local $others = join("&", map { "open=$_" } grep { $_ ne $name } @open);
$others = "&$others" if ($others);
if ($open{$name}) {
print "<img src=images/open.gif border=0>\n";
print "<a href='right.cgi?$others'>$text</a>";
print &ui_link("right.cgi?$others",$text);
}
else {
print "<img src=images/closed.gif border=0>\n";
print "<a href='right.cgi?open=$name$others'>$text</a>";
print &ui_link("right.cgi?open=$name$others",$text);
}
print "</font><br>\n";
return $open{$name};

View File

@@ -389,7 +389,7 @@ if (@{$_[0]}) {
next if ($s->{'name'} =~ /^import/);
local (@clist, @dlist);
foreach $c (@{$s->{'cls'}}) {
push(@clist, $_[2] ? $c->{'name'} : "<a href='edit_class.cgi?cfd=$_[1]&idx=$s->{'index'}&cidx=$c->{'index'}'>$c->{'name'}</a>");
push(@clist, $_[2] ? $c->{'name'} : &ui_link("edit_class.cgi?cfd=$_[1]&idx=$s->{'index'}&cidx=$c->{'index'}",$c->{'name'}));
local $desc;
if ($s->{'name'} eq 'links') {
local @l = &parse_links($c);
@@ -554,7 +554,7 @@ if (@{$_[0]}) {
# "<img src=images/up.gif border=0></a>";
# }
if (!$_[2]) {
print "<a href='edit_class.cgi?cfd=$_[1]&idx=$s->{'index'}&new=1'>$text{'index_cadd'}</a></td>\n";
print &ui_link("edit_class.cgi?cfd=$_[1]&idx=$s->{'index'}&new=1",$text{'index_cadd'})</td>\n";
}
print "</tr></table></td>\n";

View File

@@ -49,12 +49,12 @@ if (@jobs) {
$files = join(", ", @files);
}
print &ui_checked_columns_row(
[ "<a href='edit.cgi?id=$j->{'id'}'>$files</a>",
[ &ui_link("edit.cgi?id=$j->{'id'}",$files),
$servers,
$j->{'sched'} ?
&text('index_when', &cron::when_text($j)) :
$text{'no'},
"<a href='exec.cgi?id=$j->{'id'}'>$text{'index_exec'}</a>",
&ui_link("exec.cgi?id=$j->{'id'}",$text{'index_exec'}),
], \@tds, "d", $j->{'id'});
}
print &ui_columns_end();

View File

@@ -26,7 +26,7 @@ if (@jobs) {
local $max = $cron::config{'max_len'} || 10000;
local $cmd = $j->{'cluster_command'};
push(@cols,
sprintf "<a href='edit.cgi?id=$j->{'cluster_id'}'>%s</a>%s",
sprintf &ui_link("edit.cgi?id=$j->{'cluster_id'}","%s")%s",
length($cmd) > $max ?
&html_escape(substr($cmd, 0, $max)) :
$cmd !~ /\S/ ? "BLANK" : &html_escape($cmd),

View File

@@ -47,7 +47,7 @@ foreach $h (@hosts) {
print &ui_columns_start([ $text{'compare_pack'},
map { &server_name($smap{$_->{'id'}}) } @hosts ]);
foreach $pn (sort { $a cmp $b } (keys %packs)) {
local @row = ( "<a href='edit_pack.cgi?package=$pn'>$pn</a>" );
local @row = ( &ui_link("edit_pack.cgi?package=$pn",$pn) );
local $ok = 1;
foreach $h (@hosts) {
local ($ph) = grep { $_->{'host'} eq $h } @{$packs{$pn}};

View File

@@ -89,8 +89,8 @@ print "<table width=100%>\n";
&traverse("", 0);
print "</table>\n";
if ($hasclasses) {
print "<a href='closeall.cgi?id=$in{'id'}'>$text{'host_close'}</a>\n";
print "<a href='openall.cgi?id=$in{'id'}'>$text{'host_open'}</a><p>\n";
print &ui_link("closeall.cgi?id=$in{'id'}",$text{'host_close'})\n";
print &ui_link("openall.cgi?id=$in{'id'}",$text{'host_open'})<p>\n";
}
&ui_print_footer("", $text{'index_return'});

View File

@@ -42,7 +42,7 @@ if ($midx == $mod->{'master'} && @m > 1) {
# Sub-modules
@links = ( );
for($i=0; $i<@m; $i++) {
push(@links, "<a href='edit_mod.cgi?idx=$in{'idx'}&midx=$i&name=$in{'name'}'>$m[$i]</a>") if ($i != $mod->{'master'});
push(@links, &ui_link("edit_mod.cgi?idx=$in{'idx'}&midx=$i&name=$in{'name'}","$m[$i]")) if ($i != $mod->{'master'});
}
print &ui_table_row($text{'edit_subs'}, &ui_links_row(\@links), 3);
}

View File

@@ -75,13 +75,13 @@ elsif ($config{'display_mode'} == 0) {
}
if ($access{'edit'}) {
if ($c->{'edit'}) {
$link = "<a href='edit_file.cgi?id=$c->{'id'}'>$text{'index_fedit'}</a>";
$link = &ui_link("edit_file.cgi?id=$c->{'id'}",$text{'index_fedit'});
}
elsif ($c->{'sql'}) {
$link = "<a href='edit_sql.cgi?id=$c->{'id'}'>$text{'index_sedit'}</a>";
$link = &ui_link("edit_sql.cgi?id=$c->{'id'}",$text{'index_sedit'});
}
else {
$link = "<a href='edit_cmd.cgi?id=$c->{'id'}'>$text{'index_edit'}</a>";
$link = &ui_link("edit_cmd.cgi?id=$c->{'id'}",$text{'index_edit'});
}
$html .= &ui_table_row(undef,
&ui_links_row([ $link ]), $w);

View File

@@ -293,11 +293,11 @@ if (@{$_[0]}) {
print &ui_columns_end();
}
local @links = (
"<a href='edit_poll.cgi?new=1&file=$_[1]&user=$_[2]'>$text{'index_add'}</a>",
"<a href='edit_global.cgi?file=$_[1]&user=$_[2]'>$text{'index_global'}</a>"
&ui_link("edit_poll.cgi?new=1&file=$_[1]&user=$_[2]",$text{'index_add'}),
&ui_link("edit_global.cgi?file=$_[1]&user=$_[2]",$text{'index_global'})
);
if (@{$_[0]}) {
push(@links, "<a href='check.cgi?file=$_[1]&user=$_[2]'>$text{'index_run'}</a>");
push(@links, &ui_link("check.cgi?file=$_[1]&user=$_[2]",$text{'index_run'}));
}
print &ui_links_row(\@links);
}

View File

@@ -111,7 +111,7 @@ if (@filters || &get_global_spamassassin()) {
# Work out nice condition and action descriptions
local $cond;
($cond, $lastalways) = &describe_condition($f);
$cond = "<a href='edit.cgi?idx=$f->{'index'}'>$cond</a>";
$cond = &ui_link("edit.cgi?idx=$f->{'index'}",$cond);
local $action = &describe_action($f, \@folders);
# Create mover links

View File

@@ -209,7 +209,7 @@ else {
$text{"index_jump_".lc($r->{'j'}->[1])} ||
&text('index_jump', $r->{'j'}->[1]);
if ($edit) {
push(@cols, "<a href='edit_rule.cgi?table=".&urlize($in{'table'})."&idx=$r->{'index'}'>$act</a>");
push(@cols, &ui_link("edit_rule.cgi?table=".&urlize($in{'table'})."&idx=$r->{'index'}",$act));
}
else {
push(@cols, $act);

View File

@@ -339,11 +339,11 @@ local $others = join("&", map { "open=$_" } grep { $_ ne $name } @open);
$others = "&$others" if ($others);
if ($open{$name}) {
print "<img src=images/gray-open.gif border=0>\n";
print "<a href='right.cgi?$others'>$text</a>";
print &ui_link("right.cgi?$others",$text);
}
else {
print "<img src=images/gray-closed.gif border=0>\n";
print "<a href='right.cgi?open=$name$others'>$text</a>";
print &ui_link("right.cgi?open=$name$others",$text);
}
print "</font><br>\n";
return $open{$name};

View File

@@ -67,7 +67,7 @@ if (@res) {
else {
print "<b>$text{'res_nores'}</b><p>\n";
}
print "<a href='edit_node.cgi?new=1'>$text{'res_add'}</a><p>\n";
print &ui_link("edit_node.cgi?new=1",$text{'res_add'})<p>\n";
&ui_print_footer("", $text{'index_return'});

View File

@@ -40,7 +40,7 @@ if ($config{'md5'}) {
print &ui_subheading(&text('index_file', "<tt>$config{'file'}</tt>"));
$users = &list_users();
if (@$users) {
print "<a href='edit.cgi?new=1'>$text{'index_add'}</a><br>\n"
print &ui_link("edit.cgi?new=1",$text{'index_add'})<br>\n"
if ($access{'create'});
print "<table border width=100%>\n";
print "<tr $tb> <td><b>$text{'index_header'}</b></td> </tr>\n";
@@ -66,7 +66,7 @@ if (@$users) {
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'})<p>\n"
if ($access{'create'});
if ($access{'sync'}) {

View File

@@ -31,9 +31,9 @@ if (@secs) {
else {
print "<b>$text{'secrets_none'}</b><p>\n";
}
print "<a href='edit_secret.cgi?new=1&type=psk'>$text{'secrets_newpsk'}</a>\n";
print &ui_link("edit_secret.cgi?new=1&type=psk",$text{'secrets_newpsk'})\n";
print "&nbsp;" x 2;
print "<a href='edit_secret.cgi?new=1&type=rsa'>$text{'secrets_newrsa'}</a>\n";
print &ui_link("edit_secret.cgi?new=1&type=rsa",$text{'secrets_newrsa'})\n";
print "<br>\n";
&ui_print_footer("", $text{'index_return'});

View File

@@ -19,7 +19,7 @@ foreach $s (@$conf) {
$srcs = join(", ", map { $text{'order_'.$_->{'src'}} } @{$s->{'srcs'}});
$name = $text{'desc_'.$s->{'name'}} || $s->{'name'};
print &ui_columns_row([
"<a href='edit_switch.cgi?name=$s->{'name'}'>$name</a>",
&ui_link("edit_switch.cgi?name=$s->{'name'}",$name),
$srcs,
]);
}

View File

@@ -45,7 +45,7 @@ if (@access) {
$i < @access-1);
$p = &parse_ldap_access($a);
print &ui_checked_columns_row([
"<a href='acl_form.cgi?idx=$i'>$p->{'whatdesc'}</a>",
&ui_link("acl_form.cgi?idx=$i",$p->{'whatdesc'}),
$p->{'bydesc'},
$hasorder ? ( $p->{'order'} ) : ( ),
$mover,

View File

@@ -46,11 +46,11 @@ foreach $i (@images) {
$default && $default eq $l ? "<b>$l</b>" : $l);
push(@links, "edit_$n.cgi?idx=$i->{'index'}");
}
print "<a href='edit_image.cgi?new=1'>$text{'index_addk'}</a> &nbsp;\n";
print "<a href='edit_other.cgi?new=1'>$text{'index_addp'}</a><br>\n";
print &ui_link("edit_image.cgi?new=1",$text{'index_addk'}) &nbsp;\n";
print &ui_link("edit_other.cgi?new=1",$text{'index_addp'})<br>\n";
&icons_table(\@links, \@titles, \@icons, 4);
print "<a href='edit_image.cgi?new=1'>$text{'index_addk'}</a> &nbsp;\n";
print "<a href='edit_other.cgi?new=1'>$text{'index_addp'}</a><p>\n";
print &ui_link("edit_image.cgi?new=1",$text{'index_addk'}) &nbsp;\n";
print &ui_link("edit_other.cgi?new=1",$text{'index_addp'})<p>\n";
print &ui_hr();
print "<table width=100%>\n";

View File

@@ -226,7 +226,7 @@ if ($in{'lv'}) {
if (@pvinfo) {
foreach $p (@pvinfo) {
($pv) = grep { $_->{'name'} eq $p->[0] } @pvs;
push(@pvlist, "<a href='edit_pv.cgi?vg=$in{'vg'}&pv=$pv->{'name'}'>$pv->{'name'}</a> ".&nice_size($p->[1]*$pv->{'pe_size'}*1024));
push(@pvlist, &ui_link("edit_pv.cgi?vg=$in{'vg'}&pv=$pv->{'name'}",$pv->{'name'}) ".&nice_size($p->[1]*$pv->{'pe_size'}*1024));
}
print &ui_table_row($text{'lv_pvs'},
&ui_grid_table(\@pvlist, 4), 3);

View File

@@ -528,7 +528,7 @@ elsif ($config{'show_size'} == 2) {
push(@ccols, int($foldercount{$u->[0]}))
}
print &ui_columns_row(
[ "<a href='list_mail.cgi?user=$u->[0]'>$u->[0]</a>",
[ &ui_link("list_mail.cgi?user=$u->[0]","$u->[0]"),
$u->[6], $g,
$size{$u->[0]} == 0 ? $text{'index_empty'} :
&nice_size($size{$u->[0]}),
@@ -596,7 +596,7 @@ if (defined($old_uid)) {
sub folder_link
{
return "<a href='list_mail.cgi?user=$_[0]&folder=$_[1]->{'index'}'>$text{'mail_return2'}</a>";
return &ui_link("list_mail.cgi?user=$_[0]&folder=$_[1]->{'index'}",$text{'mail_return2'});
}
# get_from_address()

View File

@@ -446,10 +446,10 @@ print &ui_table_end();
@bodylinks = ( );
if ($in{'new'}) {
if ($html_edit) {
push(@bodylinks, "<a href='reply_mail.cgi?folder=$in{'folder'}&user=$euser&new=1&html=0'>$text{'reply_html0'}</a>");
push(@bodylinks, &ui_link("reply_mail.cgi?folder=$in{'folder'}&user=$euser&new=1&html=0",$text{'reply_html0'}));
}
else {
push(@bodylinks, "<a href='reply_mail.cgi?folder=$in{'folder'}&user=$euser&new=1&html=1'>$text{'reply_html1'}</a>");
push(@bodylinks, &ui_link("reply_mail.cgi?folder=$in{'folder'}&user=$euser&new=1&html=1",$text{'reply_html1'}));
}
}

View File

@@ -204,7 +204,7 @@ if (@attach) {
}
@iattach = grep { $_->{'type'} =~ /^image\// } @attach;
if (@iattach > 1) {
push(@links, "<a href='slideshow.cgi?folder=$in{'folder'}&idx=$in{'idx'}&user=$uuser$subs'>$text{'view_aslideshow'}</a>");
push(@links, &ui_link("slideshow.cgi?folder=$in{'folder'}&idx=$in{'idx'}&user=$uuser$subs",$text{'view_aslideshow'}));
}
print &ui_links_row(\@links) if (@links);

View File

@@ -28,9 +28,9 @@ if (@procs) {
foreach $r (@procs) {
print &ui_checked_columns_row([
$r->[0],
"<a href='edit_user.cgi?user=$r->[1]'>$r->[1]</a>",
&ui_link("edit_user.cgi?user=$r->[1]","$r->[1]"),
$r->[2],
"<a href='edit_dbase.cgi?db=$r->[3]'>$r->[3]</a>",
&ui_link("edit_dbase.cgi?db=$r->[3]","$r->[3]"),
$r->[4],
&nice_time($r->[5]),
&html_escape($r->[7])

View File

@@ -375,7 +375,7 @@ if ($total || $in{'new'}) {
if ($displayconfig{'blob_mode'} &&
&is_blob($str[$j]) && $c ne '') {
# Show download link for blob
push(@cols, "<a href='download.cgi?db=$in{'db'}&table=$in{'table'}&start=$in{'start'}".$searchargs.$sortargs."&row=$i&col=$j'>$text{'view_download'}</a>");
push(@cols, &ui_link("download.cgi?db=$in{'db'}&table=$in{'table'}&start=$in{'start'}".$searchargs.$sortargs."&row=$i&col=$j",$text{'view_download'}));
}
else {
# Just show text (up to limit)

View File

@@ -18,7 +18,7 @@ if (!-r $config{'login_config'}) {
print "$text{'dialin_desc'}<p>\n";
if (@dialin) {
print "<a href='edit_dialin.cgi?new=1'>$text{'dialin_add'}</a><br>\n";
print &ui_link("edit_dialin.cgi?new=1",$text{'dialin_add'})<br>\n";
print "<table border>\n";
print "<tr $tb> <td><b>$text{'dialin_number'}</b></td> ",
"<td><b>$text{'dialin_ad'}</b></td> ",
@@ -54,7 +54,7 @@ if (@dialin) {
else {
print "<b>$text{'dialin_nonumbers'}</b> <p>\n";
}
print "<a href='edit_dialin.cgi?new=1'>$text{'dialin_add'}</a><p>\n";
print &ui_link("edit_dialin.cgi?new=1",$text{'dialin_add'})<p>\n";
&ui_print_footer("", $text{'index_return'});

View File

@@ -17,7 +17,7 @@ print &text('mgetty_desc', "<tt>mgetty</tt>"),"<p>\n";
@mgi = &mgetty_inittabs();
if (@mgi) {
print "<a href='edit_mgetty.cgi?new=1'>$text{'mgetty_add'}</a><br>\n";
print &ui_link("edit_mgetty.cgi?new=1",$text{'mgetty_add'})<br>\n";
print "<table border>\n";
print "<tr $tb> <td><b>$text{'mgetty_tty'}</b></td> ",
"<td><b>$text{'mgetty_type'}</b></td> ",
@@ -63,7 +63,7 @@ if (@mgi) {
else {
print "<b>$text{'mgetty_none'}</b><p>\n";
}
print "<a href='edit_mgetty.cgi?new=1'>$text{'mgetty_add'}</a><p>\n";
print &ui_link("edit_mgetty.cgi?new=1",$text{'mgetty_add'})<p>\n";
print &ui_hr();
print "<form action=mgetty_apply.cgi>\n";

View File

@@ -38,14 +38,14 @@ if (@qfiles) {
$e = $in{'start'} + $config{'perpage'} - 1;
$e = @qfiles-1 if ($e >= @qfiles);
if ($s) {
printf "<a href='mailq.cgi?start=%d'>%s</a>\n",
printf &ui_link("mailq.cgi?start=%d","%s")\n",
$s - $config{'perpage'},
"<img src=/images/left.gif border=0 align=middle>";
}
print "<font size=+1>",&text('mail_pos', $s+1, $e+1,
scalar(@qfiles)),"</font>\n";
if ($e < @qfiles-1) {
printf "<a href='mailq.cgi?start=%d'>%s</a>\n",
printf &ui_link("mailq.cgi?start=%d","%s")\n",
$s + $config{'perpage'},
"<img src=/images/right.gif border=0 align=middle>";
}

View File

@@ -7,7 +7,7 @@ $access{'master'} || &error($text{'master_ecannot'});
&ui_print_header(undef, $text{'master_title'}, "", "master");
$master = &get_master_config();
print "<a href='edit_master.cgi?new=1'>$text{'master_add'}</a><br>\n";
print &ui_link("edit_master.cgi?new=1",$text{'master_add'})<br>\n";
print &ui_columns_start([ $text{'master_name'},
$text{'master_enabled'},
$text{'master_type'},
@@ -32,6 +32,6 @@ foreach $m (@$master) {
]);
}
print &ui_columns_end();
print "<a href='edit_master.cgi?new=1'>$text{'master_add'}</a><br>\n";
print &ui_link("edit_master.cgi?new=1",$text{'master_add'})<br>\n";
&ui_print_footer("", $text{'index_return'});

View File

@@ -1707,7 +1707,7 @@ foreach my $q (@$qfiles) {
local @cols;
push(@cols, { 'type' => 'checkbox', 'name' => 'file',
'value' => $q->{'id'} });
push(@cols, "<a href='view_mailq.cgi?id=$q->{'id'}'>$q->{'id'}</a>");
push(@cols, &ui_link("view_mailq.cgi?id=$q->{'id'}",$q->{'id'}));
local $size = &nice_size($q->{'size'});
push(@cols, "<font size=1>$q->{'date'}</font>");
push(@cols, "<font size=1>".&html_escape($q->{'from'})."</font>");

View File

@@ -97,7 +97,7 @@ if (@attach) {
foreach $a (@attach) {
if ($a->{'type'} eq 'message/rfc822') {
print &ui_columns_row([
"<a href='view_mailq.cgi?id=$in{'id'}$subs&sub=$a->{'idx'}'>$text{'view_sub'}</a>",
&ui_link("view_mailq.cgi?id=$in{'id'}$subs&sub=$a->{'idx'}",$text{'view_sub'}),
undef,
&nice_size(length($a->{'data'})),
]);

View File

@@ -38,7 +38,7 @@ else {
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'})<p>\n";
print &ui_hr();
print "<table width=100%>\n";

View File

@@ -41,7 +41,7 @@ else {
# Build links for adding things
@links = ( &ui_link("edit_recipe.cgi?new=1",$text{'index_add'}),
"<a href='edit_recipe.cgi?new=1&block=1'>$text{'index_badd'}</a>",
&ui_link("edit_recipe.cgi?new=1&block=1",$text{'index_badd'}),
&ui_link("edit_env.cgi?new=1",$text{'index_eadd'}) );
push(@links, &ui_link("edit_inc.cgi?new=1",$text{'index_iadd'}))
if (!$includes);

View File

@@ -24,14 +24,14 @@ if (@queue) {
$e = $in{'start'} + $config{'perpage'} - 1;
$e = @queue-1 if ($e >= @queue);
if ($s) {
printf "<a href='list_queue.cgi?start=%d'>%s</a>\n",
printf &ui_link("list_queue.cgi?start=%d","%s")\n",
$s - $config{'perpage'},
"<img src=/images/left.gif border=0 align=middle>";
}
print "<font size=+1>",&text('mail_pos', $s+1, $e+1,
scalar(@queue)),"</font>\n";
if ($e < @queue-1) {
printf "<a href='list_queue.cgi?start=%d'>%s</a>\n",
printf &ui_link("list_queue.cgi?start=%d","%s")\n",
$s + $config{'perpage'},
"<img src=/images/right.gif border=0 align=middle>";
}

View File

@@ -7,13 +7,13 @@ $access{'auths'} || &error($text{'auths_ecannot'});
$auths = &list_auth_attrs();
if (@$auths) {
print "<a href='edit_auth.cgi?new=1'>$text{'auths_add'}</a><br>\n";
print &ui_link("edit_auth.cgi?new=1",$text{'auths_add'})<br>\n";
print &ui_columns_start(
[ $text{'auths_name'},
$text{'auths_desc'} ]);
foreach $a (sort { $a->{'name'} cmp $b->{'name'} } @$auths) {
print &ui_columns_row(
[ "<a href='edit_auth.cgi?idx=$a->{'index'}'>$a->{'name'}</a>",
[ &ui_link("edit_auth.cgi?idx=$a->{'index'}",$a->{'name'}),
&rbac_help_link($a, $a->{'short'} || $a->{'desc'}),
]);
}
@@ -22,7 +22,7 @@ if (@$auths) {
else {
print "<b>$text{'auths_none'}</b><p>\n";
}
print "<a href='edit_auth.cgi?new=1'>$text{'auths_add'}</a><br>\n";
print &ui_link("edit_auth.cgi?new=1",$text{'auths_add'})<br>\n";
&ui_print_footer("", $text{"index_return"});

View File

@@ -7,14 +7,14 @@ $access{'execs'} || &error($text{'execs_ecannot'});
$execs = &list_exec_attrs();
if (@$execs) {
print "<a href='edit_exec.cgi?new=1'>$text{'execs_add'}</a><br>\n";
print &ui_link("edit_exec.cgi?new=1",$text{'execs_add'})<br>\n";
print &ui_columns_start(
[ $text{'execs_name'},
$text{'execs_policy'},
$text{'execs_id'} ]);
foreach $e (sort { $a->{'name'} cmp $b->{'name'} } @$execs) {
print &ui_columns_row(
[ "<a href='edit_exec.cgi?idx=$e->{'index'}'>$e->{'name'}</a>",
[ &ui_link("edit_exec.cgi?idx=$e->{'index'}",$e->{'name'}),
$text{'execs_p'.$e->{'policy'}},
$e->{'id'} eq '*' ? $text{'execs_all'} : $e->{'id'},
]);
@@ -24,7 +24,7 @@ if (@$execs) {
else {
print "<b>$text{'execs_none'}</b><p>\n";
}
print "<a href='edit_exec.cgi?new=1'>$text{'execs_add'}</a><br>\n";
print &ui_link("edit_exec.cgi?new=1",$text{'execs_add'})<br>\n";
&ui_print_footer("", $text{"index_return"});

View File

@@ -7,7 +7,7 @@ $access{'profs'} || &error($text{'profs_ecannot'});
$profs = &list_prof_attrs();
if (@$profs) {
print "<a href='edit_prof.cgi?new=1'>$text{'profs_add'}</a><br>\n"
print &ui_link("edit_prof.cgi?new=1",$text{'profs_add'})<br>\n"
if ($access{'profs'} == 1);
print &ui_columns_start(
[ $text{'profs_name'},
@@ -16,7 +16,7 @@ if (@$profs) {
foreach $p (sort { $a->{'name'} cmp $b->{'name'} } @$profs) {
print &ui_columns_row(
[ $access{'profs'} == 1 ?
"<a href='edit_prof.cgi?idx=$p->{'index'}'>$p->{'name'}</a>" :
&ui_link("edit_prof.cgi?idx=$p->{'index'}",$p->{'name'}) :
$p->{'name'},
&rbac_help_link($p, $p->{'desc'}),
&nice_comma_list($p->{'attr'}->{'auths'}),
@@ -27,7 +27,7 @@ if (@$profs) {
else {
print "<b>$text{'profs_none'}</b><p>\n";
}
print "<a href='edit_prof.cgi?new=1'>$text{'profs_add'}</a><br>\n"
print &ui_link("edit_prof.cgi?new=1",$text{'profs_add'})<br>\n"
if ($access{'profs'} == 1);
&ui_print_footer("", $text{"index_return"});

View File

@@ -8,7 +8,7 @@ require './rbac-lib.pl';
$projects = &list_projects();
@canprojects = @$projects;
if (@canprojects) {
print "<a href='edit_project.cgi?new=1'>$text{'projects_add'}</a><br>\n";
print &ui_link("edit_project.cgi?new=1",$text{'projects_add'})<br>\n";
print &ui_columns_start(
[ $text{'projects_name'},
$text{'projects_desc'},
@@ -16,7 +16,7 @@ if (@canprojects) {
$text{'projects_groups'} ]);
foreach $p (sort { $a->{'name'} cmp $b->{'name'} } @canprojects) {
print &ui_columns_row(
[ "<a href='edit_project.cgi?idx=$p->{'index'}'>$p->{'name'}</a>",
[ &ui_link("edit_project.cgi?idx=$p->{'index'}",$p->{'name'}),
$p->{'desc'},
&nice_user_list("users", $p->{'users'}),
&nice_user_list("groups", $p->{'groups'}),
@@ -27,7 +27,7 @@ if (@canprojects) {
else {
print "<b>$text{'projects_none'}</b><p>\n";
}
print "<a href='edit_project.cgi?new=1'>$text{'projects_add'}</a><br>\n";
print &ui_link("edit_project.cgi?new=1",$text{'projects_add'})<br>\n";
&ui_print_footer("", $text{"index_return"});

View File

@@ -7,7 +7,7 @@ require './rbac-lib.pl';
$users = &list_user_attrs();
@canusers = grep { &can_edit_user($_) } @$users;
if (@canusers) {
print "<a href='edit_user.cgi?new=1'>$text{'users_add'}</a><br>\n";
print &ui_link("edit_user.cgi?new=1",$text{'users_add'})<br>\n";
print &ui_columns_start(
[ $text{'users_user'},
$text{'users_type'},
@@ -17,7 +17,7 @@ if (@canusers) {
$text{'users_auths'} ]);
foreach $u (sort { $a->{'user'} cmp $b->{'user'} } @canusers) {
print &ui_columns_row(
[ "<a href='edit_user.cgi?idx=$u->{'index'}'>$u->{'user'}</a>",
[ &ui_link("edit_user.cgi?idx=$u->{'index'}",$u->{'user'}),
$text{'user_t'.$u->{'attr'}->{'type'}} ||
$u->{'attr'}->{'type'} ||
$text{'user_tnormal'},
@@ -32,6 +32,6 @@ if (@canusers) {
else {
print "<b>$text{'users_none'}</b><p>\n";
}
print "<a href='edit_user.cgi?new=1'>$text{'users_add'}</a><br>\n";
print &ui_link("edit_user.cgi?new=1",$text{'users_add'})<br>\n";
&ui_print_footer("", $text{"index_return"});

View File

@@ -62,14 +62,14 @@ if (@qfiles) {
$e = $in{'start'} + $config{'perpage'} - 1;
$e = @qfiles-1 if ($e >= @qfiles);
if ($s) {
printf "<a href='list_mailq.cgi?start=%d'>%s</a>\n",
printf &ui_link("list_mailq.cgi?start=%d","%s")\n",
$s - $config{'perpage'},
"<img src=/images/left.gif border=0 align=middle>";
}
print "<font size=+1>",&text('mail_pos', $s+1, $e+1,
scalar(@qfiles)),"</font>\n";
if ($e < @qfiles-1) {
printf "<a href='list_mailq.cgi?start=%d'>%s</a>\n",
printf &ui_link("list_mailq.cgi?start=%d","%s")\n",
$s + $config{'perpage'},
"<img src=/images/right.gif border=0 align=middle>";
}

View File

@@ -46,10 +46,10 @@ print &ui_hidden("file", $in{'file'});
# Start of headers section
if ($in{'headers'}) {
$rlink = "<a href='view_mailq.cgi?file=$in{'file'}&headers=0$subs'>$text{'view_noheaders'}</a>";
$rlink = &ui_link("view_mailq.cgi?file=$in{'file'}&headers=0$subs",$text{'view_noheaders'});
}
else {
$rlink = "<a href='view_mailq.cgi?file=$in{'file'}&headers=1$subs'>$text{'view_allheaders'}</a>";
$rlink = &ui_link("view_mailq.cgi?file=$in{'file'}&headers=1$subs",$text{'view_allheaders'});
}
print &ui_table_start($text{'view_headers'}, "width=100%", 2, undef, $rlink);
@@ -107,7 +107,7 @@ if (@attach) {
foreach $a (@attach) {
if ($a->{'type'} eq 'message/rfc822') {
print &ui_columns_row([
"<a href='view_mailq.cgi?file=$qfile$subs&sub=$a->{'idx'}'>$text{'view_sub'}</a>",
&ui_link("view_mailq.cgi?file=$qfile$subs&sub=$a->{'idx'}",$text{'view_sub'}),
undef,
&nice_size(length($a->{'data'})),
]);

View File

@@ -69,7 +69,7 @@ if (@table) {
}
for($j=0; $j<@colnames; $j++) {
if ($j == 0) {
$lnk = "<a href='edit.cgi?table=$in{'table'}&idx=$i'>$t[$j]</a>";
$lnk = &ui_link("edit.cgi?table=$in{'table'}&idx=$i","$t[$j]");
}
else {
$lnk = $t[$j];

View File

@@ -69,7 +69,7 @@ if (@table) {
}
for($j=0; $j<@colnames; $j++) {
if ($j == 0) {
$lnk = "<a href='edit.cgi?table=$in{'table'}&idx=$i'>$t[$j]</a>";
$lnk = &ui_link("edit.cgi?table=$in{'table'}&idx=$i","$t[$j]");
}
else {
$lnk = $t[$j];

View File

@@ -117,7 +117,7 @@ foreach $s (@_) {
local $esc = &html_escape($s->{'desc'});
$esc = "<i>$esc</i>" if ($s->{'nosched'} == 1);
if ($access{'edit'}) {
push(@cols, "<a href='edit_mon.cgi?id=$s->{'id'}'>$esc</a>");
push(@cols, &ui_link("edit_mon.cgi?id=$s->{'id'}",$esc));
}
else {
push(@cols, $esc);

View File

@@ -23,7 +23,7 @@ if (@logs) {
$filter = join(", ", &find_value("filter", $f->{'members'}));
$dest = join(", ", &find_value("destination", $f->{'members'}));
print &ui_checked_columns_row([
"<a href='edit_log.cgi?idx=$f->{'index'}'>$source</a>",
&ui_link("edit_log.cgi?idx=$f->{'index'}",$source),
$filter || "<i>$text{'logs_none'}</i>",
$dest || "<i>$text{'logs_none'}</i>",
], \@tds, "d", $f->{'index'});

View File

@@ -20,7 +20,7 @@ if (@sources) {
foreach $f (@sources) {
$desc = &nice_source_desc($f);
print &ui_checked_columns_row([
"<a href='edit_source.cgi?name=$f->{'value'}'>$f->{'value'}</a>",
&ui_link("edit_source.cgi?name=$f->{'value'}",$f->{'value'}),
$desc || "<i>$text{'sources_none2'}</i>",
], \@tds, "d", $f->{'value'});
}

View File

@@ -111,7 +111,7 @@ 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'})<p>\n";
print &ui_tabs_end_tab();
# SSL key generation form

View File

@@ -55,7 +55,7 @@ if (@usermods) {
else {
print "<b>$text{'restrict_none'}</b><p>\n";
}
print "<a href='edit_restrict.cgi?new=1'>$text{'restrict_add'}</a><p>\n";
print &ui_link("edit_restrict.cgi?new=1",$text{'restrict_add'})<p>\n";
&ui_print_footer("", $text{'index_return'});

View File

@@ -28,7 +28,7 @@ if (@keys) {
local ($user, $ltime, $lip) = split(/\s+/, $acl::sessiondb{$k});
next if ($miniserv{'logouttime'} &&
$time_now - $ltime > $miniserv{'logouttime'}*60);
@cols = ( "<a href='delete_session.cgi?id=$k'>$k</a>" );
@cols = ( &ui_link("delete_session.cgi?id=$k",$k) );
if ($uinfo = $umap{$user}) {
push(@cols, "<a href='../useradmin/edit_user.cgi?num=$uinfo->{'num'}'>$user</a>");
}

View File

@@ -11,7 +11,7 @@ print &text('vgetty_desc', "<tt>vgetty</tt>"),"<p>\n";
@vgi = &vgetty_inittabs();
if (@vgi) {
print "<a href='edit_vgetty.cgi?new=1'>$text{'vgetty_add'}</a><br>\n";
print &ui_link("edit_vgetty.cgi?new=1",$text{'vgetty_add'})<br>\n";
print "<table border>\n";
print "<tr $tb> <td><b>$text{'vgetty_tty'}</b></td> ",
"<td><b>$text{'vgetty_type'}</b></td> </tr>\n";
@@ -36,7 +36,7 @@ if (@vgi) {
else {
print "<b>$text{'vgetty_none'}</b><p>\n";
}
print "<a href='edit_vgetty.cgi?new=1'>$text{'vgetty_add'}</a><p>\n";
print &ui_link("edit_vgetty.cgi?new=1",$text{'vgetty_add'})<p>\n";
&ui_print_footer("", $text{'index_return'});

View File

@@ -28,7 +28,7 @@ foreach $net (@{$zinfo->{'net'}}) {
$active = &get_active_interface($zinfo, $net);
($address, $netmask) = &get_address_netmask($net, $active);
$ntable->add_row([
"<a href='edit_net.cgi?zone=$in{'zone'}&old=$net->{'address'}'>$address</a>",
&ui_link("edit_net.cgi?zone=$in{'zone'}&old=$net->{'address'}",$address),
$active->{'fullname'} || $text{'edit_netdown'},
$netmask,
$active->{'broadcast'} ]);
@@ -46,7 +46,7 @@ $pform->add_section($ptable);
$ptable->set_heading($text{'edit_pkg'});
foreach $pkg (@{$zinfo->{'inherit-pkg-dir'}}) {
if ($zinfo->{'status'} eq 'configured') {
$ptable->add_row([ "<a href='edit_pkg.cgi?zone=$in{'zone'}&old=$pkg->{'dir'}'>$pkg->{'dir'}</a>" ]);
$ptable->add_row([ &ui_link("edit_pkg.cgi?zone=$in{'zone'}&old=$pkg->{'dir'}",$pkg->{'dir'}) ]);
}
else {
$ptable->add_row([ "<tt>$pkg->{'dir'}</tt>" ]);
@@ -74,7 +74,7 @@ $fform->add_section($ftable);
$ftable->set_heading($text{'edit_fs'});
foreach $fs (@{$zinfo->{'fs'}}) {
$ftable->add_row([
"<a href='edit_fs.cgi?zone=$in{'zone'}&old=$fs->{'dir'}'>$fs->{'dir'}</a>",
&ui_link("edit_fs.cgi?zone=$in{'zone'}&old=$fs->{'dir'}",$fs->{'dir'}),
&mount::device_name($fs->{'special'}),
&mount::fstype_name($fs->{'type'}),
&get_active_mount($zinfo, $fs) ?
@@ -109,7 +109,7 @@ foreach $rctl (@{$zinfo->{'rctl'}}) {
push(@actions, $text{'rctl_'.$action});
}
$rtable->add_row([
"<a href='edit_rctl.cgi?zone=$in{'zone'}&old=$rctl->{'name'}'>$rctl->{'name'}</a>",
&ui_link("edit_rctl.cgi?zone=$in{'zone'}&old=$rctl->{'name'}",$rctl->{'name'}),
join("<br>", @privs),
join("<br>", @limits),
join("<br>", @actions),
@@ -131,7 +131,7 @@ $gform->add_section($gtable);
$gtable->set_heading($text{'edit_attr'});
foreach $attr (@{$zinfo->{'attr'}}) {
$gtable->add_row([
"<a href='edit_attr.cgi?zone=$in{'zone'}&old=$attr->{'name'}'>$attr->{'name'}</a>",
&ui_link("edit_attr.cgi?zone=$in{'zone'}&old=$attr->{'name'}",$attr->{'name'}),
$text{'attr_'.$attr->{'type'}},
$attr->{'value'},
]);

View File

@@ -31,7 +31,7 @@ else {
push(@actions, new Webmin::TableAction("save_zone.cgi", $a->[1], [ [ "zone", $z->{'name'} ], [ $a->[0], 1 ], [ "list", 1 ] ]));
}
$table->add_row([
"<a href='edit_zone.cgi?zone=$z->{'name'}'>$z->{'name'}</a>",
&ui_link("edit_zone.cgi?zone=$z->{'name'}",$z->{'name'}),
$z->{'id'},
$z->{'zonepath'},
&nice_status($z->{'status'}),

View File

@@ -258,10 +258,10 @@ local $z;
foreach $z (@$zones) {
local ($a, @actions);
foreach $a (&zone_status_actions($z)) {
push(@actions, "<a href='save_zone.cgi?zone=$z->{'name'}&$a->[0]=1&list=1'>$a->[1]</a>");
push(@actions, &ui_link("save_zone.cgi?zone=$z->{'name'}&$a->[0]=1&list=1","$a->[1]"));
}
print &ui_columns_row([
"<a href='edit_zone.cgi?zone=$z->{'name'}'>$z->{'name'}</a>",
&ui_link("edit_zone.cgi?zone=$z->{'name'}",$z->{'name'}),
$z->{'id'},
$z->{'zonepath'},
&nice_status($z->{'status'}),