diff --git a/apache/allmanual_form.cgi b/apache/allmanual_form.cgi index 49720f17e..b66718a84 100755 --- a/apache/allmanual_form.cgi +++ b/apache/allmanual_form.cgi @@ -15,7 +15,7 @@ print "
\n"; print "\n"; print "\n"; $rv .="\n"; @@ -89,7 +89,7 @@ for($i=0; $i<=@all; $i++) { $rv .="\n"; $rv .="\n"; diff --git a/apache/core.pl b/apache/core.pl index 514b912d6..dd3f0483f 100755 --- a/apache/core.pl +++ b/apache/core.pl @@ -881,7 +881,7 @@ sub edit_AuthType local($rv, $a); $rv = ""; diff --git a/apache/mod_actions.pl b/apache/mod_actions.pl index 787c94040..b2f764225 100755 --- a/apache/mod_actions.pl +++ b/apache/mod_actions.pl @@ -64,10 +64,10 @@ for($i=0; $i<$len; $i++) { else { $meth = $cgi = ""; } $rv .= "\n"; $rv .= "\n"; $rv .= "\n"; diff --git a/apache/mod_autoindex.pl b/apache/mod_autoindex.pl index d92318e15..dbe649f8a 100755 --- a/apache/mod_autoindex.pl +++ b/apache/mod_autoindex.pl @@ -24,26 +24,21 @@ local $rv = sprintf $rv .= sprintf "\n", $_[0] ? "checked" : ""; $rv .= "\n"; $rv .= "\n"; return (2, "$text{'mod_autoindex_sort'}", $rv); } diff --git a/apache/show.cgi b/apache/show.cgi index 1eba5dd6c..d2523fa1f 100755 --- a/apache/show.cgi +++ b/apache/show.cgi @@ -86,7 +86,7 @@ print "",&ui_submit($text{'show_edit'}),"\n"; print "\n"; print "
\n"; diff --git a/backup-config/backup-config-lib.pl b/backup-config/backup-config-lib.pl index 700e6567a..1d87a9da3 100755 --- a/backup-config/backup-config-lib.pl +++ b/backup-config/backup-config-lib.pl @@ -152,7 +152,7 @@ sub show_backup_destination { my ($mode, $user, $pass, $server, $path, $port) = &parse_backup_url($_[1]); my $rv; -$rv .= ""; +$rv .= "
"; # Local file field $rv .= "\n"; diff --git a/bacula-backup/bacula-backup-lib.pl b/bacula-backup/bacula-backup-lib.pl index ad0fccdbf..89c9d91d4 100755 --- a/bacula-backup/bacula-backup-lib.pl +++ b/bacula-backup/bacula-backup-lib.pl @@ -417,9 +417,9 @@ sub tape_select local $t; print "\n"; print " ",&file_chooser_button("other", 1),"\n"; } @@ -444,10 +444,10 @@ else { } $cmd->execute(); print "\n"; } @@ -459,7 +459,7 @@ local $cmd = $_[0]->prepare("select ClientId,Name from Client order by ClientId $cmd->execute(); print "\n"; } diff --git a/bind8/acl_security.pl b/bind8/acl_security.pl index a747a9884..ff3e1a873 100755 --- a/bind8/acl_security.pl +++ b/bind8/acl_security.pl @@ -29,13 +29,13 @@ foreach $v (@views) { local ($z, %zcan); map { $zcan{$_}++ } split(/\s+/, $_[0]->{'zones'}); foreach $z (sort { $a->{'value'} cmp $b->{'value'} } @zones) { - printf "\n", $z->{'value'}, $zcan{$z->{'value'}} ? "selected" : "", &arpa_to_ip($z->{'value'}); } foreach $v (sort { $a->{'value'} cmp $b->{'value'} } @views) { - printf "\n", 'view_'.$v->{'value'}, $zcan{'view_'.$v->{'value'}} ? "selected" : "", &text('acl_inview', $v->{'value'}); @@ -183,7 +183,7 @@ if (@views) { local ($v, %vcan); map { $vcan{$_}++ } split(/\s+/, $_[0]->{'vlist'}); foreach $v (sort { $a->{'value'} cmp $b->{'value'} } @views) { - printf "\n", $v->{'value'}, $vcan{$v->{'value'}} ? "selected" : "", $v->{'value'}; } diff --git a/burner/edit_dev.cgi b/burner/edit_dev.cgi index acd40c514..427aed7e9 100755 --- a/burner/edit_dev.cgi +++ b/burner/edit_dev.cgi @@ -14,10 +14,10 @@ print "\n"; print "\n"; @@ -490,14 +490,14 @@ elsif ($type eq "copy") { local @acts = ( "fix", "silent", "warn" ); print "\n"; print "\n"; @@ -539,14 +539,14 @@ elsif ($type eq "disable") { local @types = ( "plain", "file", "link" ); print "\n"; print "\n"; @@ -647,10 +647,10 @@ elsif ($type eq "processes") { local $sig = &sname("signal", $p); print "\n"; print "\n"; @@ -658,13 +658,13 @@ elsif ($type eq "processes") { local $act = &sname("action", $p); print "\n"; print "\n"; @@ -798,12 +798,12 @@ elsif ($type eq "tidy") { printf "\n", $age eq '' ? "" : "checked"; local $asel = "\n"; local $afield = "\n"; diff --git a/cfengine/list_hosts.cgi b/cfengine/list_hosts.cgi index 5c03417ab..2b146df30 100755 --- a/cfengine/list_hosts.cgi +++ b/cfengine/list_hosts.cgi @@ -34,7 +34,7 @@ if (@addservers) { print "\n"; } @@ -44,7 +44,7 @@ if (@groups) { "value='$text{'hosts_gadd'}'>\n"; print "\n"; } diff --git a/cluster-cron/edit.cgi b/cluster-cron/edit.cgi index 0a55a5ba0..7c1615b85 100755 --- a/cluster-cron/edit.cgi +++ b/cluster-cron/edit.cgi @@ -34,21 +34,21 @@ print "\n"; print "\n"; print "\n"; @@ -77,10 +78,11 @@ if (!$pinfo[7]) { print "\n"; print "\n"; diff --git a/cluster-software/index.cgi b/cluster-software/index.cgi index d9c6093f6..3ebb7a646 100755 --- a/cluster-software/index.cgi +++ b/cluster-software/index.cgi @@ -76,7 +76,7 @@ if (@addservers && $access{'add'}) { print "\n"; print "\n"; @@ -99,7 +99,7 @@ if (@groups && $access{'add'}) { print "\n"; print "\n"; print "\n"; diff --git a/cluster-useradmin/cluster-useradmin-lib.pl b/cluster-useradmin/cluster-useradmin-lib.pl index 22a4c9af3..5667ab9b8 100755 --- a/cluster-useradmin/cluster-useradmin-lib.pl +++ b/cluster-useradmin/cluster-useradmin-lib.pl @@ -133,15 +133,15 @@ if ($_[2]) { else { print "\n"; if ($_[0]) { diff --git a/cluster-useradmin/edit_user.cgi b/cluster-useradmin/edit_user.cgi index 65971d59c..f9edda21f 100755 --- a/cluster-useradmin/edit_user.cgi +++ b/cluster-useradmin/edit_user.cgi @@ -131,7 +131,7 @@ printf " %s\n", print "\n"; @@ -446,7 +446,7 @@ print ""; print "/"; diff --git a/cluster-useradmin/index.cgi b/cluster-useradmin/index.cgi index e82a13f00..8efdd0733 100755 --- a/cluster-useradmin/index.cgi +++ b/cluster-useradmin/index.cgi @@ -71,7 +71,7 @@ if (@addservers) { print "\n"; } @@ -81,7 +81,7 @@ if (@groups) { "value='$text{'index_gadd'}'>\n"; print "\n"; } @@ -95,17 +95,17 @@ if (@hosts) { print "
".&ui_oneradio("$_[0]_mode", 0, undef, $mode == 0)."
\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; diff --git a/burner/index.cgi b/burner/index.cgi index 18c31f426..b775ff775 100755 --- a/burner/index.cgi +++ b/burner/index.cgi @@ -76,10 +76,10 @@ if ($access{'create'}) { print "\n"; print "\n"; print "\n"; } } diff --git a/burner/save_profile.cgi b/burner/save_profile.cgi index 01d07c527..c99529e3a 100755 --- a/burner/save_profile.cgi +++ b/burner/save_profile.cgi @@ -321,9 +321,9 @@ if ($in{'burn'} || $in{'test'}) { if ($profile->{'type'} != 4) { print "
$text{'burn_blank'} \n"; } print "\n"; diff --git a/certmgr/import.cgi b/certmgr/import.cgi index 554e8e65a..7ea881c7b 100755 --- a/certmgr/import.cgi +++ b/certmgr/import.cgi @@ -59,10 +59,10 @@ print <$text{'import_choose'}"; +print ">$text{'import_choose'}"; foreach $f ( &getdirs($config{'ssl_dir'})) { - if ($config{'ssl_dir'}."/".$f eq $in{'cert_directory'}) {print " \n";} + else {print " \n";} } print < @@ -81,10 +81,10 @@ print <$text{'import_choose'}"; +print ">$text{'import_choose'}"; foreach $f ( &getdirs($config{'ssl_dir'})) { - if ($config{'ssl_dir'}."/".$f eq $in{'key_directory'}) {print " \n";} + else {print " \n";} } print < diff --git a/certmgr/view.cgi b/certmgr/view.cgi index 771019baf..96a9d9dce 100755 --- a/certmgr/view.cgi +++ b/certmgr/view.cgi @@ -142,8 +142,10 @@ print "
$text{'dev_device'}
$text{'edit_sdev'}\n"; @@ -150,20 +150,20 @@ elsif ($profile->{'type'} == 4) { print "
$text{'edit_srcdrv'}
$text{'edit_dstdrv'}
\n
$text{'view_select'}
print "
"; print "\n"; print "
$text{'view_wildcard'}:
\n"; print "
\n"; print "\n"; diff --git a/cfengine/cfengine-lib.pl b/cfengine/cfengine-lib.pl index 535b2daff..791ea68e4 100755 --- a/cfengine/cfengine-lib.pl +++ b/cfengine/cfengine-lib.pl @@ -590,7 +590,7 @@ foreach $s ($_[0] ? @known_cfd_sections : @known_sections) { next if (!$tt); local $t = $text{"section_".$s."_".$_[0]}; $t = $text{"section_".$s} if (!$t); - print "\n"; } print "\n"; diff --git a/cfengine/edit_class.cgi b/cfengine/edit_class.cgi index 5baa45d08..5a6460c95 100755 --- a/cfengine/edit_class.cgi +++ b/cfengine/edit_class.cgi @@ -112,7 +112,7 @@ elsif ($type eq "control" && !$in{'cfd'}) { next if ($s eq "control"); local $t = $text{"section_".$s."_".$in{'cfd'}}; $t = $text{"section_".$s} if (!$t); - printf "\n"; } print "
\n"; print "\n"; @@ -354,14 +354,14 @@ elsif ($type eq "files") { local @acts = ( "fixall", "fixdirs", "fixplain", "warnall", "warndirs", "warnplain", "touch", "linkchildren", "create", "compress", "alert" ); print "		$text{'edit_filesact'}
$text{'edit_copyact'}
$text{'edit_distype'}
$text{'edit_procsig'}$text{'edit_procact'}
\n"; print "{'cluster_user'}\"> ", %serv = map { $_, 1 } split(/ /, $job->{'cluster_server'}); print "$text{'edit_servers'}\n"; foreach $s (@got) { print ""; } print "\n"; print "\n"; print "
\n"; print "\n"; @@ -116,15 +116,15 @@ if (@hosts) { print "\n"; diff --git a/cluster-useradmin/user_form.cgi b/cluster-useradmin/user_form.cgi index 30a788a4b..8fb84c51f 100755 --- a/cluster-useradmin/user_form.cgi +++ b/cluster-useradmin/user_form.cgi @@ -85,10 +85,10 @@ print "\n"; print "\n"; &seed_random(); @@ -214,7 +214,7 @@ print "\n"; print "
\n"; print "$text{'index_finduser'}   \n"; print "
\n"; print "$text{'index_findgroup'}   \n"; print "
$text{'shell'}

\n"; @@ -261,7 +261,7 @@ print ""; print "/"; diff --git a/cluster-usermin/cluster-usermin-lib.pl b/cluster-usermin/cluster-usermin-lib.pl index 8cee2d88a..0b49af504 100755 --- a/cluster-usermin/cluster-usermin-lib.pl +++ b/cluster-usermin/cluster-usermin-lib.pl @@ -150,16 +150,16 @@ if ($_[3]) { else { print "\n"; if ($_[0]) { diff --git a/cluster-usermin/edit_mod.cgi b/cluster-usermin/edit_mod.cgi index 0240dd2d9..da8e9ef1e 100755 --- a/cluster-usermin/edit_mod.cgi +++ b/cluster-usermin/edit_mod.cgi @@ -175,9 +175,9 @@ print "\n"; print "\n"; print "\n"; print "\n"; diff --git a/cluster-usermin/index.cgi b/cluster-usermin/index.cgi index b3aa22ec0..1880a8bb9 100755 --- a/cluster-usermin/index.cgi +++ b/cluster-usermin/index.cgi @@ -62,16 +62,16 @@ else { # Build common selectors @wgroups = &all_groups(\@hosts); $modsel2 = $modsel = "\n"; $modsel2 .= "\n"; $themesel = "\n"; @@ -83,7 +83,7 @@ if (@addservers) { print "\n"; print "\n"; print "\n"; @@ -98,7 +98,7 @@ if (@groups) { print "\n"; print "\n"; print "\n"; diff --git a/cluster-webmin/cluster-webmin-lib.pl b/cluster-webmin/cluster-webmin-lib.pl index ac72f3313..49e875dcd 100755 --- a/cluster-webmin/cluster-webmin-lib.pl +++ b/cluster-webmin/cluster-webmin-lib.pl @@ -181,16 +181,16 @@ if ($_[3]) { else { print "\n"; if ($_[0]) { diff --git a/cluster-webmin/edit_group.cgi b/cluster-webmin/edit_group.cgi index 623659b3f..9831d3570 100755 --- a/cluster-webmin/edit_group.cgi +++ b/cluster-webmin/edit_group.cgi @@ -60,9 +60,9 @@ printf " %s (%s)\n", printf " %s\n", $text{'user_set'}; print " \n"; @@ -79,21 +79,21 @@ print " $text{'user_moddel'}\n"; print "
\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; @@ -216,14 +216,14 @@ if ($type eq 'mod') { local @m = $ingroup{$u->{'name'}} ? @{$u->{'ownmods'}} : @{$u->{'modules'}}; print "\n" if (&indexof($name, @m) >= 0); } foreach $g (@{$h->{'groups'}}) { local @m = $ingroup{$g->{'name'}} ? @{$g->{'ownmods'}} : @{$g->{'modules'}}; print "\n" if (&indexof($name, @m) >= 0); } } diff --git a/cluster-webmin/edit_user.cgi b/cluster-webmin/edit_user.cgi index 1381d3b14..a52551c17 100755 --- a/cluster-webmin/edit_user.cgi +++ b/cluster-webmin/edit_user.cgi @@ -57,19 +57,19 @@ printf " %s (%s)\n", printf " %s\n", $text{'user_set'}; print " \n"; print " $text{'user_pass'} \n"; print " \n"; @langs = &list_languages(); @@ -81,9 +81,9 @@ printf " %s (%s)\n", printf " %s\n", $text{'user_set'}; print " %s (%s)\n", printf " %s\n", $text{'user_set'}; print " \n"; @@ -142,21 +142,21 @@ print " $text{'user_moddel'}\n"; print "
\n"; print "\n"; print "\n"; print "\n"; print "$text{'user_group'}\n"; print " \n"; @@ -30,17 +30,17 @@ print " $text{'user_mods'}
", "$text{'user_groupmods'} \n"; print "\n"; print "\n"; print "\n"; diff --git a/cluster-webmin/index.cgi b/cluster-webmin/index.cgi index ad26eb4f5..152be1662 100755 --- a/cluster-webmin/index.cgi +++ b/cluster-webmin/index.cgi @@ -65,26 +65,26 @@ else { # Build common selectors @wgroups = &all_groups(\@hosts); $modsel2 = $modsel = "\n"; $modsel2 .= "\n"; $themesel = "\n"; $usersel = "\n"; $groupsel = "\n"; @@ -95,7 +95,7 @@ if (@addservers) { print "\n"; print "\n"; print "\n"; @@ -109,7 +109,7 @@ if (@groups) { print "\n"; print "\n"; print "\n"; diff --git a/cluster-webmin/user_form.cgi b/cluster-webmin/user_form.cgi index 76400590c..b15747dc4 100755 --- a/cluster-webmin/user_form.cgi +++ b/cluster-webmin/user_form.cgi @@ -20,25 +20,25 @@ print "\n"; print "$text{'user_group'}\n"; print " \n"; print " $text{'user_pass'} \n"; print " \n"; print " $text{'user_lang'} \n"; print "\n"; print "$text{'user_theme'} \n"; print " \n"; @@ -66,17 +66,17 @@ print " $text{'user_mods'}
", "$text{'user_groupmods'} \n"; print "\n"; print "\n"; print "\n"; diff --git a/cron/cron-lib.pl b/cron/cron-lib.pl index 699309e51..ec6aa2882 100755 --- a/cron/cron-lib.pl +++ b/cron/cron-lib.pl @@ -772,7 +772,7 @@ if ($config{'vixie_cron'} && (!$_[1] || $_[0]->{'special'})) { local $sp = $job->{'special'} eq 'midnight' ? 'daily' : $job->{'special'} eq 'annually' ? 'yearly' : $job->{'special'}; foreach $s ('hourly', 'daily', 'weekly', 'monthly', 'yearly', 'reboot'){ - printf "\n", $s, $sp eq $s ? "selected" : "", $text{'edit_special_'.$s}; } print "\n"; @@ -868,7 +868,7 @@ foreach $arr ("mins", "hours", "days", "months", "weekdays") { foreach $v (@sec) { if ($v =~ /^(.*)=(.*)$/) { $disp = $1; $code = $2; } else { $disp = $code = $v; } - printf "\n", $inuse{$code} ? "selected" : ""; } print "\n"; diff --git a/custom/acl_security.pl b/custom/acl_security.pl index 708cd260a..9678bd518 100755 --- a/custom/acl_security.pl +++ b/custom/acl_security.pl @@ -19,7 +19,7 @@ local @cmds = &sort_commands(&list_commands()); local ($c, %ccan); map { $ccan{$_}++ } split(/\s+/, $_[0]->{'cmds'}); foreach $c (@cmds) { - printf "\n", $c->{'id'}, $ccan{$c->{'id'}} ? "selected" : "", $c->{'desc'}; diff --git a/date_chooser.cgi b/date_chooser.cgi index 616261fd5..2f783b2c0 100755 --- a/date_chooser.cgi +++ b/date_chooser.cgi @@ -52,12 +52,12 @@ close(); \n"; for ($i = 0; $i <= 2; $i++) { - printf "\n", $assign == $i ? "selected" : "", $labels[$i]; } @@ -150,7 +150,7 @@ if (!defined($in{'ret'})) { if ($assign == 2) { $iu = 0; foreach $u (@subn) { - printf "\n", defined($shared{$u}) ? "$shared{$u},$u->{'index'}" : $u->{'index'}, $iu == $sel_parent ? "selected" : "", $subn_desc[$iu] @@ -161,7 +161,7 @@ if (!defined($in{'ret'})) { elsif ($assign == 1) { $is = 0; foreach $s (@shar) { - printf "\n", $s->{'index'}, $is == $sel_parent ? "selected" : "", $shar_desc[$is] diff --git a/dhcpd/edit_host.cgi b/dhcpd/edit_host.cgi index 05e01d860..2a68bb8f9 100755 --- a/dhcpd/edit_host.cgi +++ b/dhcpd/edit_host.cgi @@ -185,7 +185,7 @@ if (!defined($in{'ret'})) { else { print "\n"; -printf "\n", $hard && $hard->{'values'}->[0] eq "ethernet" ? "selected" : ""; -printf "\n", $hard && $hard->{'values'}->[0] eq "token-ring" ? "selected" : ""; -printf "\n", $hard && $hard->{'values'}->[0] eq "fddi" ? "selected" : ""; print ""; printf " \n", diff --git a/dhcpd/edit_iface.cgi b/dhcpd/edit_iface.cgi index 7411af08e..e7efdf791 100755 --- a/dhcpd/edit_iface.cgi +++ b/dhcpd/edit_iface.cgi @@ -100,7 +100,7 @@ if (&foreign_check("net")) { print "\n"; diff --git a/dhcpd/edit_keys.cgi b/dhcpd/edit_keys.cgi index c79e88178..475c83f36 100755 --- a/dhcpd/edit_keys.cgi +++ b/dhcpd/edit_keys.cgi @@ -41,10 +41,10 @@ for($i=0; $i<@keys; $i++) { print "\n"; printf " \n", diff --git a/dhcpd/edit_shared.cgi b/dhcpd/edit_shared.cgi index 489eba208..295e48013 100755 --- a/dhcpd/edit_shared.cgi +++ b/dhcpd/edit_shared.cgi @@ -74,7 +74,7 @@ print "$text{'esh_hosts'}\n"; print "\n"; foreach $s (@subn) { next if !&can('r', \%access, $s); - printf "\n", $s->{'index'}, $inshar{$s}, (!$in{'new'}) && $inshar{$s} eq $sha->{'index'} ? "selected" : "", $s->{'values'}->[0]; diff --git a/dhcpd/edit_subnet.cgi b/dhcpd/edit_subnet.cgi index e9aaf24c9..e08ab9691 100755 --- a/dhcpd/edit_subnet.cgi +++ b/dhcpd/edit_subnet.cgi @@ -71,10 +71,10 @@ print " \n"; if (!defined($in{'ret'})) { print " $text{'esub_shnet'}\n"; print "\n"; foreach $h (@host) { next if !&can('r', \%access, $h); - printf "\n", $h->{'index'}, $insubn{$h}, (!$in{'new'}) && $insubn{$h} eq $sub->{'index'} ? "selected" : "", $h->{'values'}->[0]; @@ -131,7 +131,7 @@ foreach $g (@group) { foreach $h (@{$g->{'members'}}) { if ($h->{'name'} eq "host") { $gm++; } } - printf "\n", $g->{'index'}, $insubn{$g}, (!$in{'new'}) && $insubn{$g} eq $sub->{'index'} ? "selected" : "", &group_name($gm, $g); diff --git a/dhcpd/index.cgi b/dhcpd/index.cgi index 3cf2ffa37..813b9a670 100755 --- a/dhcpd/index.cgi +++ b/dhcpd/index.cgi @@ -73,9 +73,9 @@ if ($st[7] != $config{'dhcpd_size'} || $st[9] != $config{'dhcpd_mtime'}) { # Create lookup type HTML # XXX change text, add to lookup_* $match = "\n"; # get top-level hosts diff --git a/dnsadmin/acl_security.pl b/dnsadmin/acl_security.pl index 243f7e085..20a5d725f 100755 --- a/dnsadmin/acl_security.pl +++ b/dnsadmin/acl_security.pl @@ -19,7 +19,7 @@ local ($z, %zcan); map { $zcan{$_}++ } split(/\s+/, $_[0]->{'zones'}); foreach $z (sort { $a->{'value'} cmp $b->{'value'} } @zones) { local $v = $z->{'values'}->[0]; - printf "\n", $v, $zcan{$v} ? "selected" : "", &arpa_to_ip($v); } diff --git a/fdisk/acl_security.pl b/fdisk/acl_security.pl index 8d5c8b666..540d58568 100755 --- a/fdisk/acl_security.pl +++ b/fdisk/acl_security.pl @@ -15,7 +15,7 @@ printf " %s
\n", $_[0]->{'disks'} eq '*' ? '' : 'checked', $text{'acl_dsel'}; print " $text{'feedback_module'}\n"; print "\n"; -printf "\n", $poll->{'proto'} ? '' : 'selected', $text{'default'}; foreach $p ('pop3', 'pop2', 'imap', 'imap-k4', 'imap-gss', 'apop', 'kpop') { - printf "\n", $p, lc($poll->{'proto'}) eq $p ? 'selected' : '', uc($p); $found++ if (lc($poll->{'proto'}) eq $p); } -printf "\n", $poll->{'proto'}, uc($poll->{'proto'}) if (!$found && $poll->{'proto'}); print "\n"; diff --git a/fetchmail/edit_poll.cgi b/fetchmail/edit_poll.cgi index 30a6b42d8..bc9bf7abc 100755 --- a/fetchmail/edit_poll.cgi +++ b/fetchmail/edit_poll.cgi @@ -54,14 +54,14 @@ printf " \n", print " $text{'poll_proto'}\n"; print "\n"; @@ -76,14 +76,14 @@ printf " \n", print " $text{'poll_auth'}\n"; print " \n"; diff --git a/firewall/cluster.cgi b/firewall/cluster.cgi index 8d0be0845..ee77b3aba 100755 --- a/firewall/cluster.cgi +++ b/firewall/cluster.cgi @@ -46,7 +46,7 @@ if (@addservers) { print "\n"; } @@ -56,7 +56,7 @@ if (@groups) { "value='$text{'cluster_gadd'}'>\n"; print "\n"; } diff --git a/firewall/index.cgi b/firewall/index.cgi index 3d9be39f3..b4b36f2cf 100755 --- a/firewall/index.cgi +++ b/firewall/index.cgi @@ -152,7 +152,7 @@ else { print "\n"; foreach $t ('ACCEPT','DROP','QUEUE','RETURN') { - printf "\n", $t, $d eq $t ? "selected" : "", $text{"index_policy_".lc($t)}; } diff --git a/format/acl_security.pl b/format/acl_security.pl index c4ff5156f..7f58b02c5 100755 --- a/format/acl_security.pl +++ b/format/acl_security.pl @@ -16,7 +16,7 @@ printf " %s
\n", print "\n"; foreach $t (&list_tags()) { - printf "\n", $t eq $pinfo->{'tag'} ? "selected" : ""; } print " \n"; diff --git a/format/format-lib.pl b/format/format-lib.pl index 77472bf71..62ef5b105 100755 --- a/format/format-lib.pl +++ b/format/format-lib.pl @@ -319,7 +319,7 @@ foreach $d (@dlist) { if ($_[0] > 2) { local $name = $d->{'desc'}; $name .= " ($d->{'type'})" if ($d->{'type'}); - $rv .= sprintf "\n", $d->{'device'}, $_[1] eq $d->{'device'} ? "selected" : "", $name; $found++ if ($_[1] eq $d->{'device'}); @@ -330,7 +330,7 @@ foreach $d (@dlist) { local $name = $p->{'desc'}; next if (!$p->{'end'}); $name .= " ($p->{'tag'})" if ($p->{'tag'}); - $rv .= sprintf "\n", $_[1] eq $p->{'device'} ? "selected" : "", $p->{'device'}, $name; $found++ if ($_[1] eq $p->{'device'}); @@ -338,7 +338,7 @@ foreach $d (@dlist) { } } if (!$found && $_[1] && !$_[3]) { - $rv .= "\n"; } if ($_[3]) { ${$_[3]} = $found; diff --git a/format/newfs_form.cgi b/format/newfs_form.cgi index 8d4d632f7..6f1329b26 100755 --- a/format/newfs_form.cgi +++ b/format/newfs_form.cgi @@ -30,9 +30,9 @@ print " \n"; &opt_input("ufs_n", "", 0); print "\n"; print "\n"; &opt_input("ufs_r", "rpm", 0); &opt_input("ufs_s", "sectors", 1); diff --git a/format/tunefs_form.cgi b/format/tunefs_form.cgi index a609d2573..ab17fd265 100755 --- a/format/tunefs_form.cgi +++ b/format/tunefs_form.cgi @@ -23,9 +23,9 @@ print "
$text{'ufs_o'}
\n"; &opt_input("tunefs_m", "%", 0); print "\n"; print "\n"; print "
$text{'tunefs_opt'}

\n"; diff --git a/gray-theme/theme.pl b/gray-theme/theme.pl index 8d9090a95..d79bc9e7c 100755 --- a/gray-theme/theme.pl +++ b/gray-theme/theme.pl @@ -215,11 +215,15 @@ if ($ref) { sub theme_post_change_modules { print < + EOF } diff --git a/heartbeat/edit_conf.cgi b/heartbeat/edit_conf.cgi index a311e730c..33120cc22 100755 --- a/heartbeat/edit_conf.cgi +++ b/heartbeat/edit_conf.cgi @@ -18,16 +18,16 @@ for($i=0; $i<=@serials; $i++) { local $sfound; print "\n"; } print " \n"; @@ -67,9 +67,9 @@ printf "\n", $mcast ? "checked" : ""; @mcast = split(/\s+/, $mcast); $mloop = "\n"; print &text('conf_mcastv', @@ -129,7 +129,7 @@ if (&foreign_check("syslog")) { local %sconfig = &foreign_config("syslog"); print "\n"; diff --git a/heartbeat/edit_node.cgi b/heartbeat/edit_node.cgi index eedaf28ca..20aaa91b6 100755 --- a/heartbeat/edit_node.cgi +++ b/heartbeat/edit_node.cgi @@ -63,16 +63,16 @@ $i = 0; foreach $a (@{$res->{'servs'}}, "") { local @a = split(/::/, $a); print " \n"; printf " \n", diff --git a/help/index.cgi b/help/index.cgi index 5fe75a722..e7b10fc40 100755 --- a/help/index.cgi +++ b/help/index.cgi @@ -16,7 +16,7 @@ print " $text{'index_all'}\n"; print "  $text{'index_sel'}
\n"; print "    \n"; diff --git a/init/edit_hostconfig.cgi b/init/edit_hostconfig.cgi index 25ac52307..039cb3bf5 100755 --- a/init/edit_hostconfig.cgi +++ b/init/edit_hostconfig.cgi @@ -117,7 +117,12 @@ if ($ty == 1) { print "\n"; print "", &hostconfig_createtext("OrderPreference",""); - print "\n"; + print "\n"; print "", &hostconfig_createtext("Start Message",""); print "\n"; diff --git a/ipfilter/cluster.cgi b/ipfilter/cluster.cgi index 43b86e066..a1964d3a3 100755 --- a/ipfilter/cluster.cgi +++ b/ipfilter/cluster.cgi @@ -45,7 +45,7 @@ if (@addservers) { print "\n"; } @@ -55,7 +55,7 @@ if (@groups) { "value='$text{'cluster_gadd'}'>\n"; print "\n"; } diff --git a/ipfw/edit_rule.cgi b/ipfw/edit_rule.cgi index 1b27036e0..c82f70d6b 100755 --- a/ipfw/edit_rule.cgi +++ b/ipfw/edit_rule.cgi @@ -263,7 +263,7 @@ print &ui_table_row($text{'edit_gid'}, $icmptypes = "\n"; foreach $i (@tcpflags) { - $tcpflags .= sprintf "\n", $i, $gotflags{$i} ? "selected" : "", $i; } foreach $i (@tcpflags) { - $tcpflags .= sprintf "\n", $i, $gotflags{"!$i"} ? "selected" : "", &text('edit_not', $i); } $tcpflags .= "\n"; diff --git a/ipsec/edit_config.cgi b/ipsec/edit_config.cgi index e0eea0c55..52e05b02c 100755 --- a/ipsec/edit_config.cgi +++ b/ipsec/edit_config.cgi @@ -40,25 +40,25 @@ foreach $ifc (@iflist, "") { $found = 0; print "\n"; $found = 0; print "\n"; print "\n"; @@ -80,12 +80,12 @@ $pri =~ s/panic$/emerg/; $pri =~ s/error$/err/; print " $text{'config_pri'}\n"; print " \n"; diff --git a/ipsec/index.cgi b/ipsec/index.cgi index 572cfce9e..60cd331b9 100755 --- a/ipsec/index.cgi +++ b/ipsec/index.cgi @@ -111,7 +111,7 @@ else { "value='$text{'index_up'}'>\n"; print "[1] multiple size=%d>\n", scalar(@opts); foreach $o (@opts, 'apply', 'bootup') { - printf "\n", $o, $can{$o} ? "selected" : "", $text{"acl_".$o} || $text{$o."_title"}; } diff --git a/itsecur-firewall/edit_rule.cgi b/itsecur-firewall/edit_rule.cgi index d541d845a..d37a00ea6 100755 --- a/itsecur-firewall/edit_rule.cgi +++ b/itsecur-firewall/edit_rule.cgi @@ -155,14 +155,14 @@ print " \n"; diff --git a/itsecur-firewall/edit_sep.cgi b/itsecur-firewall/edit_sep.cgi index 484b45880..3c22207d0 100755 --- a/itsecur-firewall/edit_sep.cgi +++ b/itsecur-firewall/edit_sep.cgi @@ -37,14 +37,14 @@ print " \n"; diff --git a/itsecur-firewall/edit_time.cgi b/itsecur-firewall/edit_time.cgi index 44824d24e..f28a36b2f 100755 --- a/itsecur-firewall/edit_time.cgi +++ b/itsecur-firewall/edit_time.cgi @@ -58,7 +58,7 @@ printf " %s
\n", %days = map { $_, 1 } split(/,/, $time->{'days'}); print " \n"; diff --git a/itsecur-firewall/edit_user.cgi b/itsecur-firewall/edit_user.cgi index 51f04bb45..9069c4b4e 100755 --- a/itsecur-firewall/edit_user.cgi +++ b/itsecur-firewall/edit_user.cgi @@ -72,7 +72,7 @@ print " $text{'user_mods'}\n"; @mymods = grep { $acl{$base_remote_user,$_->{'dir'}} } &get_all_module_infos(); print "" : "" : "\n"; foreach $a (@actions) { - $rv .= sprintf "\n", $a, $_[1] eq $a ? "selected" : "", $text{"rule_".$a}; } @@ -422,10 +422,10 @@ local @protos = ( 'tcp', 'udp', 'icmp', 'ip' ); #close(PROTOS); local $p; local $rv = "\n"; local ($i, $found); if ($_[4]) { - $rv .= sprintf "\n", $_[1] eq "" ? "selected" : "", "<None>"; $found++ if ($_[1] eq ""); } foreach $i (@ifaces) { - $rv .= sprintf "\n", $i, $_[1] eq $i ? "selected" : "", $i; $found++ if ($_[1] eq $i); } if ($_[3]) { - $rv .= "\n" if (!$found && $_[1]); } else { - $rv .= sprintf "\n", !$found && $_[1] ? "selected" : "", $text{'rule_oifc'}; $rv .= "\n"; $rv .= sprintf "\n", @@ -505,7 +505,7 @@ return undef if (!@times); local $rv = " %s\n", $job ? "checked" : "", $text{'backup_interval'}; print "\n"; if ($f eq "first" || $f eq "last") { foreach $m (0 .. 1) { - printf "\n", $m, $in{"${f}_mode"} == $m ? "selected" : "", $text{'report_mode'.$m.$f} || $text{'report_mode'.$m}; @@ -48,7 +48,7 @@ foreach $f (@search_fields) { } else { foreach $m (0 .. 2) { - printf "\n", $m, $in{"${f}_mode"} == $m ? "selected" : "", $text{'report_mode'.$m}; } @@ -108,10 +108,10 @@ if (@searches) { print " \n"; print " $text{'report_usesaved'}\n"; print ""; print "/"; diff --git a/itsecur-firewall/status_monitor.pl b/itsecur-firewall/status_monitor.pl index f4dfc1662..f7e0ef782 100644 --- a/itsecur-firewall/status_monitor.pl +++ b/itsecur-firewall/status_monitor.pl @@ -53,7 +53,7 @@ $rv .= "\n"; -printf "\n", $mode == -1 ? "selected" : "", $text{'karma_none'}; -printf "\n", $mode == 0 ? "selected" : "", $text{'karma_low'}; -printf "\n", $mode == 1 ? "selected" : "", $text{'karma_medium'}; -printf "\n", $mode == 2 ? "selected" : "", $text{'karma_high'}; -printf "\n", $mode == 3 ? "selected" : "", $text{'karma_sel'}; print "
\n"; diff --git a/lilo/edit_global.cgi b/lilo/edit_global.cgi index 9a73539e8..ea6b8a5d3 100755 --- a/lilo/edit_global.cgi +++ b/lilo/edit_global.cgi @@ -34,7 +34,7 @@ print " %s\n", $readonly = &find("read-only", $members); $readwrite = &find("read-write", $members); print "\n"; $vga = lc(&find_value("vga", $members)); print "\n"; print "\n", $vga =~ /\d/ ? $vga : ""; diff --git a/lpadmin/acl_security.pl b/lpadmin/acl_security.pl index 4ebb228e8..082092bcf 100755 --- a/lpadmin/acl_security.pl +++ b/lpadmin/acl_security.pl @@ -17,7 +17,7 @@ local ($p, %pcan); map { $pcan{$_}++ } split(/\s+/, $_[0]->{'printers'}); foreach $p (@plist) { local $prn = &get_printer($p); - printf "\n", $p, $pcan{$p} ? 'selected' : '', $prn->{'desc'}, $p; } @@ -34,7 +34,7 @@ print "\n"; foreach $s (@addservers) { print "\n"; } print "\n"; } @@ -56,7 +56,7 @@ if (@groups) { "value='$text{'cluster_gadd'}'>\n"; print "\n"; } diff --git a/lpadmin/hpux-driver.pl b/lpadmin/hpux-driver.pl index 5d8808cbe..b4b670467 100755 --- a/lpadmin/hpux-driver.pl +++ b/lpadmin/hpux-driver.pl @@ -56,7 +56,7 @@ opendir(DIR, $config{'model_path'}); while($f = readdir(DIR)) { if ($f =~ /^\./) { next; } $path = "$config{'model_path'}/$f"; - printf "\n", $path eq $prn{'iface'} ? "selected" : ""; } closedir(DIR); @@ -73,17 +73,17 @@ if (&has_ghostscript()) { print "  "; print "\n"; diff --git a/lpadmin/redhat-driver.pl b/lpadmin/redhat-driver.pl index f3d4d6ad3..8b2b2b130 100755 --- a/lpadmin/redhat-driver.pl +++ b/lpadmin/redhat-driver.pl @@ -258,7 +258,7 @@ foreach $r (@rhs) { $drv->{'rhsname'} eq $r->{'name'}); } } - printf "\n", $r->{'name'}.";".join(";", @res), $drv->{'rhsname'} eq $r->{'name'} ? 'selected' : '', $r->{'desc'}; @@ -274,7 +274,7 @@ printf " $text{'no'}\n", print "\n"; print "\n"; print "\n"; diff --git a/lpadmin/suse-driver.pl b/lpadmin/suse-driver.pl index 99d2ecc82..7ff3cd4ab 100755 --- a/lpadmin/suse-driver.pl +++ b/lpadmin/suse-driver.pl @@ -193,12 +193,12 @@ if ($drv->{'mode'} == 2 || 1) { print "\n"; print "\n"; @@ -228,7 +228,7 @@ if ($drv->{'mode'} == 2 || 1) { print "\n"; print "\n"; print "\n"; @@ -291,7 +291,7 @@ else { print "\n"; print "\n"; print "\n"; @@ -320,7 +320,7 @@ elsif ($type eq "external") { print "\n"; print "\n"; print "\n"; diff --git a/squid/always.cgi b/squid/always.cgi index cfe6379d0..f2fd3b6d0 100755 --- a/squid/always.cgi +++ b/squid/always.cgi @@ -39,7 +39,7 @@ $r = @acls; $r = 10 if ($r > 10); print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; diff --git a/squid/edit_headeracc.cgi b/squid/edit_headeracc.cgi index 8575788d4..e3a669b5b 100755 --- a/squid/edit_headeracc.cgi +++ b/squid/edit_headeracc.cgi @@ -44,7 +44,7 @@ $r = @acls; $r = 10 if ($r > 10); print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; } @@ -205,7 +205,7 @@ local ($rv, %ts); $rv .= sprintf "\n", $_[2]; $rv .= "\n"; @@ -253,10 +253,10 @@ $rv .= sprintf "\n", $v ? $v->{'values'}->[0] : ""; $rv .= "\n"; return $rv; diff --git a/ui-lib.pl b/ui-lib.pl index 989b06647..664cc8e28 100755 --- a/ui-lib.pl +++ b/ui-lib.pl @@ -1132,11 +1132,14 @@ if ($label =~ /^([^<]*)(<[\000-\377]*)$/) { $label = $1; $after = $2; } -return "$after\n"; + " $tags>"; + $ret .= "" if ($label ne ''); + $ret .= "$after\n"; + return $ret; } =head2 ui_textarea(name, value, rows, cols, [wrap], [disabled?], [tags])
$text{'image_mode'} $text{'image_vga'}
$text{'redhat_paper'}
$text{'redhat_pages'}
$text{'suse_printer'}
$text{'suse_paper'}
$text{'suse_printer'}
$text{'suse_paper'}$text{'suse_method'}\n"; foreach $d ('S', 'M', 'T', 'W', 'H', 'F', 'A') { - printf "\n", $day{$d} ? "selected" : ""; } print "
$text{'acl_extclass'}
$text{'acl_sections'}
$text{'ahttp_ma'}$text{'ahttp_dma'}\n"; print "\n"; print &ui_tabs_end_tab(); diff --git a/squid/edit_cache.cgi b/squid/edit_cache.cgi index f682cc612..7b39d844e 100755 --- a/squid/edit_cache.cgi +++ b/squid/edit_cache.cgi @@ -40,13 +40,13 @@ for($i=0; $i<=@dirs; $i++) { print "$text{'ech_t'}
$text{'ahttp_ma'}$text{'ahttp_dma'}
$text{'pool_class'}\n", $_[0], $_[1] > 0 ? $_[1]/$ud[$u] : $_[1]; $rv .= "\n"; diff --git a/squid/edit_smem.cgi b/squid/edit_smem.cgi index 5b8bf2380..8c1df57b2 100755 --- a/squid/edit_smem.cgi +++ b/squid/edit_smem.cgi @@ -70,11 +70,11 @@ for($i=0; $i<=@dirs; $i++) { print " 10); print "
$text{'ahttp_ma'}$text{'ahttp_dma'}
$text{'ahttp_ma'}$text{'ahttp_dma'}
$text{'aicp_ma'}$text{'aicp_dma'}
$text{'ahttp_ma'}$text{'ahttp_dma'}
$text{'ahttp_ma'}$text{'ahttp_dma'}$_[0]