From 48445ebb600a6ddb1d0dcb71ae57c371cd09feef Mon Sep 17 00:00:00 2001 From: Joe Cooper Date: Sat, 10 May 2008 03:09:08 +0000 Subject: [PATCH] ui_hr --- certmgr/gencert.cgi | 12 ++++++------ certmgr/gencsr.cgi | 10 +++++----- certmgr/import.cgi | 4 ++-- certmgr/index.cgi | 2 +- certmgr/signcsr.cgi | 10 +++++----- certmgr/view.cgi | 10 +++++----- cfengine/cluster.cgi | 2 +- cfengine/edit_cfd.cgi | 2 +- cfengine/edit_push.cgi | 2 +- cfengine/index.cgi | 2 +- cfengine/list_hosts.cgi | 2 +- cluster-software/edit_host.cgi | 2 +- cluster-software/edit_pack.cgi | 2 +- cluster-software/index.cgi | 4 ++-- cluster-useradmin/edit_group.cgi | 2 +- cluster-useradmin/edit_host.cgi | 2 +- cluster-useradmin/edit_user.cgi | 2 +- cluster-useradmin/index.cgi | 2 +- cluster-usermin/edit_mod.cgi | 2 +- cluster-usermin/index.cgi | 4 ++-- cluster-webmin/edit_group.cgi | 2 +- cluster-webmin/edit_mod.cgi | 2 +- cluster-webmin/edit_user.cgi | 2 +- cluster-webmin/index.cgi | 8 ++++---- dfsadmin/index.cgi | 2 +- dhcp-dns/index.cgi | 2 +- dhcpd/edit_shared.cgi | 2 +- dhcpd/edit_subnet.cgi | 2 +- dhcpd/index.cgi | 6 +++--- dnsadmin/delete_zone.cgi | 4 ++-- dnsadmin/edit_master.cgi | 2 +- dnsadmin/edit_record.cgi | 4 ++-- dnsadmin/edit_recs.cgi | 2 +- dnsadmin/edit_slave.cgi | 4 ++-- dnsadmin/edit_text.cgi | 4 ++-- dnsadmin/index.cgi | 16 ++++++++-------- dnsadmin/master_form.cgi | 4 ++-- dnsadmin/slave_form.cgi | 4 ++-- exports/index.cgi | 2 +- fdisk/edit_disk.cgi | 2 +- fdisk/edit_part.cgi | 2 +- fetchmail/index.cgi | 4 ++-- firewall/index.cgi | 4 ++-- frox/index.cgi | 2 +- 44 files changed, 84 insertions(+), 84 deletions(-) diff --git a/certmgr/gencert.cgi b/certmgr/gencert.cgi index 21dfab3c5..75257b8a8 100755 --- a/certmgr/gencert.cgi +++ b/certmgr/gencert.cgi @@ -42,9 +42,9 @@ if ($error) { print "$error\n$text{'gencert_pleasefix'}\n"; } -print "
\n"; +print &ui_hr(); &print_cert_form("gencert"); -print "
\n"; +print &ui_hr(); &footer("", $text{'index_return'}); sub process{ @@ -52,7 +52,7 @@ sub process{ $outfile=&tempname(); if (((-e $in{'certfile'})||(-e $in{'keyfile'})||(-e $in{'keycertfile'}))&&($in{'overwrite'} ne "yes")) { &overwriteprompt(); - print "
\n"; + print &ui_hr(); &footer("", $text{'index_return'}); exit; } @@ -102,7 +102,7 @@ EOF } unlink($outfile); unlink($conffilename); - print "
\n"; + print &ui_hr(); if ($error){ print "$text{'gencert_e_genfailed'}\n
$error
\n
\n";} else { print "$text{'gencert_genworked'}\n
$out
\n"; @@ -114,9 +114,9 @@ EOF if (-e $in{'keycertfile'}) { print "$text{'gencert_saved_keycert'} $in{'keyfile'}
\n"; } - print "
\n"; + print &ui_hr(); } - print "
\n"; + print &ui_hr(); &footer("", $text{'index_return'}); } diff --git a/certmgr/gencsr.cgi b/certmgr/gencsr.cgi index 48e600798..a43ff35a9 100755 --- a/certmgr/gencsr.cgi +++ b/certmgr/gencsr.cgi @@ -45,9 +45,9 @@ if ($error) { if (!$in{'emailAddress'}) { $in{'emailAddress'}=$config{'default_email'}; } } -print "
\n"; +print &ui_hr(); &print_cert_form("gencsr"); -print "
\n"; +print &ui_hr(); &footer("", $text{'index_return'}); sub process{ @@ -55,7 +55,7 @@ sub process{ $outfile=&tempname(); if (((-e $in{'csrfile'})||(-e $in{'keyfile'}))&&($in{'overwrite'} ne "yes")) { &overwriteprompt(); - print "
\n"; + print &ui_hr(); &footer("", $text{'index_return'}); exit; } @@ -93,7 +93,7 @@ EOF } unlink($outfile); unlink($conffilename); - print "
\n"; + print &ui_hr(); if ($error){ print "$text{'gencsr_e_genfailed'}\n
$error
\n
\n";} else { print "$text{'gencsr_genworked'}\n
$out
\n"; @@ -102,7 +102,7 @@ EOF $url="\"view.cgi?keyfile=".&my_urlize($in{'keyfile'}).'"'; print "$text{'gencert_saved_key'} $in{'keyfile'}
\n"; } - print "
\n"; + print &ui_hr(); &footer("", $text{'index_return'}); } diff --git a/certmgr/import.cgi b/certmgr/import.cgi index 56468cc88..554e8e65a 100755 --- a/certmgr/import.cgi +++ b/certmgr/import.cgi @@ -118,9 +118,9 @@ sub receive { close(FILE); if ($type eq "cert") { chmod(0644,$filename); } elsif ($type eq "key") { chmod(0400,$filename); } - print "
\n"; + print &ui_hr(); print "

File $filename uploaded successfully

\n"; - print "
\n"; + print &ui_hr(); &footer("", $text{'import_return'}); } diff --git a/certmgr/index.cgi b/certmgr/index.cgi index 71585dbe6..f1437443b 100755 --- a/certmgr/index.cgi +++ b/certmgr/index.cgi @@ -23,6 +23,6 @@ foreach $p (@pages) { print "$txt\n"; } print "\n"; -print "
\n"; +print &ui_hr(); &footer("/", $text{'index_index'}); diff --git a/certmgr/signcsr.cgi b/certmgr/signcsr.cgi index 7d2688112..b2b5ea88e 100755 --- a/certmgr/signcsr.cgi +++ b/certmgr/signcsr.cgi @@ -37,9 +37,9 @@ if ($error) { print "$error\n$text{'gencert_pleasefix'}\n"; } -print "
\n"; +print &ui_hr(); &print_sign_form("signcsr"); -print "
\n"; +print &ui_hr(); &footer("", $text{'index_return'}); sub process{ @@ -51,7 +51,7 @@ sub process{ } if ((-e $in{'signfile'})&&($in{'overwrite'} ne "yes")) { &overwriteprompt(); - print "
\n"; + print &ui_hr(); &footer("", $text{'index_return'}); exit; } @@ -67,13 +67,13 @@ sub process{ $error=0; chmod(0400,$in{'signfile'}); } - print "
\n"; + print &ui_hr(); if ($error){ print "$text{'signcsr_e_signfailed'}\n
$error
\n
\n";} else { print "$text{'signcsr_worked'}\n
$out
\n"; $url="\"view.cgi?certfile=".&my_urlize($in{'signfile'}).'"'; print "$text{'signcsr_saved_cert'} $in{'signfile'}
\n"; - print "
\n"; + print &ui_hr(); } &footer("", $text{'index_return'}); } diff --git a/certmgr/view.cgi b/certmgr/view.cgi index adbe733f3..771019baf 100755 --- a/certmgr/view.cgi +++ b/certmgr/view.cgi @@ -15,7 +15,7 @@ $wildcard_pattern=~s/\?/./g; if ($in{'dl'} ne "yes" && $in{'pkcs12'} ne "yes") { &header($text{'view_title'}, ""); - print "
\n"; + print &ui_hr(); } if ($in{'delete'} eq "yes"){ if ($in{'keyfile'}) { $file=$in{'keyfile'} } @@ -72,7 +72,7 @@ if ($in{'keyfile'}) { else {&print_key_info(1,$buffer);} print "\n"; &download_form("keyfile", $in{'keyfile'}, $text{'key'}); - print "
\n"; + print &ui_hr(); &footer("", $text{'index_return'}); exit; } @@ -101,7 +101,7 @@ if ($in{'certfile'}||$in{'csrfile'}) { else {&print_cert_info(1,$buffer);} print "\n"; &download_form("certfile", $in{'certfile'}, $text{'certificate'}); - print "
\n"; + print &ui_hr(); &footer("", $text{'index_return'}); exit; } @@ -131,7 +131,7 @@ if ($in{'keycertfile'}) { print "\n"; &download_form("keycertfile", $in{'keycertfile'}, "$text{'certificate'} / $text{'key'}"); - print "
\n"; + print &ui_hr(); &footer("", $text{'index_return'}); exit; } @@ -147,7 +147,7 @@ foreach $f ( grep { /^(.*\/)*$wildcard_pattern$/ && -f "$config{'ssl_dir'}/$_" } print "\n"; print "\n"; print "\n"; -print "
\n"; +print &ui_hr(); &footer("", $text{'index_return'}); sub output_cert diff --git a/cfengine/cluster.cgi b/cfengine/cluster.cgi index b499fc22a..84c93dbf0 100755 --- a/cfengine/cluster.cgi +++ b/cfengine/cluster.cgi @@ -79,7 +79,7 @@ foreach $h (@hosts) { local $rv = &unserialise_variable($line); close($rh); - print "
\n"; + print &ui_hr(); if ($rv && $rv->[0]) { # Run ok! Show the output print "",&text('cluster_success', $d),"
\n"; diff --git a/cfengine/edit_cfd.cgi b/cfengine/edit_cfd.cgi index 0a9c48413..54bb82709 100755 --- a/cfengine/edit_cfd.cgi +++ b/cfengine/edit_cfd.cgi @@ -19,7 +19,7 @@ $conf = &get_cfd_config(); # Allow starting or stopping of cfd ($pid) = &find_byname("cfd"); -print "
\n"; +print &ui_hr(); print "\n"; if ($pid) { print "\n"; diff --git a/cfengine/edit_push.cgi b/cfengine/edit_push.cgi index 3445333f7..4c30afd87 100755 --- a/cfengine/edit_push.cgi +++ b/cfengine/edit_push.cgi @@ -42,7 +42,7 @@ print "
\n"; print "\n"; if (@$hosts) { - print "
\n"; + print &ui_hr(); print "
\n"; print "\n"; print "\n"; diff --git a/cfengine/index.cgi b/cfengine/index.cgi index 0e8902c17..ee3942f26 100755 --- a/cfengine/index.cgi +++ b/cfengine/index.cgi @@ -49,7 +49,7 @@ $conf = &get_config(); &show_classes_table(\@secs, 0); # Display option icons -print "
\n"; +print &ui_hr(); print &ui_subheading($text{'index_options'}); @links = ( "run_form.cgi", "list_hosts.cgi", "edit_cfd.cgi", "edit_push.cgi" ); @titles = ( $text{'run_title'}, $text{'hosts_title'}, $text{'cfd_title'}, diff --git a/cfengine/list_hosts.cgi b/cfengine/list_hosts.cgi index 37f47b300..5c03417ab 100755 --- a/cfengine/list_hosts.cgi +++ b/cfengine/list_hosts.cgi @@ -52,7 +52,7 @@ print "
\n"; # Display run form if (@hosts) { - print "
\n"; + print &ui_hr(); print "
\n"; print "\n"; print "\n"; diff --git a/cluster-software/edit_host.cgi b/cluster-software/edit_host.cgi index b11c8bd84..5ccbc1721 100755 --- a/cluster-software/edit_host.cgi +++ b/cluster-software/edit_host.cgi @@ -83,7 +83,7 @@ $heiropen{""}++; # traverse the heirarchy $spacer = " "x3; -print "
\n"; +print &ui_hr(); print &ui_subheading($text{'host_installed'}); print "
\n"; &traverse("", 0); diff --git a/cluster-software/edit_pack.cgi b/cluster-software/edit_pack.cgi index 80fb6f6e1..a9c260325 100755 --- a/cluster-software/edit_pack.cgi +++ b/cluster-software/edit_pack.cgi @@ -89,7 +89,7 @@ if (!$pinfo[7]) { print "

\n"; # Show hosts with the package -print "

\n"; +print &ui_hr(); print &ui_subheading($text{'edit_hosts'}); @icons = map { "/servers/images/$_->{'type'}.gif" } @got; @links = map { "edit_host.cgi?id=$_->{'id'}" } @got; diff --git a/cluster-software/index.cgi b/cluster-software/index.cgi index c2a0e6421..1aea9758b 100755 --- a/cluster-software/index.cgi +++ b/cluster-software/index.cgi @@ -108,7 +108,7 @@ print "\n"; if (@hosts) { # Display search form - print "
\n"; + print &ui_hr(); print &ui_subheading($text{'index_installed'}); print "
\n"; $formno += 2; @@ -123,7 +123,7 @@ if (@hosts) { print "
\n"; # Display cross-cluster install form - print "
\n"; + print &ui_hr(); print &ui_subheading($text{'index_install'}); print "$text{'index_installmsg'}

\n"; diff --git a/cluster-useradmin/edit_group.cgi b/cluster-useradmin/edit_group.cgi index ba8a39d23..c0d040dbd 100755 --- a/cluster-useradmin/edit_group.cgi +++ b/cluster-useradmin/edit_group.cgi @@ -114,7 +114,7 @@ print "\n"; print " \n"; print "

\n"; -print "

\n"; +print &ui_hr(); print &ui_subheading($text{'uedit_hosts'}); &icons_table(\@links, \@titles, \@icons); diff --git a/cluster-useradmin/edit_host.cgi b/cluster-useradmin/edit_host.cgi index 2907a07c1..2e88a163a 100755 --- a/cluster-useradmin/edit_host.cgi +++ b/cluster-useradmin/edit_host.cgi @@ -56,7 +56,7 @@ print "\n"; print "\n"; # Show users and groups -print "
\n"; +print &ui_hr(); print &ui_subheading($text{'host_ulist'}); print "\n"; print "\n"; diff --git a/cluster-useradmin/edit_user.cgi b/cluster-useradmin/edit_user.cgi index 8be4ba47a..4ba536464 100755 --- a/cluster-useradmin/edit_user.cgi +++ b/cluster-useradmin/edit_user.cgi @@ -433,7 +433,7 @@ print "\n"; print "
$text{'index_users'}

\n"; -print "

\n"; +print &ui_hr(); print &ui_subheading($text{'uedit_hosts'}); &icons_table(\@links, \@titles, \@icons); diff --git a/cluster-useradmin/index.cgi b/cluster-useradmin/index.cgi index d025b49f7..e82a13f00 100755 --- a/cluster-useradmin/index.cgi +++ b/cluster-useradmin/index.cgi @@ -89,7 +89,7 @@ print "\n"; if (@hosts) { # Display search and add forms - print "
\n"; + print &ui_hr(); print &ui_subheading($text{'index_users'}); print "\n"; diff --git a/cluster-usermin/edit_mod.cgi b/cluster-usermin/edit_mod.cgi index 0cd178bdf..0240dd2d9 100755 --- a/cluster-usermin/edit_mod.cgi +++ b/cluster-usermin/edit_mod.cgi @@ -184,7 +184,7 @@ print "\n"; print "
\n"; # Show hosts with the module or theme -print "
\n"; +print &ui_hr(); print &ui_subheading($text{'edit_hosts'}); @icons = map { "/servers/images/$_->{'type'}.gif" } @got; @links = map { "edit_host.cgi?id=$_->{'id'}" } @got; diff --git a/cluster-usermin/index.cgi b/cluster-usermin/index.cgi index 36e52b41b..b3aa22ec0 100755 --- a/cluster-usermin/index.cgi +++ b/cluster-usermin/index.cgi @@ -109,7 +109,7 @@ print "\n"; if (@hosts) { # Display modules lists and new module form - print "
\n"; + print &ui_hr(); print &ui_subheading($text{'index_modules'}); print "\n"; print "\n print "
\n"; @@ -155,7 +155,7 @@ if (@hosts) { # Display upgrade form &foreign_require("webmin", "webmin-lib.pl"); - print "
\n"; + print &ui_hr(); print &ui_subheading($text{'index_upgrade'}); print "$text{'index_updesc'}

\n"; diff --git a/cluster-webmin/edit_group.cgi b/cluster-webmin/edit_group.cgi index 49f2ba528..623659b3f 100755 --- a/cluster-webmin/edit_group.cgi +++ b/cluster-webmin/edit_group.cgi @@ -145,7 +145,7 @@ print "

\n"; # Show hosts with the group -print "
\n"; +print &ui_hr(); print &ui_subheading($text{'group_hosts'}); @icons = map { "/servers/images/$_->{'type'}.gif" } @got; @links = map { "edit_host.cgi?id=$_->{'id'}" } @got; diff --git a/cluster-webmin/edit_mod.cgi b/cluster-webmin/edit_mod.cgi index 2aa7aaaba..ec10bcc11 100755 --- a/cluster-webmin/edit_mod.cgi +++ b/cluster-webmin/edit_mod.cgi @@ -233,7 +233,7 @@ if ($type eq 'mod') { print "\n"; # Show hosts with the module or theme -print "
\n"; +print &ui_hr(); print &ui_subheading($text{'edit_hosts'}); @icons = map { "/servers/images/$_->{'type'}.gif" } @got; @links = map { "edit_host.cgi?id=$_->{'id'}" } @got; diff --git a/cluster-webmin/edit_user.cgi b/cluster-webmin/edit_user.cgi index 0a9e8d2fb..b5f9d9a32 100755 --- a/cluster-webmin/edit_user.cgi +++ b/cluster-webmin/edit_user.cgi @@ -202,7 +202,7 @@ print "\n print "\n"; # Show hosts with the user -print "
\n"; +print &ui_hr(); print &ui_subheading($text{'user_hosts'}); @icons = map { "/servers/images/$_->{'type'}.gif" } @got; @links = map { "edit_host.cgi?id=$_->{'id'}" } @got; diff --git a/cluster-webmin/index.cgi b/cluster-webmin/index.cgi index 7dd8b58ab..ad26eb4f5 100755 --- a/cluster-webmin/index.cgi +++ b/cluster-webmin/index.cgi @@ -120,7 +120,7 @@ print "\n"; if (@hosts) { # Display user search forms and new user buttons - print "
\n"; + print &ui_hr(); print &ui_subheading($text{'index_users'}); print "\n"; @@ -181,7 +181,7 @@ if (@hosts) { print "
\n"; # Display modules lists and new module form - print "
\n"; + print &ui_hr(); print &ui_subheading($text{'index_modules'}); print "\n"; print "
\n"; @@ -226,7 +226,7 @@ if (@hosts) { # Display upgrade form &foreign_require("webmin", "webmin-lib.pl"); - print "
\n"; + print &ui_hr(); print &ui_subheading($text{'index_upgrade'}); print "$text{'index_updesc'}

\n"; @@ -261,7 +261,7 @@ if (@hosts) { $formno++; # Show form for installing updates - print "

\n"; + print &ui_hr(); print &ui_subheading($text{'index_update'}); print "$text{'index_updatedesc'}

\n"; print "\n"; diff --git a/dfsadmin/index.cgi b/dfsadmin/index.cgi index 113492045..783e5217b 100755 --- a/dfsadmin/index.cgi +++ b/dfsadmin/index.cgi @@ -85,7 +85,7 @@ else { } if (!$access{'view'}) { - print "

\n"; + print &ui_hr(); print &ui_buttons_start(); print &ui_buttons_row("restart_sharing.cgi", $text{'index_apply'}, diff --git a/dhcp-dns/index.cgi b/dhcp-dns/index.cgi index 473989c7d..b02d0f958 100644 --- a/dhcp-dns/index.cgi +++ b/dhcp-dns/index.cgi @@ -101,7 +101,7 @@ else { print "$text{'index_none'}

\n"; } -print "

\n"; +print &ui_hr(); print &ui_buttons_start(); print &ui_buttons_row("apply.cgi", $text{'index_apply'}, $text{'index_applydesc'}); diff --git a/dhcpd/edit_shared.cgi b/dhcpd/edit_shared.cgi index 07ace81b4..a30ce68fe 100755 --- a/dhcpd/edit_shared.cgi +++ b/dhcpd/edit_shared.cgi @@ -159,7 +159,7 @@ else { if ($config{'dhcpd_version'} >= 3 && !$in{'new'}) { # Display address pools - print "
\n"; + print &ui_hr(); print &ui_subheading($text{'esh_pools'}); local $pn = 1; foreach $p (&find('pool', $sconf)) { diff --git a/dhcpd/edit_subnet.cgi b/dhcpd/edit_subnet.cgi index 127b351f0..f061ca394 100755 --- a/dhcpd/edit_subnet.cgi +++ b/dhcpd/edit_subnet.cgi @@ -186,7 +186,7 @@ else { if ($config{'dhcpd_version'} >= 3 && !$in{'new'}) { # Display address pools - print "
\n"; + print &ui_hr(); print &ui_subheading($text{'esub_pools'}); local $pn = 1; foreach $p (&find('pool', $sconf)) { diff --git a/dhcpd/index.cgi b/dhcpd/index.cgi index 7cf3bd738..405fef9b3 100755 --- a/dhcpd/index.cgi +++ b/dhcpd/index.cgi @@ -287,7 +287,7 @@ if ($show_subnet_shared) { print "
\n"; } -print "
\n"; +print &ui_hr(); foreach $g (@group) { $parent = (defined($subnet{$g}) ? 1 + $subnet{$g} : 0) + @@ -439,7 +439,7 @@ if ($show_host_group) { print "\n"; } -print "
\n"; +print &ui_hr(); ############ START ZONES ##### @@ -471,7 +471,7 @@ if ($config{'dhcpd_version'} >= 3) { print "$text{'index_nozones'}

\n"; } print "","$text{'index_addzone'}  \n" if $access{'c_sub'}; - print "

\n"; + print &ui_hr(); } ############ END ZONES ##### diff --git a/dnsadmin/delete_zone.cgi b/dnsadmin/delete_zone.cgi index 957989102..4dbb67c3c 100755 --- a/dnsadmin/delete_zone.cgi +++ b/dnsadmin/delete_zone.cgi @@ -14,7 +14,7 @@ $rev = $zconf->{'values'}->[0] =~ /in-addr.arpa/i; if (!$in{'confirm'}) { # Ask the user if he is sure .. &header("Delete Zone", ""); - print "
\n"; + print &ui_hr(); print "

Are you sure you want to delete the zone ", &arpa_to_ip($zconf->{'values'}->[0])," ? All records ", @@ -27,7 +27,7 @@ if (!$in{'confirm'}) { print " $text{'yes'}\n"; print " $text{'no'}\n"; print "

\n"; - print "
\n"; + print &ui_hr(); &footer("", "record types"); exit; } diff --git a/dnsadmin/edit_master.cgi b/dnsadmin/edit_master.cgi index 0fc52aadc..ca229e776 100755 --- a/dnsadmin/edit_master.cgi +++ b/dnsadmin/edit_master.cgi @@ -85,7 +85,7 @@ print "\n"; print "\n"; print " \n"; -print "
\n"; +print &ui_hr(); &footer("", "zone list"); sub types_table diff --git a/dnsadmin/edit_record.cgi b/dnsadmin/edit_record.cgi index 7167bc257..4629bbe49 100755 --- a/dnsadmin/edit_record.cgi +++ b/dnsadmin/edit_record.cgi @@ -12,12 +12,12 @@ $dom = $zconf->{'values'}->[0]; &error("You are not allowed to edit records in this zone"); &header("Edit $code_map{$in{'type'}}", ""); print "
In ",&arpa_to_ip($dom),"
\n"; -print "
\n"; +print &ui_hr(); @recs = &read_zone_file($zconf->{'values'}->[1], $zconf->{'values'}->[0]); &foreign_call("bind8", "record_input", $in{'index'}, undef, $in{'type'}, $zconf->{'values'}->[1], $zconf->{'values'}->[0], $in{'num'}, $recs[$in{'num'}]); -print "
\n"; +print &ui_hr(); &footer("edit_recs.cgi?index=$in{'index'}&type=$in{'type'}", "records"); diff --git a/dnsadmin/edit_recs.cgi b/dnsadmin/edit_recs.cgi index efc1ee452..d9ba0a056 100755 --- a/dnsadmin/edit_recs.cgi +++ b/dnsadmin/edit_recs.cgi @@ -42,7 +42,7 @@ if (@recs) { } print "

\n"; } -print "

\n"; +print &ui_hr(); &footer("edit_master.cgi?index=$in{'index'}", "record types"); sub recs_table diff --git a/dnsadmin/edit_slave.cgi b/dnsadmin/edit_slave.cgi index de4cdc763..d45754dbe 100755 --- a/dnsadmin/edit_slave.cgi +++ b/dnsadmin/edit_slave.cgi @@ -12,7 +12,7 @@ $conf = &get_config(); &header("Edit Slave Zone", ""); print "
",&arpa_to_ip($v[0]),"
\n"; -print "
\n"; +print &ui_hr(); print "
\n"; print "\n"; print "\n"; @@ -41,6 +41,6 @@ print "\n"; print "\n"; print "\n"; print "
\n"; -print "
\n"; +print &ui_hr(); &footer("", "zone list"); diff --git a/dnsadmin/edit_text.cgi b/dnsadmin/edit_text.cgi index 537ad4ef9..b6dafbf1c 100755 --- a/dnsadmin/edit_text.cgi +++ b/dnsadmin/edit_text.cgi @@ -11,7 +11,7 @@ $zconf = &get_config()->[$in{'index'}]; $file = &absolute_path($zconf->{'values'}->[1]); &header("Edit Records File", ""); print "
$file
\n"; -print "
\n"; +print &ui_hr(); open(FILE, $file); while() { @@ -29,6 +29,6 @@ print "

\n"; print " \n"; -print "

\n"; +print &ui_hr(); &footer("edit_master.cgi?index=$in{'index'}", "record types"); diff --git a/dnsadmin/index.cgi b/dnsadmin/index.cgi index 17d6bad65..2ffa658b1 100755 --- a/dnsadmin/index.cgi +++ b/dnsadmin/index.cgi @@ -3,7 +3,7 @@ require './dns-lib.pl'; &header("BIND 4 DNS Server", "", undef, 1, 1); -print "
\n"; +print &ui_hr(); %access = &get_module_acl(); # Check if named exists @@ -12,7 +12,7 @@ if (!-x $config{'named_pathname'}) { print "could not be found on your system. Maybe it is not installed,\n"; print "or your BIND 4 module\n"; print "configuration is incorrect.

\n"; - print "

\n"; + print &ui_hr(); &footer("/", "index"); exit; } @@ -23,7 +23,7 @@ if (0 && ($out =~ /bind\s+(\d+)\./i || $out =~ /named\s+(\d+)\./) && $1 >= 8) { print "

The server $config{'named_pathname'} appears to\n"; print "be BIND 8. Maybe your should use the\n"; print "BIND 8 server module instead.

\n"; - print "

\n"; + print &ui_hr(); &footer("/", "index"); exit; } @@ -35,7 +35,7 @@ if (0 && $out =~ /\[-f\]/) { print "

The server $config{'named_pathname'} appears to\n"; print "be BIND 8. Maybe your should use the\n"; print "BIND 8 server module instead.

\n"; - print "

\n"; + print &ui_hr(); &footer("/", "index"); exit; } @@ -61,7 +61,7 @@ if ($need_create) { "server, but use Webmin's older root server information

\n"; print "

\n"; print "\n"; - print "
\n"; + print &ui_hr(); &footer("/", "index"); exit; } @@ -130,7 +130,7 @@ print "

\n"; if ($access{'defaults'}) { # Display form to set the defaults for new zones &get_zone_defaults(\%zd); - print "

\n"; + print &ui_hr(); print &ui_subheading("New Master Zone Defaults"); print "
\n"; print "\n"; @@ -151,7 +151,7 @@ if ($access{'defaults'}) { } # Display a form to start or restart named -print "
\n"; +print &ui_hr(); if ($config{'named_pid_file'}) { if (open(PID, $config{'named_pid_file'})) { =~ /(\d+)/; @@ -189,7 +189,7 @@ else { print "\n"; } -print "
\n"; +print &ui_hr(); &footer("/", "index"); sub zones_table diff --git a/dnsadmin/master_form.cgi b/dnsadmin/master_form.cgi index f5f575295..5d15a9752 100755 --- a/dnsadmin/master_form.cgi +++ b/dnsadmin/master_form.cgi @@ -7,7 +7,7 @@ require './dns-lib.pl'; &header("Create Master Zone", ""); %access = &get_module_acl(); $access{'master'} || &error("You cannot create master zones"); -print "
\n"; +print &ui_hr(); print "
\n"; print "
\n"; @@ -51,6 +51,6 @@ print "\n print "
seconds

\n"; print "\n"; -print "
\n"; +print &ui_hr(); &footer("", "zone list"); diff --git a/dnsadmin/slave_form.cgi b/dnsadmin/slave_form.cgi index 7617aabc4..18c220202 100755 --- a/dnsadmin/slave_form.cgi +++ b/dnsadmin/slave_form.cgi @@ -6,7 +6,7 @@ require './dns-lib.pl'; %access = &get_module_acl(); $access{'slave'} || &error("You are not allowed to create slave zones"); &header("Create Slave Zone", ""); -print "
\n"; +print &ui_hr(); print "
\n"; print "\n"; @@ -35,6 +35,6 @@ print " \n"; print "
\n"; print "
\n"; -print "
\n"; +print &ui_hr(); &footer("", "zone list"); diff --git a/exports/index.cgi b/exports/index.cgi index edd6956ef..2708470bd 100755 --- a/exports/index.cgi +++ b/exports/index.cgi @@ -59,7 +59,7 @@ else { print "$text{'index_add'}

\n"; } -print "

\n"; +print &ui_hr(); print "\n"; print "
\n"; print "\n"; diff --git a/fdisk/edit_disk.cgi b/fdisk/edit_disk.cgi index eba490668..09301cee0 100644 --- a/fdisk/edit_disk.cgi +++ b/fdisk/edit_disk.cgi @@ -134,7 +134,7 @@ else { print &ui_links_row(\@edlinks); # Buttons for IDE params and SMART -print "
\n"; +print &ui_hr(); print &ui_buttons_start(); if (&supports_hdparm($d)) { print &ui_buttons_row("edit_hdparm.cgi", $text{'index_hdparm'}, diff --git a/fdisk/edit_part.cgi b/fdisk/edit_part.cgi index 9a3cf6610..e9d1640b7 100755 --- a/fdisk/edit_part.cgi +++ b/fdisk/edit_part.cgi @@ -206,7 +206,7 @@ else { } if (!$in{'new'} && !$pinfo->{'extended'}) { - print "
\n"; + print &ui_hr(); print &ui_buttons_start(); if (!@stat || $stat[2] == 0) { diff --git a/fetchmail/index.cgi b/fetchmail/index.cgi index 4601f60cf..9c1e209fb 100755 --- a/fetchmail/index.cgi +++ b/fetchmail/index.cgi @@ -30,7 +30,7 @@ if ($config{'config_file'}) { &show_polls(\@conf, $config{'config_file'}, $config{'daemon_user'}); local @uinfo = getpwnam($config{'daemon_user'}); - print "
\n"; + print &ui_hr(); print "\n"; if (&foreign_installed("cron") && $access{'cron'}) { @@ -132,7 +132,7 @@ else { if (&foreign_installed("cron") && $access{'cron'}) { # Show button to manage global cron job - print "
\n"; + print &ui_hr(); print &ui_buttons_start(); print &ui_buttons_row("edit_cron.cgi", $text{'index_cron'}, $text{'index_crondesc2'}); diff --git a/firewall/index.cgi b/firewall/index.cgi index 5d52c3b3e..50c75ce01 100755 --- a/firewall/index.cgi +++ b/firewall/index.cgi @@ -177,7 +177,7 @@ else { # Display a table of rules for each chain foreach $c (sort by_string_for_iptables keys %{$table->{'defaults'}}) { - print "
\n"; + print &ui_hr(); @rules = grep { lc($_->{'chain'}) eq lc($c) } @{$table->{'rules'}}; print "",$text{"index_chain_".lc($c)} || @@ -336,7 +336,7 @@ else { # Display buttons for applying and un-applying the configuration, # and for creating an init script if possible - print "
\n"; + print &ui_hr(); print "
\n"; if (!$config{'direct'}) { diff --git a/frox/index.cgi b/frox/index.cgi index 96ae2f9da..631e44d5a 100755 --- a/frox/index.cgi +++ b/frox/index.cgi @@ -40,7 +40,7 @@ push(@names, "iptables") if (&foreign_check("firewall")); # Show start/stop/apply buttons $conf = &get_config(); if (&find_value("FromInetd", $conf) ne "yes") { - print "
\n"; + print &ui_hr(); print &ui_buttons_start(); if (&is_frox_running()) { print &ui_buttons_row("apply.cgi", $text{'index_apply'},