diff --git a/lpadmin/caldera-driver.pl b/lpadmin/caldera-driver.pl index 9e9ce7650..d48b2637c 100755 --- a/lpadmin/caldera-driver.pl +++ b/lpadmin/caldera-driver.pl @@ -243,7 +243,7 @@ foreach $k (sort { $a <=> $b } keys %$plist) { # (!$_[1]->{'gsname'} && !$found && # $_[1]->{'gsdevice'} eq $type); local $got = $_[1]->{'ddesc'} eq $p->{'description'}; - printf "\n", $got ? 'selected' : '', $p->{'description'}.";".join(";", @thisres), $p->{'description'}; @@ -253,7 +253,7 @@ foreach $k (sort { $a <=> $b } keys %$plist) { } print " \n"; @@ -266,7 +266,7 @@ printf " $text{'no'}\n", print "$text{'caldera_paper'} \n"; foreach $u (&list_uniprint()) { - printf "\n", $u->[0], $u->[0] eq $_[1]->{'upp'} ? 'selected' : '', $u->[1]; } @@ -311,7 +311,7 @@ if ($gconfig{'os_version'} < 2.4) { print "$text{'caldera_paper'} \n"; foreach $d (&list_webmin_drivers()) { if ($drvsupp{$d->[0]}) { - printf "\n", $d->[1] eq $drv->{'type'} ? "selected" : "", $d->[1]; } } print "  "; print " \n"; diff --git a/lpadmin/lpadmin-lib.pl b/lpadmin/lpadmin-lib.pl index cbd01f7c2..d50fe81f5 100755 --- a/lpadmin/lpadmin-lib.pl +++ b/lpadmin/lpadmin-lib.pl @@ -349,7 +349,7 @@ if (&has_ghostscript()) { print "  "; print " \n"; @@ -372,7 +372,7 @@ if (&has_ghostscript()) { print "$text{'webmin_uniprint'} "; print " \n"; @@ -195,7 +195,7 @@ printf " $text{'no'}\n", print "$text{'caldera_paper'} \n"; foreach $u (&list_uniprint()) { - printf "\n", $u->[0], $u->[0] eq $_[1]->{'upp'} ? 'selected' : '', $u->[1]; } closedir(DIR); @@ -235,7 +235,7 @@ printf " $text{'no'}\n", print "$text{'caldera_paper'} \n"; -printf "\n", 'text', $drv->{'text'} ? 'selected' : '', "Text printer"; -printf "\n", 'postscript', $drv->{'postscript'} ? 'selected' : '', "Postscript printer"; @@ -238,7 +238,7 @@ local $select_driver = 0; foreach $k (sort { lc($a) cmp lc($b) } keys %$list) { foreach $m (@{$list->{$k}}) { next if (!@{$m->{'drivers'}}); - printf "\n", join(";", $m->{'id'}, @{$m->{'drivers'}}), $drv->{'make'} eq $k && $drv->{'model'} eq $m->{'model'} ? 'selected' : '', @@ -253,13 +253,13 @@ print " \n"; local $foundp = 0; print " $text{'redhat_paper'} \n"; print "\n"; diff --git a/mailboxes/mailboxes-lib.pl b/mailboxes/mailboxes-lib.pl index 113dae2b3..ea53ebbdb 100755 --- a/mailboxes/mailboxes-lib.pl +++ b/mailboxes/mailboxes-lib.pl @@ -974,9 +974,9 @@ if (@$mail) { # Mark as print ""; print ""; print $spacer; diff --git a/majordomo/acl_security.pl b/majordomo/acl_security.pl index bada6d5b2..dc8e20bc7 100755 --- a/majordomo/acl_security.pl +++ b/majordomo/acl_security.pl @@ -17,7 +17,7 @@ print "\n"; diff --git a/majordomo/create_form.cgi b/majordomo/create_form.cgi index fba9e524c..6b7a533ca 100755 --- a/majordomo/create_form.cgi +++ b/majordomo/create_form.cgi @@ -38,10 +38,10 @@ print < $text{'create_archive'} diff --git a/majordomo/digest_form.cgi b/majordomo/digest_form.cgi index 0448b51fe..fd95b5b84 100755 --- a/majordomo/digest_form.cgi +++ b/majordomo/digest_form.cgi @@ -9,7 +9,7 @@ $access{'create'} || &error($text{'cdigest_ecannot'}); $lists = "\n"; diff --git a/majordomo/majordomo-lib.pl b/majordomo/majordomo-lib.pl index 0f35f992b..d5c2f51e6 100755 --- a/majordomo/majordomo-lib.pl +++ b/majordomo/majordomo-lib.pl @@ -328,7 +328,7 @@ local $v = &find_value($_[0], $_[2]); local $rv = "$_[1] \n"; return $rv; diff --git a/mon/edit_global.cgi b/mon/edit_global.cgi index 3b6d10d2b..8d815a160 100755 --- a/mon/edit_global.cgi +++ b/mon/edit_global.cgi @@ -23,7 +23,7 @@ $authtype = &find_value("authtype", $conf); print " $text{'global_authtype'}\n"; print " %s\n", $in{'new'} || $idx >= 0 ? "checked" : "", $text{'service_mon1'}; print "\n"; printf " %s\n", @@ -123,7 +123,7 @@ foreach $p (@periods) { print " \n"; @@ -149,18 +149,18 @@ foreach $p (@periods) { if ($a->{'value'} =~ /^(\S+)\s*(.*)/) { $al = $1; $ar = $2; } - printf "\n", $al ? "" : "selected"; foreach $av (@avail) { - printf "\n", $al eq $av ? "selected" : "", $av; $found++ if ($al eq $av); } - print "\n" if (!$found && $al); print "\n"; print "\n"; foreach $s (&find("hostgroup", $conf)) { - printf "\n", $s eq $watch->{'values'}->[0] ? "selected" : "", $s->{'values'}->[0]; $found++ if ($s eq $watch->{'values'}->[0]); } -print "\n" if (!$found); print " \n"; print " $text{'watch_services'}\n"; diff --git a/mon/list_watches.cgi b/mon/list_watches.cgi index a0e5fae99..bc32cab60 100755 --- a/mon/list_watches.cgi +++ b/mon/list_watches.cgi @@ -34,7 +34,7 @@ print "
\n"; print "\n"; print "
\n"; diff --git a/mon/mon-lib.pl b/mon/mon-lib.pl index 022868fcf..7cc35ba3b 100755 --- a/mon/mon-lib.pl +++ b/mon/mon-lib.pl @@ -343,7 +343,7 @@ sub day_input local @days = ( 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun' ); local $rv = "\n"; @@ -360,7 +360,7 @@ if ($_[1] =~ /^([\d\.]+)(\S)$/) { $rv = "\n"; $rv .= "\n"; diff --git a/mount/hpux-lib.pl b/mount/hpux-lib.pl index a2c620dc4..61240bd21 100755 --- a/mount/hpux-lib.pl +++ b/mount/hpux-lib.pl @@ -592,7 +592,7 @@ if ($_[0] eq "swap") { print " Priority\n"; print " \n"; @@ -607,7 +607,7 @@ if ($_[0] eq "swapfs") { if (!defined($options{backfstype})) { $options{backfstype} = "nfs"; } foreach (&list_fstypes()) { if ($_ eq "cachefs") { next; } - printf "\n", $_ eq $options{backfstype} ? "selected" : ""; } print "\n"; @@ -632,10 +632,10 @@ if ($_[0] eq "swapfs") { print " Consistency check\n"; print "\n"; diff --git a/mount/index.cgi b/mount/index.cgi index b4af9bf71..5e789f7c9 100755 --- a/mount/index.cgi +++ b/mount/index.cgi @@ -143,7 +143,7 @@ local $fs; foreach $fs (sort { &fstype_name($a) cmp &fstype_name($b) } &list_fstypes()) { local $nm = &fstype_name($fs); if (!$donefs{$nm}++ && &can_fstype($fs)) { - print "\n"; } } print "\n"; diff --git a/mount/solaris-lib.pl b/mount/solaris-lib.pl index 6b88c022c..e29dd9894 100755 --- a/mount/solaris-lib.pl +++ b/mount/solaris-lib.pl @@ -682,12 +682,12 @@ if ($_[0] eq "nfs") { print " $text{'solaris_proto'}\n"; print "\n"; - printf "\n", $nfs_auth eq "" ? "selected" : ""; - printf "\n", $nfs_auth eq "dh" ? "selected" : ""; - printf "\n", $nfs_auth eq "krb" ? "selected" : ""; print "\n"; @@ -769,7 +769,7 @@ if ($_[0] eq "ufs") { print "\n"; print " \n"; @@ -892,11 +892,11 @@ if ($_[0] eq "tmpfs") { ($tmpsz = $options{size}) =~ s/[A-z]+$//g; print "\n"; print "\n"; @@ -921,7 +921,7 @@ if ($_[0] eq "cachefs") { if (!defined($options{backfstype})) { $options{backfstype} = "nfs"; } foreach (&list_fstypes()) { if ($_ eq "cachefs") { next; } - printf "\n", $_ eq $options{backfstype} ? "selected" : ""; } print "\n"; @@ -946,10 +946,10 @@ if ($_[0] eq "cachefs") { print " $text{'solaris_con'}\n"; print "\n"; @@ -1075,11 +1075,11 @@ if ($_[0] eq "xmemfs") { ($tmpsz = $options{size}) =~ s/[A-z]+$//g; print "\n"; print "\n"; diff --git a/mysql/acl_security.pl b/mysql/acl_security.pl index 8979397f0..945ddb6c4 100755 --- a/mysql/acl_security.pl +++ b/mysql/acl_security.pl @@ -14,7 +14,7 @@ printf " %s
\n", print "\n"; diff --git a/nis/aix-lib.pl b/nis/aix-lib.pl index a379044c3..3717f016c 100755 --- a/nis/aix-lib.pl +++ b/nis/aix-lib.pl @@ -139,7 +139,7 @@ map { $inall{$_}++ } @all; print " $text{'server_tables'}\n"; print "\n"; diff --git a/nis/coherent-linux-lib.pl b/nis/coherent-linux-lib.pl index edf112867..a90199e84 100755 --- a/nis/coherent-linux-lib.pl +++ b/nis/coherent-linux-lib.pl @@ -146,7 +146,7 @@ map { $inall{$_}++ } split(/\s+/, $rule->{'all'}->{'value'}); print " $text{'server_tables'}\n"; print "\n"; diff --git a/nis/debian-linux-lib.pl b/nis/debian-linux-lib.pl index 3847781ea..cbd553fd9 100755 --- a/nis/debian-linux-lib.pl +++ b/nis/debian-linux-lib.pl @@ -147,7 +147,7 @@ map { $inall{$_}++ } split(/\s+/,&expand_vars($rule->{'all'}->{'value'}, $var)); print " $text{'server_tables'}\n"; print "\n"; diff --git a/nis/edit_passwd_shadow.cgi b/nis/edit_passwd_shadow.cgi index 47aefbc89..1fe8b3b17 100755 --- a/nis/edit_passwd_shadow.cgi +++ b/nis/edit_passwd_shadow.cgi @@ -46,11 +46,11 @@ print "[5]\"> ", print " $text{'passwd_shell'}\n"; print "
\n"; printf " %s\n", diff --git a/nis/edit_services2.cgi b/nis/edit_services2.cgi index 017c9e58b..8fe6369b2 100755 --- a/nis/edit_services2.cgi +++ b/nis/edit_services2.cgi @@ -23,7 +23,7 @@ print "\n"; print "$text{'services_proto'}\n"; print "\n"; local $n = 0; foreach $f (@{$_[0]}) { - $sel .= sprintf "\n", $n, $in{'field'} == $n ? 'selected' : '', $f; $n++; } diff --git a/nis/nis-lib.pl b/nis/nis-lib.pl index fc819a41c..f7ab8d867 100755 --- a/nis/nis-lib.pl +++ b/nis/nis-lib.pl @@ -127,7 +127,7 @@ print ""; print "/"; diff --git a/nis/old_edit_passwd_shadow.cgi b/nis/old_edit_passwd_shadow.cgi index 814a65e06..e2793e64c 100755 --- a/nis/old_edit_passwd_shadow.cgi +++ b/nis/old_edit_passwd_shadow.cgi @@ -43,11 +43,11 @@ print "[5]\"> ", print " $text{'passwd_shell'}\n"; print "
\n"; printf " %s\n", $found ? '' : $passwd->[6], &file_chooser_button("other"); diff --git a/nis/old_edit_switch.cgi b/nis/old_edit_switch.cgi index daee35032..52c964628 100755 --- a/nis/old_edit_switch.cgi +++ b/nis/old_edit_switch.cgi @@ -38,13 +38,13 @@ foreach $s (@switch) { print "\n"; foreach $c (@conf) { - printf "\n", $c->{'table'}, $c->{'active'} ? 'selected' : '', $c->{'table'}; } diff --git a/nis/openmamba-linux-lib.pl b/nis/openmamba-linux-lib.pl index 9df9621c4..3b9b32e12 100755 --- a/nis/openmamba-linux-lib.pl +++ b/nis/openmamba-linux-lib.pl @@ -146,7 +146,7 @@ map { $inall{$_}++ } split(/\s+/, $rule->{'all'}->{'value'}); print " $text{'server_tables'}\n"; print "\n"; diff --git a/nis/redhat-linux-lib.pl b/nis/redhat-linux-lib.pl index e570c389e..2f9a2d204 100755 --- a/nis/redhat-linux-lib.pl +++ b/nis/redhat-linux-lib.pl @@ -146,7 +146,7 @@ map { $inall{$_}++ } split(/\s+/, $rule->{'all'}->{'value'}); print " $text{'server_tables'}\n"; print "\n"; diff --git a/nis/solaris-lib.pl b/nis/solaris-lib.pl index 18d0f3c4f..368e43710 100755 --- a/nis/solaris-lib.pl +++ b/nis/solaris-lib.pl @@ -137,7 +137,7 @@ map { $inall{$_}++ } @all; print " $text{'server_tables'}\n"; print "\n"; diff --git a/nis/suse-linux-lib.pl b/nis/suse-linux-lib.pl index d145124d1..43d0b6d85 100755 --- a/nis/suse-linux-lib.pl +++ b/nis/suse-linux-lib.pl @@ -157,7 +157,7 @@ map { $inall{$_}++ } split(/\s+/, $rule->{'all'}->{'value'}); print " $text{'server_tables'}\n"; print "\n"; diff --git a/nis/united-linux-lib.pl b/nis/united-linux-lib.pl index d97b70760..98991ac02 100755 --- a/nis/united-linux-lib.pl +++ b/nis/united-linux-lib.pl @@ -153,7 +153,7 @@ map { $inall{$_}++ } split(/\s+/, $rule->{'all'}->{'value'}); print " $text{'server_tables'}\n"; print "\n"; diff --git a/pap/edit_mgetty.cgi b/pap/edit_mgetty.cgi index a79ccbb80..bc852055a 100755 --- a/pap/edit_mgetty.cgi +++ b/pap/edit_mgetty.cgi @@ -31,13 +31,13 @@ foreach $t (sort { "$a$b" =~ /^\/dev\/ttyS(\d+)\/dev\/ttyS(\d+)$/ ? $1 <=> $2 : glob($config{'serials'})) { $t =~ s/^\/dev\///; local $f = $init->{'tty'} eq $t || $init->{'tty'} eq "/dev/$t"; - printf "\n", $t, $f ? "selected" : "", $t =~ /^ttyS(\d+)$/ ? &text('mgetty_ts', $1+1) : $t =~ /^term\/(\S+)$/ ? &text('mgetty_ts', uc($1)) : "/dev/$t"; $found++ if ($f); } -printf "\n", $found ? "" : "selected", $text{'mgetty_other'}; print "\n"; printf " %s\n", diff --git a/pap/edit_options.cgi b/pap/edit_options.cgi index f840efea1..1f275b21a 100755 --- a/pap/edit_options.cgi +++ b/pap/edit_options.cgi @@ -104,11 +104,11 @@ $modem = &find("modem", \@opts); $local = &find("local", \@opts); print "$text{'options_ctrl'}\n"; print " \n"; diff --git a/postgresql/acl_security.pl b/postgresql/acl_security.pl index 04b44a98d..5d8443e17 100755 --- a/postgresql/acl_security.pl +++ b/postgresql/acl_security.pl @@ -18,7 +18,7 @@ if (@listdb) { print ""; diff --git a/ppp-client/edit.cgi b/ppp-client/edit.cgi index fdc650ab2..a011bb52b 100755 --- a/ppp-client/edit.cgi +++ b/ppp-client/edit.cgi @@ -72,7 +72,7 @@ printf " %s\n", print "\n"; -printf "\n", $modem ? "" : "selected", $defs ? $text{'edit_none'} : $text{'edit_def'}, $dm ? "($dm)" : ""; -printf "\n", $modem eq "/dev/modem" ? "selected" : "", $text{'edit_modem'}, "/dev/modem"; foreach $t (sort { "$a$b" =~ /^\/dev\/ttyS(\d+)\/dev\/ttyS(\d+)$/ ? $1 <=> $2 : 0 } glob("/dev/ttyS[0-9]*")) { - printf "\n", $t, $modem eq $t ? "selected" : "", $t =~ /ttyS(\d+)$/ ? &text('edit_port', $1+1) : $t; $found++ if ($modem eq $t); } -printf "\n", $found ? "" : "selected", $text{'edit_otherm'}; print "\n"; printf "\n", diff --git a/ppp-client/index.cgi b/ppp-client/index.cgi index ba17ca577..2663c43f9 100755 --- a/ppp-client/index.cgi +++ b/ppp-client/index.cgi @@ -88,7 +88,7 @@ else { "value='$text{'index_connect'}'>\n"; print "\n"; print "\n"; print "\n"; foreach $o (0 .. 2) { - printf "\n", $o, $r->[0] == $o ? "selected" : "", $text{'edit_type'.$o}; } diff --git a/pptp-client/index.cgi b/pptp-client/index.cgi index 60aa93839..e0ed2a643 100755 --- a/pptp-client/index.cgi +++ b/pptp-client/index.cgi @@ -58,7 +58,7 @@ else { print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; foreach $s (&supported_signals()) { - printf "\n", $s eq "HUP" ? "selected" : ""; } print "\n"; diff --git a/proftpd/allmanual_form.cgi b/proftpd/allmanual_form.cgi index 0462813ad..06a3fbdf9 100755 --- a/proftpd/allmanual_form.cgi +++ b/proftpd/allmanual_form.cgi @@ -14,7 +14,7 @@ print "
\n"; print "\n"; print "\n"; foreach $c ('cwd', 'mkd', 'rnfr', 'dele', 'rmd', 'retr', 'stor') { - printf "\n", uc($c), $cmd{$c} ? "selected" : "", uc($c); } print " \n"; diff --git a/proftpd/mod_core.pl b/proftpd/mod_core.pl index 48c4cf92b..4b0a52e81 100755 --- a/proftpd/mod_core.pl +++ b/proftpd/mod_core.pl @@ -393,11 +393,11 @@ foreach $c (@{$_[0]}, { }) { $rv .= "\n"; $rv .= "\n"; $rv .= "\n"; $rv .= "\n"; diff --git a/proftpd/proftpd-lib.pl b/proftpd/proftpd-lib.pl index c2e283ffa..d436b103c 100755 --- a/proftpd/proftpd-lib.pl +++ b/proftpd/proftpd-lib.pl @@ -427,7 +427,7 @@ local($i, $rv); $rv = "\n"; diff --git a/pserver/cvsweb.cgi b/pserver/cvsweb.cgi index 5a20075e3..46c2619ad 100755 --- a/pserver/cvsweb.cgi +++ b/pserver/cvsweb.cgi @@ -709,11 +709,11 @@ elsif (-d $fullname) { print "\n"; print "\n"; @@ -731,18 +731,18 @@ elsif (-d $fullname) { print "
"; print ""; print ""; print ""; print "\n"; print "\n", $_[0]->{'manual'} ? "" : "checked"; print "\n"; diff --git a/sendmail/edit_feature.cgi b/sendmail/edit_feature.cgi index 14bf1ad89..ff65f1aa1 100755 --- a/sendmail/edit_feature.cgi +++ b/sendmail/edit_feature.cgi @@ -63,7 +63,7 @@ elsif ($feature->{'type'} == 1) { print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; local ($l, $b) = $_[4] =~ /(\d+):(\d+)/ ? ($1, $2) : ( ); @@ -825,27 +825,27 @@ foreach $a ((sort { $a cmp $b } @rules_actions), &list_standard_actions(), (&version_atleast(3) ? ( "-------- Macros --------", &list_standard_macros() ) : ( ) )) { - printf "\n", $a, $action eq $a ? "selected" : "", $a; $found++ if ($action eq $a); } -print "\n" if (!$found); print "\n"; # Logging level print "$text{'rules_log'}\n"; if (&version_atleast(3)) { @@ -890,13 +890,13 @@ print "\n"; print "\n", @@ -1061,11 +1061,11 @@ print "\n"; print "\n", @@ -1091,11 +1091,11 @@ print "\n"; print "\n"; print "\n"; @@ -1430,12 +1430,12 @@ foreach $tt ('ipsec', 'ipsecnat', : ( )), 'ip', 'gre', 'pptpclient', 'pptpserver', 'generic', (&version_atleast(1, 3, 14) ? ( 'openvpn' ) : ( )) ) { - printf "\n", $tt, $ttype eq $tt ? "selected" : "", $text{'tunnels_'.$tt.'_l'} || $text{'tunnels_'.$tt}; $found++ if ($ttype eq $tt); } -print "\n" if (!$found); print "\n"; print "\n"; print "\n"; @@ -1564,12 +1564,12 @@ print "\n"; print "\n", diff --git a/shorewall6/shorewall6-lib.pl b/shorewall6/shorewall6-lib.pl index 5d5649e75..7dbb8ff2b 100755 --- a/shorewall6/shorewall6-lib.pl +++ b/shorewall6/shorewall6-lib.pl @@ -366,28 +366,28 @@ if ($_[3] == 2) { $found = !$_[1]; } elsif ($_[3] == 1) { - printf "\n", $_[1] eq '-' ? "selected" : "", "<$text{'list_any'}>"; $found = !$_[1] || $_[1] eq '-'; } elsif ($_[3] == 0) { - printf "\n", $_[1] eq 'all' ? "selected" : "", "<$text{'list_any'}>"; - printf "\n", &is_fw($_[1]) ? "selected" : "", "<$text{'list_fw'}>"; $found = !$_[1] || $_[1] eq 'all' || &is_fw($_[1]); } foreach $z (@ztable) { - printf "\n", $z->[0], $_[1] eq $z->[0] ? "selected" : "", &convert_zone($z->[0]); $found++ if ($_[1] eq $z->[0]); } if ($_[2]) { - printf "\n", $found ? "" : "selected", $text{'list_other'}; } else { - print "\n" if (!$found); } print "\n"; return $found; @@ -400,11 +400,11 @@ local @itable = &read_table_file("interfaces", \&standard_parser); print "\n"; } @@ -672,27 +672,27 @@ print "\n"; print "\n"; print "\n"; print "\n"; local ($l, $b) = $_[4] =~ /(\d+):(\d+)/ ? ($1, $2) : ( ); @@ -772,27 +772,27 @@ foreach $a ((sort { $a cmp $b } @rules_actions), &list_standard_actions(), (&version_atleast(3) ? ( "-------- Macros --------", &list_standard_macros() ) : ( ) )) { - printf "\n", $a, $action eq $a ? "selected" : "", $a; $found++ if ($action eq $a); } -print "\n" if (!$found); print "\n"; # Logging level print "$text{'rules_log'}\n"; if (&version_atleast(3)) { @@ -837,13 +837,13 @@ print "\n"; print "\n", @@ -1008,11 +1008,11 @@ print "\n"; print "\n", @@ -1038,11 +1038,11 @@ print "\n"; print "\n"; print "\n"; @@ -1204,12 +1204,12 @@ if ($ttype =~ s/^(openvpn|openvpnserver|openvpnclient|generic):(.*)$/$1/) { foreach $tt ('ipsec', 'ipsecnat', 'ipsec:ah', 'gre', 'l2tp', 'openvpn', 'openvpnclient', 'openvpnserver', 'generic') { - printf "\n", $tt, $ttype eq $tt ? "selected" : "", $text{'tunnels_'.$tt.'_l'} || $text{'tunnels_'.$tt}; $found++ if ($ttype eq $tt); } -print "\n" if (!$found); print "\n"; print "\n"; print "\n"; @@ -1334,12 +1334,12 @@ print "\n"; print "\n", diff --git a/spam/acl_security.pl b/spam/acl_security.pl index 9cc319451..ae491ef93 100755 --- a/spam/acl_security.pl +++ b/spam/acl_security.pl @@ -11,7 +11,7 @@ print "\n"; diff --git a/status/index.cgi b/status/index.cgi index e98e67373..96d86922b 100755 --- a/status/index.cgi +++ b/status/index.cgi @@ -170,7 +170,7 @@ if ($access{'edit'}) { print " ", "\n"; diff --git a/status/mailserver-monitor.pl b/status/mailserver-monitor.pl index 07ff50b79..2a945ea85 100755 --- a/status/mailserver-monitor.pl +++ b/status/mailserver-monitor.pl @@ -84,7 +84,7 @@ print "\n"; print "\n"; print "\n"; } print "\n"; diff --git a/usermin/acl_security.pl b/usermin/acl_security.pl index d5e496468..e7d0b6bd0 100755 --- a/usermin/acl_security.pl +++ b/usermin/acl_security.pl @@ -8,7 +8,7 @@ sub acl_security_form print "\n"; print "\n"; @@ -21,7 +21,7 @@ printf " %s
\n", local %mods = map { $_, 1 } split(/\s+/, $_[0]->{'mods'}); print "\n"; diff --git a/usermin/edit_assignment.cgi b/usermin/edit_assignment.cgi index 676ac5092..68cd39a42 100755 --- a/usermin/edit_assignment.cgi +++ b/usermin/edit_assignment.cgi @@ -44,7 +44,7 @@ sub cats { $cats{$_} = $catnames{$_}; } foreach $c (sort { $cats{$a} cmp $cats{$b} } keys %cats) { - $cats .= sprintf "\n", $c, $_[1] eq $c ? 'selected' : '', $cats{$c}; } $cats = qq(\n); diff --git a/usermin/edit_mods.cgi b/usermin/edit_mods.cgi index 369e17bd0..1d24a90f1 100755 --- a/usermin/edit_mods.cgi +++ b/usermin/edit_mods.cgi @@ -38,7 +38,7 @@ print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "
Preferences
Sort files by revisions by: \n"; print "
Diff format: "; printDiffSelect(0); @@ -842,11 +842,11 @@ sub printDiffSelect($) { print ""; } @@ -1856,7 +1856,7 @@ sub readLog($;$) { } $revsym{$rev} .= ", " if ($revsym{$rev}); $revsym{$rev} .= $_; - $sel .= "\n"; } print "Done associating revisions with branches\n" if ($verbose); @@ -2127,7 +2127,7 @@ sub doLog($) { } print "Diffs between \n"; print "\n"; $diffrev = $revdisplayorder[$#revdisplayorder]; @@ -2135,7 +2135,7 @@ sub doLog($) { print "\n"; print " and \n"; print "\n"; $diffrev = $revdisplayorder[0]; @@ -2165,12 +2165,12 @@ sub doLog($) { print "\n"; foreach (reverse sort @branchnames) { print "${_}\n"; + print ">${_}\n"; } print "\n"; print "\n"; @@ -2191,9 +2191,9 @@ sub doLog($) { print "\n"; print "\n"; print "\n"; diff --git a/qmailadmin/old_edit_ffile.cgi b/qmailadmin/old_edit_ffile.cgi index 665984427..f90eaa498 100755 --- a/qmailadmin/old_edit_ffile.cgi +++ b/qmailadmin/old_edit_ffile.cgi @@ -28,16 +28,16 @@ $i = 0; foreach $f (@filter, [ 1, '', '', '' ]) { $field = "\n"; $what = "\n"; diff --git a/qmailadmin/qmail-lib.pl b/qmailadmin/qmail-lib.pl index 07e81415e..c4c42ced7 100755 --- a/qmailadmin/qmail-lib.pl +++ b/qmailadmin/qmail-lib.pl @@ -90,10 +90,10 @@ if ($n =~ /^(\S+)-(\S+)$/) { if (@virts) { printf "\@", $n; print "
$text{'aform_val'}\n"; diff --git a/sendmail/acl_security.pl b/sendmail/acl_security.pl index bc780af6c..e14212b84 100755 --- a/sendmail/acl_security.pl +++ b/sendmail/acl_security.pl @@ -72,11 +72,11 @@ printf " $text{'no'}$text{'acl_mailq'}
$text{'feature_feat'}
$text{'feature_def'}\n"; @@ -106,7 +106,7 @@ elsif ($feature->{'type'} == 4) { print "
$text{'feature_mailer'}
$text{'feature_ostype'}\n"; foreach $ft ('', 'from', 'to', 'subject', 'cc', 'body') { - $field .= sprintf "\n", $ft, $f->[2] eq $ft ? "selected" : "", $ft ? $text{"ffile_$ft"} : " "; } $field .= "\n"; $what = "\n"; diff --git a/sendmail/list_features.cgi b/sendmail/list_features.cgi index f19fa9209..280c4ae76 100755 --- a/sendmail/list_features.cgi +++ b/sendmail/list_features.cgi @@ -55,7 +55,7 @@ if (@features) { print "\n"; print "\n"; foreach $f ('from', 'subject', 'to', 'cc', 'date', 'status', 'body', 'headers', 'size', '', '!from', '!subject', '!to', '!cc', '!date', '!status', '!body', '!headers', '!size') { - printf "\n", $f, $text{"match_$f"}; } print "\n"; print "\n"; diff --git a/sentry/edit_hostsentry.cgi b/sentry/edit_hostsentry.cgi index aae248caa..906189005 100755 --- a/sentry/edit_hostsentry.cgi +++ b/sentry/edit_hostsentry.cgi @@ -56,15 +56,15 @@ print "\n"; for($i=0; $i<@allmods || $i<@mods; $i++) { print $i+1,". "; print "\n"; print "
\n" if ($i%2); diff --git a/servers/acl_security.pl b/servers/acl_security.pl index 8dd7495d9..ba422ac3f 100755 --- a/servers/acl_security.pl +++ b/servers/acl_security.pl @@ -16,7 +16,7 @@ local @servers = sort { $a->{'host'} cmp $b->{'host'} } &list_servers(); local ($z, %zcan); map { $zcan{$_}++ } split(/\s+/, $_[0]->{'servers'}); foreach $z (sort { $a->{'value'} cmp $b->{'value'} } @servers) { - printf "\n", $z->{'id'}, $zcan{$z->{'host'}} || $zcan{$z->{'id'}} ? "selected" : "", $z->{'host'} ; diff --git a/shorewall/shorewall-lib.pl b/shorewall/shorewall-lib.pl index 91083c2d6..6a60513b9 100755 --- a/shorewall/shorewall-lib.pl +++ b/shorewall/shorewall-lib.pl @@ -376,28 +376,28 @@ if ($_[3] == 2) { $found = !$_[1]; } elsif ($_[3] == 1) { - printf "\n", $_[1] eq '-' ? "selected" : "", "<$text{'list_any'}>"; $found = !$_[1] || $_[1] eq '-'; } elsif ($_[3] == 0) { - printf "\n", $_[1] eq 'all' ? "selected" : "", "<$text{'list_any'}>"; - printf "\n", &is_fw($_[1]) ? "selected" : "", "<$text{'list_fw'}>"; $found = !$_[1] || $_[1] eq 'all' || &is_fw($_[1]); } foreach $z (@ztable) { - printf "\n", $z->[0], $_[1] eq $z->[0] ? "selected" : "", &convert_zone($z->[0]); $found++ if ($_[1] eq $z->[0]); } if ($_[2]) { - printf "\n", $found ? "" : "selected", $text{'list_other'}; } else { - print "\n" if (!$found); } print "\n"; return $found; @@ -410,11 +410,11 @@ local @itable = &read_table_file("interfaces", \&standard_parser); print "\n"; } @@ -713,27 +713,27 @@ print "
$text{'policy_2'}$text{'policy_3'}
$text{'rules_3'}\n"; printf "
$text{'tos_2'}\n"; printf "
$text{'tos_5'}
$text{'tos_6'}
$text{'blacklist_proto'}\n"; printf "
$text{'policy_2'}$text{'policy_3'}
$text{'rules_3'}\n"; printf "
$text{'tos_2'}\n"; printf "
$text{'tos_5'}
$text{'tos_6'}
$text{'blacklist_proto'}\n"; printf "
$text{'mailserver_timeout'}\n"; print "$text{'edit_type'}
$text{'acl_icons'}
$text{'mods_cname'}
$text{'mods_cnew'}
$text{'mods_ccat'}
\n"; @@ -88,7 +88,7 @@ foreach $m (@mlist) { $home ? "" : sprintf "(%d/%d/%d)", $tm[3], $tm[4]+1, $tm[5]+1900; - printf "\n", $m->{'dir'}, $m->{'desc'}, $vstr; } } diff --git a/usermin/edit_themes.cgi b/usermin/edit_themes.cgi index 82d5326e2..200a7936a 100755 --- a/usermin/edit_themes.cgi +++ b/usermin/edit_themes.cgi @@ -14,7 +14,7 @@ if (@themes) { print "
\n"; print "$text{'themes_sel'} \n"; foreach $t (@themes) { - printf "\n", $t->{'dir'}, $t->{'desc'}; } print "\n"; diff --git a/vgetty/edit_vgetty.cgi b/vgetty/edit_vgetty.cgi index 592578c5e..ef950d59f 100755 --- a/vgetty/edit_vgetty.cgi +++ b/vgetty/edit_vgetty.cgi @@ -31,13 +31,13 @@ foreach $t (sort { "$a$b" =~ /^ttyS(\d+)ttyS(\d+)$/ ? $1 <=> $2 : 0 } readdir(DEV)) { if ($t =~ /^ttyS(\d+)$/) { local $f = $init->{'tty'} eq $t || $init->{'tty'} eq "/dev/$t"; - printf "\n", $t, $f ? "selected" : "", &text('vgetty_ts', $1+1); $found++ if ($f); } } closedir(DEV); -printf "\n", $found ? "" : "selected", $text{'vgetty_other'}; print "\n"; printf " %s \n", diff --git a/vgetty/list_messages.cgi b/vgetty/list_messages.cgi index ccc728dee..e0bd44dc0 100755 --- a/vgetty/list_messages.cgi +++ b/vgetty/list_messages.cgi @@ -63,7 +63,7 @@ print "\n"; print "\n"; print "$text{'messages_fmt'} \n"; foreach $m (@modes) { - $rv .= sprintf "\n", $m, $am[$i] eq $m ? "selected" : "", $text{"vgetty_ans_$m"}; } $rv .= " "; diff --git a/webalizer/edit_log.cgi b/webalizer/edit_log.cgi index 114d71d7b..0851dda53 100755 --- a/webalizer/edit_log.cgi +++ b/webalizer/edit_log.cgi @@ -51,7 +51,7 @@ print " $text{'edit_type'} \n"; if ($in{'new'}) { print "\n"; } diff --git a/webmincron/webmincron-lib.pl b/webmincron/webmincron-lib.pl index 6a62660d6..7b665399c 100644 --- a/webmincron/webmincron-lib.pl +++ b/webmincron/webmincron-lib.pl @@ -300,7 +300,7 @@ foreach my $arr ("mins", "hours", "days", "months", "weekdays") { foreach my $v (@sec) { if ($v =~ /^(.*)=(.*)$/) { $disp = $1; $code = $2; } else { $disp = $code = $v; } - $rv .= sprintf "\n", $inuse{$code} ? "selected" : ""; } $rv .= "\n"; diff --git a/webminlog/acl_security.pl b/webminlog/acl_security.pl index f0cf7d84b..ecaaa07c6 100755 --- a/webminlog/acl_security.pl +++ b/webminlog/acl_security.pl @@ -16,7 +16,7 @@ local %gotmod = map { $_, 1 } split(/\s+/, $_[0]->{'mods'}); print "\n"; my $u; foreach $u (sort { $a->{'name'} cmp $b->{'name'} } &acl::list_users()) { - printf "\n", $u->{'name'}, $gotuser{$u->{'name'}} ? "selected" : "", $u->{'name'}; } diff --git a/wuftpd/edit_acl.cgi b/wuftpd/edit_acl.cgi index 6252dc4b5..0e5382760 100755 --- a/wuftpd/edit_acl.cgi +++ b/wuftpd/edit_acl.cgi @@ -42,9 +42,9 @@ $i = 0; foreach $l (@limit) { print "\n"; print "\n"; @@ -87,22 +87,22 @@ foreach $l (@fblimit) { splice(@$f, 0, 0, '0') if ($f->[0] ne 'raw'); print "\n"; print "\n"; print "\n"; @@ -114,10 +114,10 @@ foreach $l (@fblimit) { print "\n"; print "\n"; diff --git a/wuftpd/edit_anon.cgi b/wuftpd/edit_anon.cgi index bf24089d9..384f194d1 100755 --- a/wuftpd/edit_anon.cgi +++ b/wuftpd/edit_anon.cgi @@ -29,10 +29,10 @@ foreach $r (@root) { printf " %s\n", $r->[0], &file_chooser_button("dir_$i", 1); print " \n"; @@ -94,12 +94,12 @@ printf "\n", $p ? 'checked' : ''; print " \n"; diff --git a/wuftpd/edit_misc.cgi b/wuftpd/edit_misc.cgi index 5cfd60b61..44ba48efa 100755 --- a/wuftpd/edit_misc.cgi +++ b/wuftpd/edit_misc.cgi @@ -47,10 +47,10 @@ foreach $n (@nice) { print "\n"; print "\n"; print " \n"; @@ -70,10 +70,10 @@ foreach $u (@umask) { print "\n"; print "\n"; print " \n"; diff --git a/wuftpd/edit_net.cgi b/wuftpd/edit_net.cgi index 7ed665797..9b799ab9d 100755 --- a/wuftpd/edit_net.cgi +++ b/wuftpd/edit_net.cgi @@ -24,10 +24,10 @@ foreach $t (@tcp) { print "\n"; print "\n"; print " \n"; diff --git a/wuftpd/edit_perm.cgi b/wuftpd/edit_perm.cgi index 0af1e7eb6..472b83e20 100755 --- a/wuftpd/edit_perm.cgi +++ b/wuftpd/edit_perm.cgi @@ -31,9 +31,9 @@ foreach $p (@perms) { print "\n"; print "\n";