diff --git a/bacula-backup/bacula-backup-lib.pl b/bacula-backup/bacula-backup-lib.pl index c4fc07ca9..aca7e3924 100755 --- a/bacula-backup/bacula-backup-lib.pl +++ b/bacula-backup/bacula-backup-lib.pl @@ -1317,10 +1317,10 @@ if (!$job) { } else { if ($j) { - return "$j ($c)"; + return &ui_link("edit_gjob.cgi?name=".&urlize($j)."","$j ($c)"); } else { - return "$name"; + return &ui_link("edit_job.cgi?name=".&urlize($name)."",$name); } } } diff --git a/bacula-backup/list_clients.cgi b/bacula-backup/list_clients.cgi index 6f7cfc3c1..c0112221e 100755 --- a/bacula-backup/list_clients.cgi +++ b/bacula-backup/list_clients.cgi @@ -34,7 +34,7 @@ if (@clients) { } else { print "$text{'clients_none'}
\n";
- print "$text{'clients_add'}
\n";
+ print &ui_link("edit_client.cgi?new=1",$text{'clients_add'})
\n";
}
&ui_print_footer("", $text{'index_return'});
diff --git a/bacula-backup/list_devices.cgi b/bacula-backup/list_devices.cgi
index 220ebc40f..a1df481e2 100755
--- a/bacula-backup/list_devices.cgi
+++ b/bacula-backup/list_devices.cgi
@@ -34,7 +34,7 @@ if (@devices) {
}
else {
print "$text{'devices_none'}
\n";
- print "$text{'devices_add'}
\n";
+ print &ui_link("edit_device.cgi?new=1",$text{'devices_add'})
\n";
}
&ui_print_footer("", $text{'index_return'});
diff --git a/bacula-backup/list_fdirectors.cgi b/bacula-backup/list_fdirectors.cgi
index 40990f520..fe06a0050 100755
--- a/bacula-backup/list_fdirectors.cgi
+++ b/bacula-backup/list_fdirectors.cgi
@@ -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 "$text{'fdirectors_add'}
\n";
+ print &ui_link("edit_fdirector.cgi?new=1",$text{'fdirectors_add'})
\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 "$text{'fdirectors_add'}
\n";
+ print &ui_link("edit_fdirector.cgi?new=1",$text{'fdirectors_add'})
\n";
print &ui_form_end([ [ "delete", $text{'fdirectors_delete'} ] ]);
}
else {
print "$text{'fdirectors_none'}
\n";
- print "$text{'fdirectors_add'}
\n";
+ print &ui_link("edit_fdirector.cgi?new=1",$text{'fdirectors_add'})
\n";
}
&ui_print_footer("", $text{'index_return'});
diff --git a/bacula-backup/list_filesets.cgi b/bacula-backup/list_filesets.cgi
index 1a241c6cc..19ec30cfc 100755
--- a/bacula-backup/list_filesets.cgi
+++ b/bacula-backup/list_filesets.cgi
@@ -36,7 +36,7 @@ if (@filesets) {
}
else {
print "$text{'filesets_none'}
\n";
- print "$text{'filesets_add'}
\n";
+ print &ui_link("edit_fileset.cgi?new=1",$text{'filesets_add'})
\n";
}
&ui_print_footer("", $text{'index_return'});
diff --git a/bacula-backup/list_gjobs.cgi b/bacula-backup/list_gjobs.cgi
index 4737fd5db..50d48d38f 100755
--- a/bacula-backup/list_gjobs.cgi
+++ b/bacula-backup/list_gjobs.cgi
@@ -40,7 +40,7 @@ if (@jobs) {
}
else {
print "$text{'jobs_none'}
\n";
- print "$text{'gjobs_add'}
\n";
+ print &ui_link("edit_gjob.cgi?new=1",$text{'gjobs_add'})
\n";
}
&ui_print_footer("", $text{'index_return'});
diff --git a/bacula-backup/list_jobs.cgi b/bacula-backup/list_jobs.cgi
index 5926fa32f..7fb09963a 100755
--- a/bacula-backup/list_jobs.cgi
+++ b/bacula-backup/list_jobs.cgi
@@ -44,7 +44,7 @@ if (@jobs) {
}
else {
print "$text{'jobs_none'}
\n";
- print "$text{'jobs_add'}
\n";
+ print &ui_link("edit_job.cgi?new=1",$text{'jobs_add'})
\n";
}
&ui_print_footer("", $text{'index_return'});
diff --git a/bacula-backup/list_pools.cgi b/bacula-backup/list_pools.cgi
index 1e40af79f..fa102be3c 100755
--- a/bacula-backup/list_pools.cgi
+++ b/bacula-backup/list_pools.cgi
@@ -34,7 +34,7 @@ if (@pools) {
}
else {
print "$text{'pools_none'}
\n";
- print "$text{'pools_add'}
\n";
+ print &ui_link("edit_pool.cgi?new=1",$text{'pools_add'})
\n";
}
&ui_print_footer("", $text{'index_return'});
diff --git a/bacula-backup/list_schedules.cgi b/bacula-backup/list_schedules.cgi
index e62e53cbf..13833b11a 100755
--- a/bacula-backup/list_schedules.cgi
+++ b/bacula-backup/list_schedules.cgi
@@ -34,7 +34,7 @@ if (@schedules) {
}
else {
print "$text{'schedules_none'}
\n";
- print "$text{'schedules_add'}
\n";
+ print &ui_link("edit_schedule.cgi?new=1",$text{'schedules_add'})
\n";
}
&ui_print_footer("", $text{'index_return'});
diff --git a/bacula-backup/list_sdirectors.cgi b/bacula-backup/list_sdirectors.cgi
index d8f1ee469..642354313 100755
--- a/bacula-backup/list_sdirectors.cgi
+++ b/bacula-backup/list_sdirectors.cgi
@@ -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 "$text{'sdirectors_add'}
\n";
+ print &ui_link("edit_sdirector.cgi?new=1",$text{'sdirectors_add'})
\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 "$text{'sdirectors_add'}
\n";
+ print &ui_link("edit_sdirector.cgi?new=1",$text{'sdirectors_add'})
\n";
print &ui_form_end([ [ "delete", $text{'sdirectors_delete'} ] ]);
}
else {
print "$text{'sdirectors_none'}
\n";
- print "$text{'sdirectors_add'}
\n";
+ print &ui_link("edit_sdirector.cgi?new=1",$text{'sdirectors_add'})
\n";
}
&ui_print_footer("", $text{'index_return'});
diff --git a/bacula-backup/list_storages.cgi b/bacula-backup/list_storages.cgi
index 74fb8ee48..1dbaebe23 100755
--- a/bacula-backup/list_storages.cgi
+++ b/bacula-backup/list_storages.cgi
@@ -38,7 +38,7 @@ if (@storages) {
}
else {
print "$text{'storages_none'}
\n";
- print "$text{'storages_add'}
\n";
+ print &ui_link("edit_storage.cgi?new=1",$text{'storages_add'})
\n";
}
&ui_print_footer("", $text{'index_return'});
diff --git a/bacula-backup/poolstatus_form.cgi b/bacula-backup/poolstatus_form.cgi
index 26d1c30dc..a9cbc231b 100755
--- a/bacula-backup/poolstatus_form.cgi
+++ b/bacula-backup/poolstatus_form.cgi
@@ -65,6 +65,6 @@ if ($in{'pool'}) {
sub joblink
{
-return $jobs{$_[0]} ? "$_[0]" : $_[0];
+return $jobs{$_[0]} ? &ui_link("edit_job.cgi?name=".&urlize($_[0])."","$_[0]") : $_[0];
}
diff --git a/blue-theme/right.cgi b/blue-theme/right.cgi
index 12221eb6e..130c11c81 100755
--- a/blue-theme/right.cgi
+++ b/blue-theme/right.cgi
@@ -298,11 +298,11 @@ local $others = join("&", map { "open=$_" } grep { $_ ne $name } @open);
$others = "&$others" if ($others);
if ($open{$name}) {
print "
\n";
- print "$text";
+ print &ui_link("right.cgi?$others",$text);
}
else {
print "
\n";
- print "$text";
+ print &ui_link("right.cgi?open=$name$others",$text);
}
print "
\n";
return $open{$name};
diff --git a/cfengine/cfengine-lib.pl b/cfengine/cfengine-lib.pl
index 791ea68e4..eac13dad5 100755
--- a/cfengine/cfengine-lib.pl
+++ b/cfengine/cfengine-lib.pl
@@ -389,7 +389,7 @@ if (@{$_[0]}) {
next if ($s->{'name'} =~ /^import/);
local (@clist, @dlist);
foreach $c (@{$s->{'cls'}}) {
- push(@clist, $_[2] ? $c->{'name'} : "{'index'}'>$c->{'name'}");
+ 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]}) {
# "
";
# }
if (!$_[2]) {
- print "$text{'index_cadd'}\n";
+ print &ui_link("edit_class.cgi?cfd=$_[1]&idx=$s->{'index'}&new=1",$text{'index_cadd'})\n";
}
print "\n";
diff --git a/cluster-copy/index.cgi b/cluster-copy/index.cgi
index c8e0c2d3a..3c1176537 100755
--- a/cluster-copy/index.cgi
+++ b/cluster-copy/index.cgi
@@ -49,12 +49,12 @@ if (@jobs) {
$files = join(", ", @files);
}
print &ui_checked_columns_row(
- [ "$files",
+ [ &ui_link("edit.cgi?id=$j->{'id'}",$files),
$servers,
$j->{'sched'} ?
&text('index_when', &cron::when_text($j)) :
$text{'no'},
- "$text{'index_exec'}",
+ &ui_link("exec.cgi?id=$j->{'id'}",$text{'index_exec'}),
], \@tds, "d", $j->{'id'});
}
print &ui_columns_end();
diff --git a/cluster-cron/index.cgi b/cluster-cron/index.cgi
index 4de14c575..9eb63b81b 100755
--- a/cluster-cron/index.cgi
+++ b/cluster-cron/index.cgi
@@ -26,7 +26,7 @@ if (@jobs) {
local $max = $cron::config{'max_len'} || 10000;
local $cmd = $j->{'cluster_command'};
push(@cols,
- sprintf "%s%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),
diff --git a/cluster-software/compare.cgi b/cluster-software/compare.cgi
index 2d3072f15..ee7594b97 100755
--- a/cluster-software/compare.cgi
+++ b/cluster-software/compare.cgi
@@ -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 = ( "$pn" );
+ local @row = ( &ui_link("edit_pack.cgi?package=$pn",$pn) );
local $ok = 1;
foreach $h (@hosts) {
local ($ph) = grep { $_->{'host'} eq $h } @{$packs{$pn}};
diff --git a/cluster-software/edit_host.cgi b/cluster-software/edit_host.cgi
index 5ccbc1721..53b9730c3 100755
--- a/cluster-software/edit_host.cgi
+++ b/cluster-software/edit_host.cgi
@@ -89,8 +89,8 @@ print "
\n"; + print &ui_link("closeall.cgi?id=$in{'id'}",$text{'host_close'})\n"; + print &ui_link("openall.cgi?id=$in{'id'}",$text{'host_open'})
\n";
}
&ui_print_footer("", $text{'index_return'});
diff --git a/cpan/edit_mod.cgi b/cpan/edit_mod.cgi
index b88004901..8553f7f46 100755
--- a/cpan/edit_mod.cgi
+++ b/cpan/edit_mod.cgi
@@ -42,7 +42,7 @@ if ($midx == $mod->{'master'} && @m > 1) {
# Sub-modules
@links = ( );
for($i=0; $i<@m; $i++) {
- push(@links, "$m[$i]") 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);
}
diff --git a/custom/index.cgi b/custom/index.cgi
index 0958f0c40..60a2e5f15 100755
--- a/custom/index.cgi
+++ b/custom/index.cgi
@@ -75,13 +75,13 @@ elsif ($config{'display_mode'} == 0) {
}
if ($access{'edit'}) {
if ($c->{'edit'}) {
- $link = "$text{'index_fedit'}";
+ $link = &ui_link("edit_file.cgi?id=$c->{'id'}",$text{'index_fedit'});
}
elsif ($c->{'sql'}) {
- $link = "$text{'index_sedit'}";
+ $link = &ui_link("edit_sql.cgi?id=$c->{'id'}",$text{'index_sedit'});
}
else {
- $link = "$text{'index_edit'}";
+ $link = &ui_link("edit_cmd.cgi?id=$c->{'id'}",$text{'index_edit'});
}
$html .= &ui_table_row(undef,
&ui_links_row([ $link ]), $w);
diff --git a/fetchmail/fetchmail-lib.pl b/fetchmail/fetchmail-lib.pl
index 67ee9d56e..4de3a4294 100755
--- a/fetchmail/fetchmail-lib.pl
+++ b/fetchmail/fetchmail-lib.pl
@@ -293,11 +293,11 @@ if (@{$_[0]}) {
print &ui_columns_end();
}
local @links = (
- "$text{'index_add'}",
- "$text{'index_global'}"
+ &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, "$text{'index_run'}");
+ push(@links, &ui_link("check.cgi?file=$_[1]&user=$_[2]",$text{'index_run'}));
}
print &ui_links_row(\@links);
}
diff --git a/filter/index.cgi b/filter/index.cgi
index 6b96adbaa..314cc6b6a 100755
--- a/filter/index.cgi
+++ b/filter/index.cgi
@@ -111,7 +111,7 @@ if (@filters || &get_global_spamassassin()) {
# Work out nice condition and action descriptions
local $cond;
($cond, $lastalways) = &describe_condition($f);
- $cond = "$cond";
+ $cond = &ui_link("edit.cgi?idx=$f->{'index'}",$cond);
local $action = &describe_action($f, \@folders);
# Create mover links
diff --git a/firewall/index.cgi b/firewall/index.cgi
index b4b36f2cf..0ca33b229 100755
--- a/firewall/index.cgi
+++ b/firewall/index.cgi
@@ -209,7 +209,7 @@ else {
$text{"index_jump_".lc($r->{'j'}->[1])} ||
&text('index_jump', $r->{'j'}->[1]);
if ($edit) {
- push(@cols, "{'index'}'>$act");
+ push(@cols, &ui_link("edit_rule.cgi?table=".&urlize($in{'table'})."&idx=$r->{'index'}",$act));
}
else {
push(@cols, $act);
diff --git a/gray-theme/right.cgi b/gray-theme/right.cgi
index 0096ec913..4e029753f 100755
--- a/gray-theme/right.cgi
+++ b/gray-theme/right.cgi
@@ -339,11 +339,11 @@ local $others = join("&", map { "open=$_" } grep { $_ ne $name } @open);
$others = "&$others" if ($others);
if ($open{$name}) {
print "
\n";
- print "$text";
+ print &ui_link("right.cgi?$others",$text);
}
else {
print "
\n";
- print "$text";
+ print &ui_link("right.cgi?open=$name$others",$text);
}
print "
\n";
return $open{$name};
diff --git a/heartbeat/edit_res.cgi b/heartbeat/edit_res.cgi
index 7a03642ca..2a069e032 100755
--- a/heartbeat/edit_res.cgi
+++ b/heartbeat/edit_res.cgi
@@ -67,7 +67,7 @@ if (@res) {
else {
print "$text{'res_nores'}
\n"; } -print "$text{'res_add'}
\n"; +print &ui_link("edit_node.cgi?new=1",$text{'res_add'})
\n";
&ui_print_footer("", $text{'index_return'});
diff --git a/htpasswd-file/index.cgi b/htpasswd-file/index.cgi
index 431e27756..5be5f480b 100755
--- a/htpasswd-file/index.cgi
+++ b/htpasswd-file/index.cgi
@@ -40,7 +40,7 @@ if ($config{'md5'}) {
print &ui_subheading(&text('index_file', "$config{'file'}"));
$users = &list_users();
if (@$users) {
- print "$text{'index_add'}
\n"
+ print &ui_link("edit.cgi?new=1",$text{'index_add'})
\n"
if ($access{'create'});
print "
| $text{'index_header'} |
| $text{'dialin_number'} | ", "$text{'dialin_ad'} | ", @@ -54,7 +54,7 @@ if (@dialin) { else { print "$text{'dialin_nonumbers'}
| $text{'mgetty_tty'} | ", "$text{'mgetty_type'} | ", @@ -63,7 +63,7 @@ if (@mgi) { else { print "$text{'mgetty_none'}