diff options
35 files changed, 52 insertions, 71 deletions
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index 5cf1ef7..a215147 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -30,7 +30,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = array("Services", "Captive portal"); require("guiconfig.inc"); if (!is_array($config['captiveportal'])) { @@ -180,6 +179,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <script language="JavaScript"> <!-- function auth_method_change() { diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index 5af31ce..4e45cfc 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -30,7 +30,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = array("Services", "Captive portal"); require("guiconfig.inc"); if (!is_array($config['captiveportal']['allowedip'])) @@ -76,6 +75,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <form action="services_captiveportal_ip.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (file_exists($d_allowedipsdirty_path)): ?><p> diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php index 0e33523..1eb8a05 100755 --- a/usr/local/www/services_captiveportal_ip_edit.php +++ b/usr/local/www/services_captiveportal_ip_edit.php @@ -30,7 +30,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = array("Services", "Captive portal", "Edit allowed IP address"); require("guiconfig.inc"); if (!is_array($config['captiveportal']['allowedip'])) @@ -93,19 +92,14 @@ if ($_POST) { exit; } } -?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -<title><?=gentitle("pfSense webGUI");?></title> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<link href="gui.css" rel="stylesheet" type="text/css"> -</head> -<form method="post"> +$pgtitle = "Services: Captive Portal: Allowed IP's: Edit"; +include("head.inc"); +?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="services_captiveportal_ip_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index 1858b65..2ce1128 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -68,15 +68,14 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "Services: Captive Portal: Macs"; +$pgtitle = "Services: Captive Portal: MACs"; include("head.inc"); ?> -<form method="post"> - <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <form action="services_captiveportal_mac.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (file_exists($d_passthrumacsdirty_path)): ?><p> @@ -149,4 +148,4 @@ NiftyCheck(); Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth"); </script> </body> -</html>
\ No newline at end of file +</html> diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php index cdf4910..f3aa51c 100755 --- a/usr/local/www/services_captiveportal_mac_edit.php +++ b/usr/local/www/services_captiveportal_mac_edit.php @@ -30,7 +30,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = array("Services", "Captive portal", "Edit pass-through MAC address"); require("guiconfig.inc"); if (!is_array($config['captiveportal']['passthrumac'])) @@ -94,19 +93,15 @@ if ($_POST) { exit; } } -?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -<title><?=gentitle("pfSense webGUI");?></title> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<link href="gui.css" rel="stylesheet" type="text/css"> -</head> -<form method="post"> +$pgtitle = "Services: Captive Portal: MACs: Edit"; +include("head.inc"); + +?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="services_captiveportal_mac_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/services_captiveportal_users.php b/usr/local/www/services_captiveportal_users.php index 7201bde..45bc206 100755 --- a/usr/local/www/services_captiveportal_users.php +++ b/usr/local/www/services_captiveportal_users.php @@ -32,7 +32,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = array("Services", "Captive portal"); require("guiconfig.inc"); if(isset($_POST['save'])){ //value-checking @@ -144,6 +143,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <script language="javascript" type="text/javascript" src="datetimepicker.js"> //Date Time Picker script- by TengYong Ng of http://www.rainforestnet.com //Script featured on JavaScript Kit (http://www.javascriptkit.com) diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index 2e1de6d..8251af6 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -193,7 +193,7 @@ function enable_change(enable_over) { <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Services: DHCP server</p> +<p class="pgtitle"><?=$pgtitle?></p> <form action="services_dhcp.php" method="post" name="iform" id="iform"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/services_dhcp_edit.php b/usr/local/www/services_dhcp_edit.php index e267af5..e0de634 100755 --- a/usr/local/www/services_dhcp_edit.php +++ b/usr/local/www/services_dhcp_edit.php @@ -134,7 +134,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Services: DHCP: Edit static mapping</p> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="services_dhcp_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/services_dhcp_relay.php b/usr/local/www/services_dhcp_relay.php index 7b7a67a..97ccdca 100755 --- a/usr/local/www/services_dhcp_relay.php +++ b/usr/local/www/services_dhcp_relay.php @@ -163,7 +163,7 @@ function enable_change(enable_over) { <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Services: DHCP relay</p> +<p class="pgtitle"><?=$pgtitle?></p> <form action="services_dhcp_relay.php" method="post" name="iform" id="iform"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php index 32bc884..4e95f74 100755 --- a/usr/local/www/services_dnsmasq.php +++ b/usr/local/www/services_dnsmasq.php @@ -97,7 +97,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Services: DNS forwarder</p> +<p class="pgtitle"><?=$pgtitle?></p> <form action="services_dnsmasq.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (file_exists($d_hostsdirty_path)): ?><p> diff --git a/usr/local/www/services_dnsmasq_domainoverride_edit.php b/usr/local/www/services_dnsmasq_domainoverride_edit.php index 8052fd3..827ad57 100755 --- a/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -29,7 +29,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = array("Services", "DNS forwarder", "Edit Domain Override"); require("guiconfig.inc"); if (!is_array($config['dnsmasq']['domainoverrides'])) { @@ -96,15 +95,15 @@ if ($_POST) { } } -$pgtitle = "Services: DNS forwarder"; +$pgtitle = "Services: DNS forwarder: Edit Domain Override"; include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> -<p class="pgtitle">Services: DNS forwarder</p> <form action="services_dnsmasq_domainoverride_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> diff --git a/usr/local/www/services_dnsmasq_edit.php b/usr/local/www/services_dnsmasq_edit.php index fa636bd..392c228 100755 --- a/usr/local/www/services_dnsmasq_edit.php +++ b/usr/local/www/services_dnsmasq_edit.php @@ -108,7 +108,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Services: DNS forwarder: Edit host</p> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="services_dnsmasq_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/services_dyndns.php b/usr/local/www/services_dyndns.php index 4797037..7eefc39 100755 --- a/usr/local/www/services_dyndns.php +++ b/usr/local/www/services_dyndns.php @@ -159,7 +159,7 @@ function enable_change(enable_change) { <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Services: Dynamic DNS client</p> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <form action="services_dyndns.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/services_proxyarp.php b/usr/local/www/services_proxyarp.php index b8b958b..2ec5b7d 100755 --- a/usr/local/www/services_proxyarp.php +++ b/usr/local/www/services_proxyarp.php @@ -74,7 +74,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Services: Proxy ARP</p> +<p class="pgtitle"><?=$pgtitle?></p> <form action="services_proxyarp.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (file_exists($d_proxyarpdirty_path)): ?><p> diff --git a/usr/local/www/services_proxyarp_edit.php b/usr/local/www/services_proxyarp_edit.php index 14534fe..ba2dcab 100755 --- a/usr/local/www/services_proxyarp_edit.php +++ b/usr/local/www/services_proxyarp_edit.php @@ -165,7 +165,7 @@ function typesel_change() { </script> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <p class="pgtitle">Services: Proxy ARP: Edit</p> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="services_proxyarp_edit.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/services_snmp.php b/usr/local/www/services_snmp.php index 30a0b28..7a762a1 100755 --- a/usr/local/www/services_snmp.php +++ b/usr/local/www/services_snmp.php @@ -200,7 +200,7 @@ function enable_change(whichone) { </script> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Services: SNMP</p> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <form action="services_snmp.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/services_usermanager.php b/usr/local/www/services_usermanager.php index e424b92..9a04bf3 100755 --- a/usr/local/www/services_usermanager.php +++ b/usr/local/www/services_usermanager.php @@ -32,7 +32,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = array("Services", "Usermanager"); require("guiconfig.inc"); if(isset($_POST['save'])){ $_POST['username']=trim($_POST['username']); @@ -84,6 +83,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <script language="javascript" type="text/javascript" src="datetimepicker.js"> //Date Time Picker script- by TengYong Ng of http://www.rainforestnet.com //Script featured on JavaScript Kit (http://www.javascriptkit.com) diff --git a/usr/local/www/services_wol.php b/usr/local/www/services_wol.php index 1ed9c8b..2dac7b2 100755 --- a/usr/local/www/services_wol.php +++ b/usr/local/www/services_wol.php @@ -85,7 +85,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Services: Wake on LAN</font></p> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <form action="services_wol.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/services_wol_edit.php b/usr/local/www/services_wol_edit.php index 26e45e4..cb7d9f3 100755 --- a/usr/local/www/services_wol_edit.php +++ b/usr/local/www/services_wol_edit.php @@ -91,7 +91,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Services: Wake on LAN: Edit entry</p> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="services_wol_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/status.php b/usr/local/www/status.php index 84681db..359f3a4 100755 --- a/usr/local/www/status.php +++ b/usr/local/www/status.php @@ -135,12 +135,10 @@ defCmdT("cat {$g['tmp_path']}/rules.debug","cat {$g['tmp_path']}/rules.debug"); defCmdT("config.xml","dumpconfigxml"); -$pageTitle = "pfSense: status"; - exec("/bin/date", $dateOutput, $dateStatus); $currentDate = $dateOutput[0]; -$pgtitle = $pageTitle; +$pgtitle = "pfSense: status"; include("head.inc"); ?> @@ -156,7 +154,7 @@ pre { </style> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<p><span class="pgtitle"><?=$pageTitle;?></span><br> +<p><span class="pgtitle"><?=$pgtitle;?></span><br> <strong><?=$currentDate;?></strong> <p><span class="red"><strong>Note: make sure to remove any sensitive information (passwords, maybe also IP addresses) before posting diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php index e8a348a..20c6ef3 100755 --- a/usr/local/www/status_captiveportal.php +++ b/usr/local/www/status_captiveportal.php @@ -39,7 +39,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Status: Captive portal</p> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($_GET['act'] == "del") { diff --git a/usr/local/www/status_graph.php b/usr/local/www/status_graph.php index d99435a..ae5628f 100755 --- a/usr/local/www/status_graph.php +++ b/usr/local/www/status_graph.php @@ -60,7 +60,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Status: Traffic graph</p> +<p class="pgtitle"><?=$pgtitle?></p> <?php $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN'); diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php index e30567e..197eefe 100755 --- a/usr/local/www/status_interfaces.php +++ b/usr/local/www/status_interfaces.php @@ -29,8 +29,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = array("Status", "Interfaces"); - require_once("guiconfig.inc"); $wancfg = &$config['interfaces']['wan']; @@ -215,6 +213,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <form action="status_interfaces.php" method="post"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <?php $i = 0; $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN'); diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php index 7fd1eff..2e7f663 100755 --- a/usr/local/www/status_queues.php +++ b/usr/local/www/status_queues.php @@ -58,7 +58,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Status: Traffic shaper: Queues</p> +<p class="pgtitle"><?=$pgtitle?></p> <?php if(!isset($config['shaper']['enable'])) { echo "Traffic shaping is currently disabled."; diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php index 3b66c9a..ea15f2c 100755 --- a/usr/local/www/status_services.php +++ b/usr/local/www/status_services.php @@ -61,7 +61,7 @@ include("head.inc"); <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$title?></p> +<p class="pgtitle"><?=$pgtitle?></p> <form action="status_services.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/status_wireless.php b/usr/local/www/status_wireless.php index 474f5c6..aa47ab6 100755 --- a/usr/local/www/status_wireless.php +++ b/usr/local/www/status_wireless.php @@ -30,7 +30,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = array("Status", "Wireless"); require("guiconfig.inc"); function get_wireless_info($ifdescr) { @@ -93,6 +92,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <?php $i = 0; $ifdescrs = array(); if (is_array($config['interfaces']['wan']['wireless']) && diff --git a/usr/local/www/system.php b/usr/local/www/system.php index 8ea58ad..715d8ca 100755 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -184,6 +184,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <p class="pgtitle">System: General setup</p> diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php index f1ec51c..79de715 100755 --- a/usr/local/www/system_advanced.php +++ b/usr/local/www/system_advanced.php @@ -240,9 +240,9 @@ function openwindow(url) { // --> </script> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<form action="system_advanced.php" method="post" name="iform" id="iform"> <?php include("fbegin.inc"); ?> - <p class="pgtitle">System: Advanced functions</p> +<p class="pgtitle"><?=$pgtitle?></p> +<form action="system_advanced.php" method="post" name="iform" id="iform"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <p><span class="vexpl"><span class="red"><strong>Note: </strong></span> diff --git a/usr/local/www/system_advanced_create_certs.php b/usr/local/www/system_advanced_create_certs.php index 7a6f8ca..047b109 100755 --- a/usr/local/www/system_advanced_create_certs.php +++ b/usr/local/www/system_advanced_create_certs.php @@ -138,15 +138,15 @@ if ($_POST) { fwrite($fd, "authorityKeyIdentifier=keyid:always,issuer:always\n"); fclose($fd); -$pgtitle = "System: Advanced functions"; +$pgtitle = "System: Advanced functions: Create Certificates"; include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<form action="system_advanced_create_certs.php" method="post" name="iform" id="iform"> <?php include("fbegin.inc"); ?> - <p class="pgtitle">System: Advanced functions - Create Certificates</p> +<p class="pgtitle"><?=$pgtitle?></p> +<form action="system_advanced_create_certs.php" method="post" name="iform" id="iform"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <p>One moment please... diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index d8f5f20..97fc5cf 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -116,7 +116,7 @@ php-config.upload_progress_meter.file.filename_template = <?=$dir?> --> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">System: Manual Update</p> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if ($fwinfo <> "") print_info_box($fwinfo); ?> diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php index c766487..722d221 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -43,9 +43,8 @@ include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> - <?php include("fbegin.inc"); ?> -<p class="pgtitle">System: Firmware: Firmware Updater</p> +<p class="pgtitle"><?=$pgtitle?></p> <form action="system_firmware_auto.php" method="post"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php index c27bc00..f7eb4cb 100755 --- a/usr/local/www/system_firmware_check.php +++ b/usr/local/www/system_firmware_check.php @@ -34,11 +34,14 @@ require_once("xmlrpc.inc"); if(isset($config['system']['disablefirmwarecheck'])) Header("Location: system_firmware.php"); +$versions = check_firmware_version(); $pgtitle = "System: Auto Update"; include("head.inc"); ?> - <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> +<?php include("fbegin.inc"); ?> +<p class="pgtitle"><?=$pgtitle?></p> <SCRIPT> <!-- function toggleTable (table, img) { @@ -56,11 +59,6 @@ include("head.inc"); } //--> </SCRIPT> -<?php -include("fbegin.inc"); -$versions = check_firmware_version(); -?> - <p class="pgtitle">System: Auto Update</p> <div id="bottomonly"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php index 913de3c..35415ae 100755 --- a/usr/local/www/system_firmware_settings.php +++ b/usr/local/www/system_firmware_settings.php @@ -66,12 +66,11 @@ function update_description(itemnum) { </script> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> +<p class="pgtitle"><?=$pgtitle?></p> <form action="system_firmware_settings.php" method="post" name="iform" id="iform"> <?php include("fbegin.inc"); ?> - <p class="pgtitle">System: Firmware Settings</p> - <?php if ($savemsg) print_info_box($savemsg); ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php index 7fa9512..c4a1930 100755 --- a/usr/local/www/system_routes.php +++ b/usr/local/www/system_routes.php @@ -95,7 +95,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">System: Static routes</p> +<p class="pgtitle"><?=$pgtitle?></p> <form action="system_routes.php" method="post"> <input type="hidden" name="y1" value="1"> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/system_routes_edit.php b/usr/local/www/system_routes_edit.php index 477623b..2e960f6 100755 --- a/usr/local/www/system_routes_edit.php +++ b/usr/local/www/system_routes_edit.php @@ -112,7 +112,7 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">System: Static routes: Edit route</p> +<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="system_routes_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> |
