*Replace more links with &ui_link call

This commit is contained in:
Derrick Hammer
2014-06-08 20:51:42 -04:00
parent 5dbc005c95
commit 4a80bc8e6a
8 changed files with 10 additions and 10 deletions

View File

@ -20,7 +20,7 @@ print "<tr $cb> <td><table width=100%>\n";
print "<tr> <td><b>$text{'host_name'}</b></td>\n";
if ($server->{'id'}) {
$h = $server->{'realhost'} || $server->{'host'};
printf "<td><a href='/servers/link.cgi/%s/'>%s</a></td>\n",
printf &ui_link("/servers/link.cgi/%s/","%s")."</td>\n",
$server->{'id'}, $server->{'desc'} ? "$server->{'desc'} ($h:$server->{'port'})" : "$h:$server->{'port'}";
}
else {

View File

@ -18,7 +18,7 @@ print "<tr $cb> <td><table width=100%>\n";
print "<tr> <td><b>$text{'host_name'}</b></td>\n";
if ($server->{'id'}) {
printf "<td><a href='/servers/link.cgi/%s/'>%s</a></td>\n",
printf &ui_link("/servers/link.cgi/%s/","%s")."</td>\n",
$server->{'id'}, $server->{'desc'} ? "$server->{'desc'} ($server->{'host'}:$server->{'port'})" : "$server->{'host'}:$server->{'port'}";
}
else {

View File

@ -200,7 +200,7 @@ if (@attach) {
# Links to download all / slideshow
@links = ( );
if (@attach > 1) {
push(@links, "<a href='detachall.cgi/attachments.zip?folder=$in{'folder'}&idx=$in{'idx'}&user=$uuser$subs'>$text{'view_aall'}</a>");
push(@links, &ui_link("detachall.cgi/attachments.zip?folder=$in{'folder'}&idx=$in{'idx'}&user=$uuser$subs","$text{'view_aall'}"));
}
@iattach = grep { $_->{'type'} =~ /^image\// } @attach;
if (@iattach > 1) {

View File

@ -31,10 +31,10 @@ if (@_ > 1 && !$one && $remote_user && !$notabs) {
if (!$ENV{'ANONYMOUS_USER'} && !$ENV{'SSL_USER'} &&
!$ENV{'LOCAL_USER'} && !$ENV{'HTTP_WEBMIN_SERVERS'}) {
if ($main::session_id) {
$logout = "<a href='/session_login.cgi?logout=1'>$text{'main_logout'}</a>";
$logout = &ui_link("/session_login.cgi?logout=1",$text{'main_logout'});
}
else {
$logout = "<a href='/switch_user.cgi'>$text{'main_switch'}</a>";
$logout = &ui_link("/switch_user.cgi",$text{'main_switch'});
}
}
&start_osx_table("Module Categories", $logout);

View File

@ -104,7 +104,7 @@ if (@attach) {
}
else {
print &ui_columns_row([
"<a href='detach_queue.cgi/$a->{'filename'}?id=$in{'id'}&attach=$a->{'idx'}$subs'>$a->{'filename'}</a>",
&ui_link("detach_queue.cgi/$a->{'filename'}?id=$in{'id'}&attach=$a->{'idx'}$subs",$a->{'filename'}),
$a->{'type'},
&nice_size(length($a->{'data'})),
]);

View File

@ -146,7 +146,7 @@ if (@conf) {
push(@tds, "width=32");
# Add before/after links
push(@cols, &ui_link("edit_recipe.cgi?new=1&after=$c->{'index'}","<img src=images/after.gif border=0>")."");
push(@cols, &ui_link("edit_recipe.cgi?new=1&after=$c->{'index'}","<img src=images/after.gif border=0>"));
print &ui_checked_columns_row(\@cols, \@tds, "d",$c->{'index'});
}
print &ui_columns_end();
@ -165,7 +165,7 @@ print &ui_buttons_row("manual_form.cgi",
$text{'index_man'}, $text{'index_mandesc'});
print &ui_buttons_end();
print "<a href='manual_form.cgi'>$text{'index_manual'}</a>\n";
print &ui_link("manual_form.cgi","$text{'index_manual'}")."\n";
print "<p>\n";
&ui_print_footer("/", $text{'index'});

View File

@ -25,7 +25,7 @@ $odir = &find_value("output_dir", $conf);
$odir ||= &find_value("output_dir", $conf, 1);
if ($rv && -r "$odir/index.html") {
print "<b>$text{'gen_done'}</b><p>\n";
print "<a href='view.cgi/index.html'>$text{'gen_view'}</a><p>\n";
print &ui_link("view.cgi/index.html","$text{'gen_view'}")."<p>\n";
}
elsif ($rv) {
print "<b>$text{'gen_nothing'}</b><p>\n";

View File

@ -114,7 +114,7 @@ if (@attach) {
}
else {
print &ui_columns_row([
"<a href='qdetach.cgi/$a->{'filename'}?file=$qfile&attach=$a->{'idx'}$subs'>$a->{'filename'}</a>",
&ui_link("qdetach.cgi/$a->{'filename'}?file=$qfile&attach=$a->{'idx'}$subs","$a->{'filename'}")."",
$a->{'type'},
&nice_size(length($a->{'data'})),
]);