\n"; } - print "$text{'index_add'}"; + print &ui_link("edit.cgi?new=1",$text{'index_add'}); if (!$has_default) { print " " x 3; - print "$text{'index_adddef'}"; + print &ui_link("edit.cgi?new=2",$text{'index_adddef'}); } print " " x 3; print "$text{'index_import'}"; diff --git a/iscsi-server/list_devices.cgi b/iscsi-server/list_devices.cgi index a64129e6a..36202d017 100755 --- a/iscsi-server/list_devices.cgi +++ b/iscsi-server/list_devices.cgi @@ -10,7 +10,7 @@ my $conf = &get_iscsi_config(); &ui_print_header(undef, $text{'devices_title'}, ""); my @devices = &find($conf, "device"); -my @links = ( "$text{'devices_add'}" ); +my @links = ( &ui_link("edit_device.cgi?new=1",$text{'devices_add'}) ); if (@devices) { unshift(@links, &select_all_link("d"), &select_invert_link("d")); print &ui_form_start("delete_devices.cgi"); diff --git a/iscsi-server/list_extents.cgi b/iscsi-server/list_extents.cgi index 48b9500ff..45309c917 100755 --- a/iscsi-server/list_extents.cgi +++ b/iscsi-server/list_extents.cgi @@ -10,7 +10,7 @@ my $conf = &get_iscsi_config(); &ui_print_header(undef, $text{'extents_title'}, ""); my @extents = &find($conf, "extent"); -my @links = ( "$text{'extents_add'}" ); +my @links = ( &ui_link("edit_extent.cgi?new=1",$text{'extents_add'}) ); if (@extents) { unshift(@links, &select_all_link("d"), &select_invert_link("d")); print &ui_form_start("delete_extents.cgi"); diff --git a/iscsi-server/list_targets.cgi b/iscsi-server/list_targets.cgi index 780cde1d2..594d41f38 100755 --- a/iscsi-server/list_targets.cgi +++ b/iscsi-server/list_targets.cgi @@ -10,7 +10,7 @@ my $conf = &get_iscsi_config(); &ui_print_header(undef, $text{'targets_title'}, ""); my @targets = &find($conf, "target"); -my @links = ( "$text{'targets_add'}" ); +my @links = ( &ui_link("edit_target.cgi?new=1",$text{'targets_add'}) ); if (@targets) { unshift(@links, &select_all_link("d"), &select_invert_link("d")); print &ui_form_start("delete_targets.cgi"); diff --git a/iscsi-server/list_users.cgi b/iscsi-server/list_users.cgi index 5cc30f90d..695a4d5fe 100755 --- a/iscsi-server/list_users.cgi +++ b/iscsi-server/list_users.cgi @@ -9,7 +9,7 @@ my @users = &list_iscsi_users(); &ui_print_header(undef, $text{'users_title'}, ""); -my @links = ( "$text{'users_add'}" ); +my @links = ( &ui_link("edit_user.cgi?new=1",$text{'users_add'}) ); if (@users) { unshift(@links, &select_all_link("d"), &select_invert_link("d")); print &ui_form_start("delete_users.cgi"); diff --git a/iscsi-target/index.cgi b/iscsi-target/index.cgi index f8b653196..3989df97b 100755 --- a/iscsi-target/index.cgi +++ b/iscsi-target/index.cgi @@ -18,7 +18,7 @@ if ($err) { # Find and show targets my $conf = &get_iscsi_config(); my @targets = &find($conf, "Target"); -my @crlinks = ( "$text{'index_add'}" ); +my @crlinks = ( &ui_link("edit_target.cgi?new=1",$text{'index_add'}) ); if (@targets) { unshift(@crlinks, &select_all_link("d"), &select_invert_link("d")); print &ui_form_start("delete_targets.cgi"); diff --git a/itsecur-firewall/itsecur-lib.pl b/itsecur-firewall/itsecur-lib.pl index dcad147e2..5631efbf6 100644 --- a/itsecur-firewall/itsecur-lib.pl +++ b/itsecur-firewall/itsecur-lib.pl @@ -750,7 +750,7 @@ unlink($active_interfaces); sub apply_button { if (&can_edit("apply")) { - return "$text{'apply_button'}"; + return &ui_link("apply.cgi?return=1",$text{'apply_button'}); } else { return undef; diff --git a/ldap-server/edit_acl.cgi b/ldap-server/edit_acl.cgi index f48349a51..6bb57fb3f 100755 --- a/ldap-server/edit_acl.cgi +++ b/ldap-server/edit_acl.cgi @@ -23,7 +23,7 @@ else { $hasorder = 1; } -@crlinks = ( "$text{'acl_add'}" ); +@crlinks = ( &ui_link("acl_form.cgi?new=1",$text{'acl_add'}) ); if (@access) { # Show table of ACLs print &ui_form_start("delete_acls.cgi", "post"); diff --git a/ldap-useradmin/index.cgi b/ldap-useradmin/index.cgi index a03748949..9187ad8ad 100755 --- a/ldap-useradmin/index.cgi +++ b/ldap-useradmin/index.cgi @@ -143,7 +143,7 @@ if ($can_users) { @links = ( ); if ($access{'ucreate'}) { push(@links, - "$text{'index_uadd'}"); + &ui_link("edit_user.cgi?new=1",$text{'index_uadd'})); } if ($access{'batch'}) { push(@links, @@ -204,7 +204,7 @@ if ($can_groups) { # Create group links @links = ( ); if ($access{'gcreate'}) { - push(@links, "$text{'index_gadd'}"); + push(@links, &ui_link("edit_group.cgi?new=1",$text{'index_gadd'})); } if ($gcount > $mconfig{'display_max'}) { diff --git a/lvm/index.cgi b/lvm/index.cgi index 6d211bbd5..013cb5a8b 100755 --- a/lvm/index.cgi +++ b/lvm/index.cgi @@ -46,7 +46,7 @@ if (@vgs) { print &ui_tabs_start_tab("mode", "vgs"); print $text{'index_vgsdesc'},"
\n"; @vgs = sort { $a->{'number'} <=> $b->{'number'} } @vgs; - @links = ( "$text{'index_add'}" ); + @links = ( &ui_link("edit_vg.cgi",$text{'index_add'}) ); if ($config{'show_table'}) { # As table print &ui_links_row(\@links); @@ -231,7 +231,7 @@ else { print &text('index_init', "init.cgi"),"
\n"; } print &ui_links_row([ - "$text{'index_add'}" ]); + &ui_link("edit_vg.cgi",$text{'index_add'}) ]); } &ui_print_footer("/", $text{'index'}); diff --git a/majordomo/index.cgi b/majordomo/index.cgi index 21c44782f..c6cb25189 100755 --- a/majordomo/index.cgi +++ b/majordomo/index.cgi @@ -118,9 +118,9 @@ foreach $l (grep { $lcan{$_} || $lcan{"*"} } @lists) { push(@icons, "images/list.gif"); } if (@links) { - @crlinks = ( "$text{'index_add'}" ); + @crlinks = ( &ui_link("create_form.cgi",$text{'index_add'}) ); if (@links) { - push(@crlinks, "$text{'index_digest'}"); + push(@crlinks, &ui_link("digest_form.cgi",$text{'index_digest'})); } if ($access{'create'}) { print &ui_links_row(\@crlinks); diff --git a/minecraft/list_worlds.cgi b/minecraft/list_worlds.cgi index f1df3bfca..2e36d708c 100755 --- a/minecraft/list_worlds.cgi +++ b/minecraft/list_worlds.cgi @@ -12,7 +12,7 @@ my @worlds = &list_worlds(); my $conf = &get_minecraft_config(); my $def = &find_value("level-name", $conf); -my @links = ( "$text{'worlds_new'}" ); +my @links = ( &ui_link("edit_world.cgi?new=1",$text{'worlds_new'}) ); if (@worlds) { my @tds = ( "width=5%" ); print &ui_form_start("change_world.cgi"); diff --git a/mysql/list_dbs.cgi b/mysql/list_dbs.cgi index f57cd277d..81ce271e6 100755 --- a/mysql/list_dbs.cgi +++ b/mysql/list_dbs.cgi @@ -6,7 +6,7 @@ require './mysql-lib.pl'; $access{'perms'} || &error($text{'perms_ecannot'}); &ui_print_header(undef, $text{'dbs_title'}, "", "dbs"); -@rowlinks = ( "$text{'dbs_add'}" ); +@rowlinks = ( &ui_link("edit_db.cgi?new=1",$text{'dbs_add'}) ); $d = &execute_sql_safe($master_db, "select * from db order by db"); if (@{$d->{'data'}}) { print &ui_form_start("delete_dbs.cgi"); diff --git a/mysql/list_hosts.cgi b/mysql/list_hosts.cgi index 0f3d25015..ea9f10185 100755 --- a/mysql/list_hosts.cgi +++ b/mysql/list_hosts.cgi @@ -7,7 +7,7 @@ $access{'perms'} || &error($text{'perms_ecannot'}); &ui_print_header(undef, $text{'hosts_title'}, ""); $d = &execute_sql_safe($master_db, "select * from host order by host"); -@rowlinks = ( "$text{'hosts_add'}" ); +@rowlinks = ( &ui_link("edit_host.cgi?new=1",$text{'hosts_add'}) ); if (@{$d->{'data'}}) { print &ui_form_start("delete_hosts.cgi"); unshift(@rowlinks, &select_all_link("d", 0), diff --git a/mysql/list_users.cgi b/mysql/list_users.cgi index 405a2dfc7..239242a36 100755 --- a/mysql/list_users.cgi +++ b/mysql/list_users.cgi @@ -9,7 +9,7 @@ $access{'perms'} == 1 || &error($text{'perms_ecannot'}); print &ui_form_start("delete_users.cgi"); @rowlinks = ( &select_all_link("d", 0), &select_invert_link("d", 0), - "$text{'users_add'}" ); + &ui_link("edit_user.cgi?new=1",$text{'users_add'}) ); print &ui_links_row(\@rowlinks); @tds = ( "width=5" ); print &ui_columns_start([ "", diff --git a/net/list_ifcs.cgi b/net/list_ifcs.cgi index 8be5cc7a7..b29c24e2e 100755 --- a/net/list_ifcs.cgi +++ b/net/list_ifcs.cgi @@ -37,7 +37,7 @@ if (!$access{'bootonly'}) { push(@tds, "width=5% valign=top"); if ($allow_add) { push(@links, - "$text{'ifcs_add'}"); + &ui_link("edit_aifc.cgi?new=1",$text{'ifcs_add'})); } print &ui_links_row(\@links); print &ui_columns_start([ $access{'ifcs'} >= 2 ? ( "" ) : ( ), @@ -115,7 +115,7 @@ print &ui_form_start("delete_bifcs.cgi", "post"); @links = ( &select_all_link("b", 1), &select_invert_link("b", 1) ); if ($allow_add) { - push(@links, "$text{'ifcs_add'}"); + push(@links, &ui_link("edit_bifc.cgi?new=1",$text{'ifcs_add'})); if (defined(&supports_bonding) && &supports_bonding()) { push(@links, "". "$text{'bonding_add'}"); @@ -130,7 +130,7 @@ if ($allow_add && defined(&supports_bridges) && &supports_bridges()) { "$text{'ifcs_badd'}"); } if ($allow_add && defined(&supports_ranges) && &supports_ranges()) { - push(@links, "$text{'ifcs_radd'}"); + push(@links, &ui_link("edit_range.cgi?new=1",$text{'ifcs_radd'})); } print &ui_links_row(\@links); @tds = ( "width=5 valign=top", "width=20% valign=top", "width=20% valign=top", diff --git a/postfix/aliases.cgi b/postfix/aliases.cgi index 848972dfa..243d5e3c3 100755 --- a/postfix/aliases.cgi +++ b/postfix/aliases.cgi @@ -52,7 +52,7 @@ for($mid=0; $mid<@aliases && $aline[$mid] < $midline; $mid++) { } print &ui_form_start("delete_aliases.cgi", "post"); @links = ( &select_all_link("d", 1), &select_invert_link("d", 1), - "$text{'new_alias'}", + &ui_link("edit_alias.cgi?new=1",$text{'new_alias'}), ); print &ui_links_row(\@links); if ($config{'columns'} == 2) { diff --git a/postgresql/list_groups.cgi b/postgresql/list_groups.cgi index 5293adaeb..bc9eeea7a 100755 --- a/postgresql/list_groups.cgi +++ b/postgresql/list_groups.cgi @@ -12,7 +12,7 @@ foreach $u (@{$s->{'data'}}) { } $s = &execute_sql_safe($config{'basedb'}, "select * from pg_group"); -@rowlinks = ( "$text{'group_add'}" ); +@rowlinks = ( &ui_link("edit_group.cgi?new=1",$text{'group_add'}) ); if (@{$s->{'data'}}) { print &ui_form_start("delete_groups.cgi", "post"); unshift(@rowlinks, &select_all_link("d", 0), diff --git a/postgresql/list_hosts.cgi b/postgresql/list_hosts.cgi index 35d5c569f..e2161eec2 100755 --- a/postgresql/list_hosts.cgi +++ b/postgresql/list_hosts.cgi @@ -13,7 +13,7 @@ $v = &get_postgresql_version(); print &ui_form_start("delete_hosts.cgi", "post"); @rowlinks = ( &select_all_link("d", 0), &select_invert_link("d", 0), - "$text{'host_add'}" ); + &ui_link("edit_host.cgi?new=1",$text{'host_add'}) ); print &ui_links_row(\@rowlinks); if ($v >= 7.3) { @tds = ( "width=5", "width=25%", "width=25%", "width=25%", diff --git a/postgresql/list_users.cgi b/postgresql/list_users.cgi index cbbc9c82e..f1ca0ca31 100755 --- a/postgresql/list_users.cgi +++ b/postgresql/list_users.cgi @@ -10,7 +10,7 @@ $s = &execute_sql_safe($config{'basedb'}, "select $pg_shadow_cols from pg_shadow print &ui_form_start("delete_users.cgi", "post"); @rowlinks = ( &select_all_link("d", 0), &select_invert_link("d", 0), - "$text{'user_add'}" ); + &ui_link("edit_user.cgi?new=1",$text{'user_add'}) ); print &ui_links_row(\@rowlinks); print &ui_columns_start([ "", $text{'user_name'}, $text{'user_pass'}, diff --git a/procmail/index.cgi b/procmail/index.cgi index 43e9bfcc4..350d3a772 100755 --- a/procmail/index.cgi +++ b/procmail/index.cgi @@ -40,10 +40,10 @@ else { } # Build links for adding things -@links = ( "$text{'index_add'}", +@links = ( &ui_link("edit_recipe.cgi?new=1",$text{'index_add'}), "$text{'index_badd'}", - "$text{'index_eadd'}" ); -push(@links, "$text{'index_iadd'}") + &ui_link("edit_env.cgi?new=1",$text{'index_eadd'}) ); +push(@links, &ui_link("edit_inc.cgi?new=1",$text{'index_iadd'})) if (!$includes); @conf = &get_procmailrc(); diff --git a/pserver/list_passwd.cgi b/pserver/list_passwd.cgi index ffdd918b6..4eb454b97 100755 --- a/pserver/list_passwd.cgi +++ b/pserver/list_passwd.cgi @@ -8,7 +8,7 @@ $access{'passwd'} || &error($text{'passwd_ecannot'}); print "$text{'passwd_desc'}
\n"; @passwd = &list_passwords(); -@links = ( "$text{'passwd_add'}" ); +@links = ( &ui_link("edit_passwd.cgi?new=1",$text{'passwd_add'}) ); if (@passwd) { print &ui_links_row(\@links); print "