diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2007-11-16 00:48:53 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2007-11-16 00:48:53 +0000 |
| commit | d88c6a9fdfb0a872dadfb90a8f93ba16714240b8 (patch) | |
| tree | c0afa68c65e00b60f81f31964467e8df6499f110 | |
| parent | 19b331c1fad28919f10122f27783a5e3d8e2db4a (diff) | |
| download | pfsense-d88c6a9fdfb0a872dadfb90a8f93ba16714240b8.zip pfsense-d88c6a9fdfb0a872dadfb90a8f93ba16714240b8.tar.gz | |
Switch over to array style page titles. Obtained-from: m0n0wall
147 files changed, 676 insertions, 1235 deletions
diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index 3c8ce93..cdc867b 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -59,14 +59,13 @@ if($_POST['disablecarp'] <> "") { $status = get_carp_status(); -$pgtitle = "Status: CARP (failover)"; +$pgtitle = array("Status","CARP (failover)"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="carp_status.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/diag_arp.php b/usr/local/www/diag_arp.php index 8192a55..f93cc54 100755 --- a/usr/local/www/diag_arp.php +++ b/usr/local/www/diag_arp.php @@ -230,13 +230,12 @@ function getHostName($mac,$ip) return " "; } -$pgtitle = "Diagnostics: ARP Table"; +$pgtitle = array("Diagnostics","ARP Table"); include("head.inc"); ?> <body link="#000000" vlink="#000000" alink="#000000"> <script src="/javascript/sorttable.js"></script> <? include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td> diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index bb47705..dc024b7 100755 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -223,15 +223,13 @@ $id = rand() . '.' . time(); $mth = ini_get('upload_progress_meter.store_method'); $dir = ini_get('upload_progress_meter.file.filename_template'); -$pgtitle = "Diagnostics: Backup/restore"; +$pgtitle = array("Diagnostics","Backup/restore"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> - <form action="diag_backup.php" method="post" enctype="multipart/form-data"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/diag_confbak.php b/usr/local/www/diag_confbak.php index 618634e..d244d83 100755 --- a/usr/local/www/diag_confbak.php +++ b/usr/local/www/diag_confbak.php @@ -48,14 +48,13 @@ cleanup_backupcache(); $confvers = get_backups(); unset($confvers['versions']); -$pgtitle = "Diagnostics: Configuration History"; +$pgtitle = array("Diagnostics","Configuration History"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if($savemsg) print_info_box($savemsg); ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php index 2deb363..ac7be2d 100755 --- a/usr/local/www/diag_defaults.php +++ b/usr/local/www/diag_defaults.php @@ -44,14 +44,13 @@ if ($_POST) { } } -$pgtitle = "Diagnostics: Factory defaults"; +$pgtitle = array("Diagnostics","Factory defaults"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($rebootmsg): echo print_info_box($rebootmsg); else: ?> <form action="diag_defaults.php" method="post"> <p><strong>If you click "Yes", the firewall will: diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php index ffbc6b7..ea30d7d 100755 --- a/usr/local/www/diag_dhcp_leases.php +++ b/usr/local/www/diag_dhcp_leases.php @@ -33,7 +33,7 @@ require("guiconfig.inc"); -$pgtitle = "Status: DHCP leases"; +$pgtitle = array("Status","DHCP leases"); include("head.inc"); ?> @@ -41,7 +41,6 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <script src="/javascript/sorttable.js"></script> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php function leasecmp($a, $b) { diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php index bbd8def..3c5add0 100755 --- a/usr/local/www/diag_dump_states.php +++ b/usr/local/www/diag_dump_states.php @@ -28,7 +28,7 @@ require_once("guiconfig.inc"); -$pgtitle = "Diagnostics: Show States"; +$pgtitle = array("Diagnostics","Show States"); include("head.inc"); /* handle AJAX operations */ @@ -55,7 +55,6 @@ else { <script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script> <script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="diag_dump_states.php" method="get" name="iform"> <script type="text/javascript"> diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index 60f1451..4b16fe5 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Status: IPsec"; +$pgtitle = array("Status","IPsec"); require("guiconfig.inc"); include("head.inc"); @@ -38,7 +38,6 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="<?= $jsevents["body"]["onload"] ?>"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <div id="inputerrors"></div> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php index ba3c1c1..58a3aaf 100755 --- a/usr/local/www/diag_ipsec_sad.php +++ b/usr/local/www/diag_ipsec_sad.php @@ -33,14 +33,13 @@ require("guiconfig.inc"); -$pgtitle = "Status: IPsec: SA"; +$pgtitle = array("Status","IPsec","SA"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php index a78144b..dc6ee6f 100755 --- a/usr/local/www/diag_ipsec_spd.php +++ b/usr/local/www/diag_ipsec_spd.php @@ -33,14 +33,13 @@ require("guiconfig.inc"); -$pgtitle = "Status: IPsec: SPD"; +$pgtitle = array("Status","IPsec","SPD"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index d0eff3e..2c5b90c 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -54,14 +54,13 @@ if ($_POST['filtertext']) if ($filtertext) $filtertextmeta="?filtertext=$filtertext"; -$pgtitle = "Status: System logs: System"; +$pgtitle = array("Status","System logs","System"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td> diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index 2783643..5a31340 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -41,14 +41,13 @@ if ($_POST['clear']) { exec("/usr/sbin/clog -i -s 262144 {$portal_logfile}"); } -$pgtitle = "Status: System logs: Portal Auth"; +$pgtitle = array("Status","System logs","Portal Auth"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index d716053..8065d0f 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -43,14 +43,13 @@ if ($_POST['clear']) { exec("/usr/sbin/clog -i -s 262144 {$dhcpd_logfile}"); } -$pgtitle = "Status: System logs: DHCP"; +$pgtitle = array("Status","System logs","DHCP"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index f72e9c7..7d6e11a 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -173,13 +173,12 @@ function format_ipf_ip($ipfip) { return $ip . ", port " . $port; } -$pgtitle = "Status: System logs: Firewall"; +$pgtitle = array("Status","System logs","Firewall"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index aa9c7a1..aaec04c 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -155,7 +155,7 @@ function format_ipf_ip($ipfip) { $filterlog = conv_clog_filter($filter_logfile, $nentries); -$pgtitle = "Diagnostics: System logs: Firewall"; +$pgtitle = array("Diagnostics","System logs","Firewall"); include("head.inc"); ?> diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 7bb044f..e3d2fda 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -63,13 +63,12 @@ if ($_POST['clear']) { $ipsec_logarr = return_clog($ipsec_logfile, $nentries); -$pgtitle = "Status: System logs: IPSEC VPN"; +$pgtitle = array("Status","System logs","IPSEC VPN"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td> diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index 5d85d41..815f16a 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -43,14 +43,13 @@ if ($_POST['clear']) { system_syslogd_start(); } -$pgtitle = "Status: System logs: OpenNTPD"; +$pgtitle = array("Status","System logs","OpenNTPD"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index a84d964..6628bd8 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Status: System logs: OpenVPN"; +$pgtitle = array("Status","System logs","OpenVPN"); require("guiconfig.inc"); @@ -52,7 +52,6 @@ include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td> diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 5878357..2bff181 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -92,7 +92,7 @@ if ($_POST) { } } -$pgtitle = "Status: System logs: Settings"; +$pgtitle = array("Status","System logs","Settings"); include("head.inc"); ?> @@ -122,7 +122,6 @@ function enable_change(enable_over) { <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="diag_logs_settings.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/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php index 53a8451..ef1e3cc 100755 --- a/usr/local/www/diag_logs_slbd.php +++ b/usr/local/www/diag_logs_slbd.php @@ -44,14 +44,13 @@ if ($_POST['clear']) { system_syslogd_start(); } -$pgtitle = "Status: System logs: Load Balancer"; +$pgtitle = array("Status","System logs","Load Balancer"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index b010a8d..936a884 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Status: System logs: PPTP VPN"; +$pgtitle = array("Status","System logs","PPTP VPN"); require("guiconfig.inc"); $nentries = $config['syslog']['nentries']; @@ -74,7 +74,6 @@ include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> <?php diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php index 8f056d8..c795a1a 100644 --- a/usr/local/www/diag_packet_capture.php +++ b/usr/local/www/diag_packet_capture.php @@ -110,9 +110,6 @@ include("head.inc"); ?> <body link="#000000" vlink="#0000CC" alink="#0000CC"> <? include("fbegin.inc"); ?> - - -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td> diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php index 416836f..812663a 100755 --- a/usr/local/www/diag_ping.php +++ b/usr/local/www/diag_ping.php @@ -85,11 +85,9 @@ function get_interface_addr($ifdescr) { return false; } -$pgtitle = "Diagnostics: Ping"; include("head.inc"); ?> <body link="#000000" vlink="#000000" alink="#000000"> <? include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td> diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php index 41ad9eb..585f969 100755 --- a/usr/local/www/diag_pkglogs.php +++ b/usr/local/www/diag_pkglogs.php @@ -66,13 +66,12 @@ if(!$apkg) { // If we aren't looking for a specific package, locate the first pa $i = $apkgid; } -$pgtitle = "Status: Package logs"; +$pgtitle = array("Status","Package logs"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <ul id="tabnav"> diff --git a/usr/local/www/diag_resetstate.php b/usr/local/www/diag_resetstate.php index 2511d2e..49c5524 100755 --- a/usr/local/www/diag_resetstate.php +++ b/usr/local/www/diag_resetstate.php @@ -43,13 +43,12 @@ if ($_POST) { } } -$pgtitle = "Diagnostics: Reset state"; +$pgtitle = array("Diagnostics","Reset state"); 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); ?> <form action="diag_resetstate.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/diag_routes.php b/usr/local/www/diag_routes.php index 7065e3a..22fbb0e 100644 --- a/usr/local/www/diag_routes.php +++ b/usr/local/www/diag_routes.php @@ -31,14 +31,13 @@ include('guiconfig.inc'); -$pgtitle = 'Diagnostics: Routing tables'; +$pgtitle = array("Diagnostics","Routing tables"); include('head.inc'); ?> <body link="#000000" vlink="#000000" alink="#000000"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <div id="mainarea"> <form action="diag_routes.php" method="post"> diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php index 7688778..6daedc7 100755 --- a/usr/local/www/diag_traceroute.php +++ b/usr/local/www/diag_traceroute.php @@ -30,12 +30,11 @@ require("guiconfig.inc"); -$pgtitle = "Diagnostics: Traceroute"; +$pgtitle = array("Diagnostics","Traceroute"); include("head.inc"); ?> <body link="#000000" vlink="#000000" alink="#000000"> <? include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php define('MAX_TTL', 64); diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php index f249890..bae8b78 100755 --- a/usr/local/www/edit.php +++ b/usr/local/www/edit.php @@ -130,7 +130,7 @@ $ScriptName = $HTTP_SERVER_VARS['SCRIPT_NAME']; $arrDT = localtime(); $intYear = $arrDT[5] + 1900; -$pgtitle = "Diagnostics: Edit File"; +$pgtitle = array("Diagnostics","Edit File"); include("head.inc"); @@ -142,7 +142,6 @@ include("head.inc"); function sf() { document.forms[0].savetopath.focus(); } </script> <body onLoad="sf();"> -<p><span class="pgtitle"><?=$pgtitle?></span> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if ($loadmsg) echo "<p><b><div style=\"background:#eeeeee\" id=\"shapeme\"> {$loadmsg}</div><br>"; ?> <form action="edit.php" method="POST"> diff --git a/usr/local/www/exec.php b/usr/local/www/exec.php index d0f5275..3d1aa5a 100755 --- a/usr/local/www/exec.php +++ b/usr/local/www/exec.php @@ -50,7 +50,7 @@ $ScriptName = $HTTP_SERVER_VARS['SCRIPT_NAME']; $arrDT = localtime(); $intYear = $arrDT[5] + 1900; -$pgtitle = "Diagnostics: Execute command"; +$pgtitle = array("Diagnostics","Execute command"); include("head.inc"); ?> @@ -180,7 +180,6 @@ pre { </head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if (isBlank($_POST['txtCommand'])): ?> <p class="red"><strong>Note: this function is unsupported. Use it on your own risk!</strong></p> diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php index 0fb924f..0a08d3f 100755 --- a/usr/local/www/firewall_aliases.php +++ b/usr/local/www/firewall_aliases.php @@ -142,14 +142,13 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "Firewall: Aliases"; +$pgtitle = array("Firewall","Aliases"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="firewall_aliases.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (file_exists($d_aliasesdirty_path)): ?><p> diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index 1d3d42e..58f55d4 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Firewall: Aliases: Edit"; +$pgtitle = array("Firewall","Aliases","Edit"); require("guiconfig.inc"); @@ -426,8 +426,6 @@ EOD; rowsize[2] = "61"; </script> -<p class="pgtitle"><?=$pgtitle?></p> - <?php if ($input_errors) print_input_errors($input_errors); ?> <div id="inputerrors"></div> diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php index 31990f1..9479b7c 100755 --- a/usr/local/www/firewall_aliases_import.php +++ b/usr/local/www/firewall_aliases_import.php @@ -27,7 +27,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Firewall: Aliases: Import"; +$pgtitle = array("Firewall","Aliases","Import"); require("guiconfig.inc"); @@ -59,7 +59,6 @@ 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); ?> <div id="niftyOutter"> <form action="firewall_aliases_import.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php index 95d0195..53cf508 100755 --- a/usr/local/www/firewall_nat.php +++ b/usr/local/www/firewall_nat.php @@ -132,13 +132,12 @@ if (isset($_POST['del_x'])) { } } -$pgtitle = "Firewall: NAT: Port Forward"; +$pgtitle = array("Firewall","NAT","Port Forward"); include("head.inc"); ?> <body link="#000000" vlink="#000000" alink="#000000"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></font></p> <form action="firewall_nat.php" method="post" name="iform"> <script type="text/javascript" language="javascript" src="row_toggle.js"> </script> diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php index f19c9a0..936918f 100755 --- a/usr/local/www/firewall_nat_1to1.php +++ b/usr/local/www/firewall_nat_1to1.php @@ -69,13 +69,12 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "Firewall: NAT: 1:1"; +$pgtitle = array("Firewall","NAT","1:1"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="firewall_nat_1to1.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (file_exists($d_natconfdirty_path)): ?><p> diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php index fe80ac6..d00c4eb 100755 --- a/usr/local/www/firewall_nat_1to1_edit.php +++ b/usr/local/www/firewall_nat_1to1_edit.php @@ -128,14 +128,13 @@ if ($_POST) { } } -$pgtitle = "Firewall: NAT: 1:1: Edit"; +$pgtitle = array("Firewall","NAT","1:1","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="firewall_nat_1to1_edit.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php index a10a765..5268976 100755 --- a/usr/local/www/firewall_nat_edit.php +++ b/usr/local/www/firewall_nat_edit.php @@ -255,7 +255,7 @@ if ($_POST) { } } -$pgtitle = "Firewall: NAT: Port Forward: Edit"; +$pgtitle = array("Firewall","NAT","Port Forward: Edit"); include("head.inc"); ?> @@ -263,7 +263,6 @@ 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="firewall_nat_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php index 640db8f..eefbb0b 100755 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -175,13 +175,12 @@ if (isset($_POST['del_x'])) { } -$pgtitle = "Firewall: NAT: Outbound"; +$pgtitle = array("Firewall","NAT","Outbound"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Firewall: NAT: Outbound</p> <form action="firewall_nat_out.php" method="post" name="iform"> <script type="text/javascript" language="javascript" src="row_toggle.js"> </script> diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php index 5c5863d..66f7763 100755 --- a/usr/local/www/firewall_nat_out_edit.php +++ b/usr/local/www/firewall_nat_out_edit.php @@ -235,7 +235,7 @@ if ($_POST) { } } -$pgtitle = "Firewall: NAT: Outbound: Edit"; +$pgtitle = array("Firewall","NAT","Outbound","Edit"); $closehead = false; include("head.inc"); @@ -286,7 +286,6 @@ function sourcesel_change() { <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="firewall_nat_out_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="1"> diff --git a/usr/local/www/firewall_nat_server.php b/usr/local/www/firewall_nat_server.php index 5c0e793..986ec55 100755 --- a/usr/local/www/firewall_nat_server.php +++ b/usr/local/www/firewall_nat_server.php @@ -81,13 +81,12 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "Firewall: NAT: NAT Addresses"; +$pgtitle = array("Firewall","NAT","NAT Addresses"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="firewall_nat_server.php" method="post"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/firewall_nat_server_edit.php b/usr/local/www/firewall_nat_server_edit.php index b2be22f..11634b2 100755 --- a/usr/local/www/firewall_nat_server_edit.php +++ b/usr/local/www/firewall_nat_server_edit.php @@ -111,14 +111,13 @@ if ($_POST) { } } -$pgtitle = "Firewall: NAT: NAT Addresses: Edit"; +$pgtitle = array("Firewall","NAT","NAT Addresses","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="firewall_nat_server_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index 0bb4ad9..9a08018 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -172,7 +172,6 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="firewall_rules.php" method="post"> <script type="text/javascript" language="javascript" src="row_toggle.js"> </script> diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index 149df43..f512aa4 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -344,7 +344,7 @@ if ($_POST) { } } -$pgtitle = "Firewall: Rules: Edit"; +$pgtitle = array("Firewall","Rules","Edit"); $closehead = false; $page_filename = "firewall_rules_edit.php"; @@ -356,7 +356,6 @@ 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="firewall_rules_edit.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/firewall_schedule.php b/usr/local/www/firewall_schedule.php index 0181bc0..aa87672 100644 --- a/usr/local/www/firewall_schedule.php +++ b/usr/local/www/firewall_schedule.php @@ -31,7 +31,7 @@ */ -$pgtitle = "Firewall: Schedules"; +$pgtitle = array("Firewall","Schedules"); $dayArray = array ('Mon','Tues','Wed','Thur','Fri','Sat','Sun'); $monthArray = array ('January','February','March','April','May','June','July','August','September','October','November','December'); @@ -79,7 +79,6 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($savemsg) print_info_box($savemsg); ?> <form action="firewall_schedule.php" method="post"> <table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0"> diff --git a/usr/local/www/firewall_schedule_edit.php b/usr/local/www/firewall_schedule_edit.php index 4120e0a..ee21f51 100644 --- a/usr/local/www/firewall_schedule_edit.php +++ b/usr/local/www/firewall_schedule_edit.php @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Firewall: Schedules: Edit"; +$pgtitle = array("Firewall","Schedules","Edit"); require("guiconfig.inc"); $starttimehr = 00; @@ -728,9 +728,6 @@ EOD; <?php include("fbegin.inc"); echo $jscriptstr; ?> - -<p class="pgtitle"><?=$pgtitle?></p> - <?php if ($input_errors) print_input_errors($input_errors); ?> <div id="inputerrors"></div> diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index 946d362..a035cf2 100755 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -187,14 +187,13 @@ if ($_GET['act'] == "down") { } } -$pgtitle = "Firewall: Shaper: Rules"; +$pgtitle = array("Firewall","Shaper","Rules"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="firewall_shaper.php" method="post" name="iform"> <script type="text/javascript" language="javascript" src="row_toggle.js"> </script> diff --git a/usr/local/www/firewall_shaper_edit.php b/usr/local/www/firewall_shaper_edit.php index b043db4..1021b93 100755 --- a/usr/local/www/firewall_shaper_edit.php +++ b/usr/local/www/firewall_shaper_edit.php @@ -288,7 +288,7 @@ if ($_POST) { } } -$pgtitle = "Firewall: Shaper: Rules: Edit"; +$pgtitle = array("Firewall","Shaper","Rules","Edit"); $closehead = false; include("head.inc"); ?> @@ -395,7 +395,6 @@ function dst_rep_change() { <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 (is_array($config['shaper']['queue']) && (count($config['shaper']['queue']) > 0)): ?> <form action="firewall_shaper_edit.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php index 35fff3e..ca42947 100755 --- a/usr/local/www/firewall_shaper_queues.php +++ b/usr/local/www/firewall_shaper_queues.php @@ -155,14 +155,13 @@ if ($_POST) { } -$pgtitle = "Firewall: Shaper: Queues"; +$pgtitle = array("Firewall","Shaper","Queues"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="firewall_shaper_queues.php" method="post"> <script type="text/javascript" language="javascript" src="row_toggle.js"></script> <?php if ($input_errors) print_input_errors($input_errors); ?> diff --git a/usr/local/www/firewall_shaper_queues_edit.php b/usr/local/www/firewall_shaper_queues_edit.php index d330023..cb7309f 100755 --- a/usr/local/www/firewall_shaper_queues_edit.php +++ b/usr/local/www/firewall_shaper_queues_edit.php @@ -238,7 +238,7 @@ if ($_POST) { $attachtoqueue = $pconfig['attachtoqueue']; $parent = $pconfig["parent"]; -$pgtitle = "Firewall: Shaper: Queues: Edit"; +$pgtitle = array("Firewall","Shaper","Queues","Edit"); include("head.inc"); ?> @@ -291,7 +291,6 @@ function enable_attachtoqueue(enable_over) { <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="firewall_shaper_queues_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/firewall_system_tunables.php b/usr/local/www/firewall_system_tunables.php index 90b1809..f55cc4f 100644 --- a/usr/local/www/firewall_system_tunables.php +++ b/usr/local/www/firewall_system_tunables.php @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Firewall: System: Tunables"; +$pgtitle = array("Firewall","System","Tunables"); require("guiconfig.inc"); @@ -70,7 +70,6 @@ include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="<?= $jsevents["body"]["onload"] ?>"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="firewall_virtual_ip.php" method="post"> <div id="inputerrors"></div> <?php if ($input_errors) print_input_errors($input_errors); ?> diff --git a/usr/local/www/firewall_system_tunables_edit.php b/usr/local/www/firewall_system_tunables_edit.php index 0ed6324..82b1480 100644 --- a/usr/local/www/firewall_system_tunables_edit.php +++ b/usr/local/www/firewall_system_tunables_edit.php @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Firewall: System Tunables: Edit"; +$pgtitle = array("Firewall","System Tunables","Edit"); require("guiconfig.inc"); if (!is_array($config['sysctl']['item'])) { @@ -85,7 +85,6 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="<?= $jsevents["body"]["onload"] ?>"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <div id="inputerrors"></div> <?php if ($input_errors) print_input_errors($input_errors); ?> diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php index bfd5c07..75305d3 100755 --- a/usr/local/www/firewall_virtual_ip.php +++ b/usr/local/www/firewall_virtual_ip.php @@ -86,13 +86,12 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "Firewall: Virtual IP Addresses"; +$pgtitle = array("Firewall","Virtual IP Addresses"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="firewall_virtual_ip.php" method="post"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php index d693800..29827b4 100755 --- a/usr/local/www/firewall_virtual_ip_edit.php +++ b/usr/local/www/firewall_virtual_ip_edit.php @@ -203,14 +203,13 @@ if ($_POST) { } } -$pgtitle = "Firewall: Virtual IP Address: Edit"; +$pgtitle = array("Firewall","Virtual IP Address","Edit"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <script language="JavaScript"> <!-- function get_radio_value(obj) diff --git a/usr/local/www/halt.php b/usr/local/www/halt.php index ce9efee..0de7b66 100755 --- a/usr/local/www/halt.php +++ b/usr/local/www/halt.php @@ -44,13 +44,12 @@ if ($_POST) { } } -$pgtitle = "Diagnostics: Halt system"; +$pgtitle = array("Diagnostics","Halt system"); include('head.inc'); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($rebootmsg): echo print_info_box($rebootmsg); else: ?> <form action="halt.php" method="post"> <p><strong>Are you sure you want to halt the system?</strong></p> diff --git a/usr/local/www/index.php b/usr/local/www/index.php index 51276cc..ec996a3 100755 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -77,7 +77,7 @@ ## accessed since initial install show this stuff. if(file_exists('/conf/trigger_initial_wizard')) { - $pgtitle = 'pfSense first time setup'; + $pgtitle = array("pfSense first time setup"); include('head.inc'); echo "<body link=\"#0000CC\" vlink=\"#0000CC\" alink=\"#0000CC\">\n"; diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index e198ea7..f235ebf 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -528,7 +528,7 @@ if ($_POST) { } } -$pgtitle = "Interfaces: WAN"; +$pgtitle = array("Interfaces","WAN"); $closehead = false; include("head.inc"); @@ -715,7 +715,6 @@ function show_mon_config() { </head> <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); ?> <form action="interfaces_wan.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index 2557afa..d78f5d3 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -191,8 +191,6 @@ if ($_GET['act'] == "add") { } - -$pgtitle = "Interfaces: Assign"; include("head.inc"); if(file_exists("/var/run/interface_mismatch_reboot_needed")) @@ -205,7 +203,6 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed")) <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); ?> diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php index 85a8493..8d87c5e 100755 --- a/usr/local/www/interfaces_lan.php +++ b/usr/local/www/interfaces_lan.php @@ -139,7 +139,7 @@ if ($_POST) { } } -$pgtitle = "Interfaces: LAN"; +$pgtitle = array("Interfaces","LAN"); include("head.inc"); ?> @@ -160,7 +160,6 @@ function enable_change(enable_over) { <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <form action="interfaces_lan.php" method="post" name="iform" id="iform"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if (file_exists($d_landirty_path)): ?><p> <?php print_info_box_np("The LAN configuration has been changed.<p>You must apply the changes in order for them to take effect.<p>Don't forget to adjust the DHCP Server range if needed before applying.");?><br> diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php index a42a2d7..e57d773 100755 --- a/usr/local/www/interfaces_opt.php +++ b/usr/local/www/interfaces_opt.php @@ -252,7 +252,7 @@ if ($_POST) { } -$pgtitle = "Interfaces: Optional {$index} (" . htmlspecialchars($optcfg['descr']) . ")"; +$pgtitle = array("Interfaces","Optional {$index} (" . htmlspecialchars($optcfg['descr']) . ")"); include("head.inc"); ?> @@ -296,7 +296,6 @@ function show_mon_config() { <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); ?> <?php if ($optcfg['if']): ?> diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php index a2999f4..2ed8151 100755 --- a/usr/local/www/interfaces_vlan.php +++ b/usr/local/www/interfaces_vlan.php @@ -86,14 +86,13 @@ if ($_GET['act'] == "del") { } -$pgtitle = "Interfaces: VLAN"; +$pgtitle = array("Interfaces","VLAN"); 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); ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php index 3831dd9..ad920f0 100755 --- a/usr/local/www/interfaces_vlan_edit.php +++ b/usr/local/www/interfaces_vlan_edit.php @@ -96,14 +96,13 @@ if ($_POST) { } } -$pgtitle = "Firewall: VLAN: Edit"; +$pgtitle = array("Firewall","VLAN","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="interfaces_vlan_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php index e198ea7..f235ebf 100755 --- a/usr/local/www/interfaces_wan.php +++ b/usr/local/www/interfaces_wan.php @@ -528,7 +528,7 @@ if ($_POST) { } } -$pgtitle = "Interfaces: WAN"; +$pgtitle = array("Interfaces","WAN"); $closehead = false; include("head.inc"); @@ -715,7 +715,6 @@ function show_mon_config() { </head> <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); ?> <form action="interfaces_wan.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/interfaces_wlan_scan.php b/usr/local/www/interfaces_wlan_scan.php index cecda93..7e296d2 100755 --- a/usr/local/www/interfaces_wlan_scan.php +++ b/usr/local/www/interfaces_wlan_scan.php @@ -34,14 +34,13 @@ require("guiconfig.inc"); -$pgtitle = "Interfaces: Scan Wireless"; +$pgtitle = array("Interfaces","Scan Wireless"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> echo "Scanning nodes... One moment please..."; $scan_nodes = `/sbin/ifconfig {$_GET['interface']} scan`; diff --git a/usr/local/www/load_balancer_pool.php b/usr/local/www/load_balancer_pool.php index 6d62440..2017919 100755 --- a/usr/local/www/load_balancer_pool.php +++ b/usr/local/www/load_balancer_pool.php @@ -74,13 +74,12 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "Load Balancer: Pool"; +$pgtitle = array("Load Balancer","Pool"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="load_balancer_pool.php" method="post"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/load_balancer_pool_edit.php b/usr/local/www/load_balancer_pool_edit.php index 3be1860..b3957a3 100755 --- a/usr/local/www/load_balancer_pool_edit.php +++ b/usr/local/www/load_balancer_pool_edit.php @@ -176,7 +176,7 @@ if ($_POST) { } } -$pgtitle = "Load Balancer: Pool: Edit"; +$pgtitle = array("Load Balancer","Pool","Edit"); include("head.inc"); ?> @@ -266,7 +266,6 @@ function clearcombo(){ </script> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="load_balancer_pool_edit.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/load_balancer_virtual_server.php b/usr/local/www/load_balancer_virtual_server.php index b0eb105..a7480ea 100755 --- a/usr/local/www/load_balancer_virtual_server.php +++ b/usr/local/www/load_balancer_virtual_server.php @@ -64,13 +64,12 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "Services: Load Balancer: Virtual Servers"; +$pgtitle = array("Services","Load Balancer","Virtual Servers"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="load_balancer_virtual_server.php" method="post"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php index f5c3249..04ca617 100755 --- a/usr/local/www/load_balancer_virtual_server_edit.php +++ b/usr/local/www/load_balancer_virtual_server_edit.php @@ -111,14 +111,13 @@ if ($_POST) { } } -$pgtitle = "Load Balancer: Virtual Server: Edit"; +$pgtitle = array("Load Balancer","Virtual Server","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="load_balancer_virtual_server_edit.php" method="post" name="iform" id="iform"> <script type="text/javascript" language="javascript" src="pool.js"> diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php index 7a48c20..813d338 100755 --- a/usr/local/www/pkg.php +++ b/usr/local/www/pkg.php @@ -97,7 +97,7 @@ if($pkg['custom_php_global_functions'] <> "") if($pkg['custom_php_command_before_form'] <> "") eval($pkg['custom_php_command_before_form']); -$pgtitle = $title; +$pgtitle = array($title); include("head.inc"); ?> @@ -106,7 +106,6 @@ include("head.inc"); <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="pkg.php" method="post"> <? if($_GET['savemsg'] <> "") $savemsg = $_GET['savemsg']; ?> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index f1f7aed..f7a5bc7 100755 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -271,7 +271,6 @@ foreach ($pkg['fields']['field'] as $field) { </script> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if (!empty($input_errors)) print_input_errors($input_errors); ?> <form name="iform" action="pkg_edit.php" method="post"> <script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script> diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index f9968ef..93b80da 100755 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -52,7 +52,7 @@ if (! empty($_GET)) { } } -$pgtitle = "System: Package Manager"; +$pgtitle = array("System","Package Manager"); include("head.inc"); ?> @@ -61,7 +61,6 @@ include("head.inc"); <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($savemsg) print_info_box($savemsg); ?> <?php diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php index 4a7350f..a1038a6 100755 --- a/usr/local/www/pkg_mgr_install.php +++ b/usr/local/www/pkg_mgr_install.php @@ -37,14 +37,13 @@ $sendto = "output"; $todo = array(); -$pgtitle = "System: Package Manager: Install Package"; +$pgtitle = array("System","Package Manager","Install Package"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="pkg_mgr_install.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index 633d5ec..20e3215 100755 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -37,14 +37,13 @@ if(is_array($config['installedpackages']['package'])) { $currentvers = get_pkg_info($tocheck, array('version', 'xmlver')); } -$pgtitle = "System: Package Manager"; +$pgtitle = array("System","Package Manager"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($savemsg) print_info_box($savemsg); ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php diff --git a/usr/local/www/reboot.php b/usr/local/www/reboot.php index 75f5604..1034d2f 100755 --- a/usr/local/www/reboot.php +++ b/usr/local/www/reboot.php @@ -40,13 +40,12 @@ if ($_POST) { } -$pgtitle = "Diagnostics: Reboot System"; +$pgtitle = array("Diagnostics","Reboot System"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($rebootmsg): echo print_info_box($rebootmsg); else: ?> <form action="reboot.php" method="post"> <p><strong>Are you sure you want to reboot the system?</strong></p> diff --git a/usr/local/www/restart_httpd.php b/usr/local/www/restart_httpd.php index d022eba..3aea0a7 100755 --- a/usr/local/www/restart_httpd.php +++ b/usr/local/www/restart_httpd.php @@ -28,7 +28,7 @@ require_once("guiconfig.inc"); require_once("system.inc"); -$pgtitle = "Restarting mini_httpd"; +$pgtitle = array("Restarting mini_httpd"); include("head.inc"); ?> @@ -36,8 +36,6 @@ include("head.inc"); <form> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?php echo $pgtitle; ?></p> - Mounting file systems read/write... <?php flush(); sleep(1); conf_mount_rw(); ?> Done.<br> diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index 0c7d2ba..adc7e4a 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Services:Captive portal"; +$pgtitle = array("Services","Captive portal"); require("guiconfig.inc"); if (!is_array($config['captiveportal'])) { @@ -251,7 +251,6 @@ function enable_change(enable_change) { //--> </script> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <form action="services_captiveportal.php" method="post" enctype="multipart/form-data" name="iform" id="iform"> diff --git a/usr/local/www/services_captiveportal_filemanager.php b/usr/local/www/services_captiveportal_filemanager.php index f0fca53..536a4dd 100755 --- a/usr/local/www/services_captiveportal_filemanager.php +++ b/usr/local/www/services_captiveportal_filemanager.php @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Services:Captive portal"; +$pgtitle = array("Services","Captive portal"); require_once("guiconfig.inc"); @@ -102,7 +102,6 @@ include("head.inc"); ?> <?php include("fbegin.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<p class="pgtitle"><?=$pgtitle?></p> <form action="services_captiveportal_filemanager.php" method="post" enctype="multipart/form-data" name="iform" id="iform"> <?php if ($input_errors) print_input_errors($input_errors); ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index 50a45b3..b657566 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Services:Captive portal"; +$pgtitle = array("Services","Captive portal"); require("guiconfig.inc"); if (!is_array($config['captiveportal']['allowedip'])) @@ -72,7 +72,6 @@ include("head.inc"); ?> <?php include("fbegin.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<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)): ?> diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php index 5d1abca..cf2900a 100755 --- a/usr/local/www/services_captiveportal_ip_edit.php +++ b/usr/local/www/services_captiveportal_ip_edit.php @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Services:Captive portal:Edit allowed IP address"; +$pgtitle = array("Services","Captive portal","Edit allowed IP address"); require("guiconfig.inc"); if (!is_array($config['captiveportal']['allowedip'])) @@ -97,7 +97,6 @@ include("head.inc"); ?> <?php include("fbegin.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<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 471e838..3d57926 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Services:Captive portal"; +$pgtitle = array("Services","Captive portal"); require("guiconfig.inc"); if (!is_array($config['captiveportal']['passthrumac'])) @@ -72,7 +72,6 @@ include("head.inc"); ?> <?php include("fbegin.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<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> diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php index 048b94e..737e9d5 100755 --- a/usr/local/www/services_captiveportal_mac_edit.php +++ b/usr/local/www/services_captiveportal_mac_edit.php @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Services:Captive portal:Edit pass-through MAC address"; +$pgtitle = array("Services","Captive portal","Edit pass-through MAC address"); require("guiconfig.inc"); if (!is_array($config['captiveportal']['passthrumac'])) @@ -95,7 +95,6 @@ include("head.inc"); ?> <?php include("fbegin.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<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 02365dc..5e501a3 100755 --- a/usr/local/www/services_captiveportal_users.php +++ b/usr/local/www/services_captiveportal_users.php @@ -30,7 +30,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Services:Captive portal"; +$pgtitle = array("Services","Captive portal"); require("guiconfig.inc"); if (!is_array($config['captiveportal']['user'])) { @@ -67,7 +67,6 @@ include("head.inc"); ?> <?php include("fbegin.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php diff --git a/usr/local/www/services_captiveportal_users_edit.php b/usr/local/www/services_captiveportal_users_edit.php index f03e830..f60e1ed 100755 --- a/usr/local/www/services_captiveportal_users_edit.php +++ b/usr/local/www/services_captiveportal_users_edit.php @@ -30,7 +30,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = "Services: Captive portal: Edit user"; +$pgtitle = array("Services","Captive portal","Edit user"); require("guiconfig.inc"); if (!is_array($config['captiveportal']['user'])) { @@ -135,7 +135,6 @@ include("head.inc"); // --> </script> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="services_captiveportal_users_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.php b/usr/local/www/services_dhcp.php index c66ed03..b5b94de 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -287,7 +287,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "Services: DHCP server"; +$pgtitle = array("Services","DHCP server"); include("head.inc"); ?> @@ -357,7 +357,6 @@ function show_netboot_config() { <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<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 da38457..b579023 100755 --- a/usr/local/www/services_dhcp_edit.php +++ b/usr/local/www/services_dhcp_edit.php @@ -145,14 +145,13 @@ if ($_POST) { } } -$pgtitle = "Services: DHCP: Edit static mapping"; +$pgtitle = array("Services","DHCP","Edit static mapping"); 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_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 e18d8bb..83b39d8 100755 --- a/usr/local/www/services_dhcp_relay.php +++ b/usr/local/www/services_dhcp_relay.php @@ -147,7 +147,7 @@ if ($_POST) { } } -$pgtitle = "Services: DHCP Relay"; +$pgtitle = array("Services","DHCP Relay"); include("head.inc"); ?> @@ -174,7 +174,6 @@ function enable_change(enable_over) { <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<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 0a9e132..44b1feb 100755 --- a/usr/local/www/services_dnsmasq.php +++ b/usr/local/www/services_dnsmasq.php @@ -91,7 +91,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "Services: DNS forwarder"; +$pgtitle = array("Services","DNS forwarder"); include("head.inc"); ?> @@ -109,7 +109,6 @@ function enable_change(enable_over) { <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="services_dnsmasq.php" method="post" name="iform" id="iform"> <?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 a795c9f..4090d27 100755 --- a/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -94,14 +94,13 @@ if ($_POST) { } } -$pgtitle = "Services: DNS forwarder: Edit Domain Override"; +$pgtitle = array("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); ?> <form action="services_dnsmasq_domainoverride_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/services_dnsmasq_edit.php b/usr/local/www/services_dnsmasq_edit.php index bf35a5a..ec3195d 100755 --- a/usr/local/www/services_dnsmasq_edit.php +++ b/usr/local/www/services_dnsmasq_edit.php @@ -100,14 +100,13 @@ if ($_POST) { } } -$pgtitle = "Services: DNS forwarder: Edit host"; +$pgtitle = array("Services","DNS forwarder","Edit host"); 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_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 d1b5f6b..ec0be45 100755 --- a/usr/local/www/services_dyndns.php +++ b/usr/local/www/services_dyndns.php @@ -126,7 +126,7 @@ if ($_POST) { } } -$pgtitle = "Services: Dynamic DNS client"; +$pgtitle = array("Services","Dynamic DNS client"); include("head.inc"); ?> @@ -159,7 +159,6 @@ function enable_change(enable_change) { <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); ?> <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 59e3792..71f7278 100755 --- a/usr/local/www/services_proxyarp.php +++ b/usr/local/www/services_proxyarp.php @@ -64,14 +64,13 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "Services: Proxy ARP"; +$pgtitle = array("Services","Proxy ARP"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<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 22444ba..99bc0c0 100755 --- a/usr/local/www/services_proxyarp_edit.php +++ b/usr/local/www/services_proxyarp_edit.php @@ -131,7 +131,7 @@ if ($_POST) { } } -$pgtitle = "Services: Proxy ARP: Edit"; +$pgtitle = array("Services","Proxy ARP","Edit"); include("head.inc"); ?> @@ -165,7 +165,6 @@ function typesel_change() { <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_proxyarp_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/services_snmp.php b/usr/local/www/services_snmp.php index 10d5698..f9d1167 100755 --- a/usr/local/www/services_snmp.php +++ b/usr/local/www/services_snmp.php @@ -143,7 +143,7 @@ if ($_POST) { } } -$pgtitle = "Services: SNMP"; +$pgtitle = array("Services","SNMP"); include("head.inc"); ?> @@ -246,7 +246,6 @@ function enable_change(whichone) { </script> <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); ?> <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 d0675b0..c0ec5ac 100755 --- a/usr/local/www/services_usermanager.php +++ b/usr/local/www/services_usermanager.php @@ -75,14 +75,13 @@ if(is_array($config['users'])){ } } -$pgtitle = "Services: User Manager"; +$pgtitle = array("Services","User Manager"); 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 6153faf..51d8a8a 100755 --- a/usr/local/www/services_wol.php +++ b/usr/local/www/services_wol.php @@ -90,14 +90,13 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "Services: Wake on LAN"; +$pgtitle = array("Services","Wake on LAN"); 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); ?> <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 f7096cb..1b5c9a6 100755 --- a/usr/local/www/services_wol_edit.php +++ b/usr/local/www/services_wol_edit.php @@ -89,14 +89,13 @@ if ($_POST) { } } -$pgtitle = "Services: Wake on LAN: Edit"; +$pgtitle = array("Services","Wake on LAN","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_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 30c6222..0fc825e 100755 --- a/usr/local/www/status.php +++ b/usr/local/www/status.php @@ -162,7 +162,7 @@ defCmdT("vmstat -z","vmstat -z"); exec("/bin/date", $dateOutput, $dateStatus); $currentDate = $dateOutput[0]; -$pgtitle = "pfSense: status"; +$pgtitle = array("pfSense","status"); include("head.inc"); ?> @@ -179,7 +179,6 @@ pre { <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<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 8f57a0a..aa7d99d 100755 --- a/usr/local/www/status_captiveportal.php +++ b/usr/local/www/status_captiveportal.php @@ -33,7 +33,7 @@ require("guiconfig.inc"); $concurrent = `cat /var/db/captiveportal.db | wc -l`; -$pgtitle = "Status: Captive portal ({$concurrent})"; +$pgtitle = array("Status: Captive portal ({$concurrent})"); include("head.inc"); @@ -42,7 +42,6 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <script src="/javascript/sorttable.js"></script> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($_GET['act'] == "del") { diff --git a/usr/local/www/status_filter_reload.php b/usr/local/www/status_filter_reload.php index 83b4eaf..4b21811 100644 --- a/usr/local/www/status_filter_reload.php +++ b/usr/local/www/status_filter_reload.php @@ -30,7 +30,7 @@ require_once("guiconfig.inc"); require_once("functions.inc"); -$pgtitle = "Status: Filter Reload Status"; +$pgtitle = array("Status","Filter Reload Status"); include("head.inc"); @@ -50,8 +50,6 @@ if($_GET['getstatus']) { <?php include("fbegin.inc"); ?> -<p><span class="pgtitle"><?=$pgtitle;?></span></p> - <div id="status" name="status" style="padding:5px; border:1px dashed #990000; background-color: #ffffff; color: #000000;"> <?php echo $status; ?> </div> diff --git a/usr/local/www/status_graph.php b/usr/local/www/status_graph.php index e4b57d0..588c388 100755 --- a/usr/local/www/status_graph.php +++ b/usr/local/www/status_graph.php @@ -55,14 +55,13 @@ if ($_GET['if']) { $ifnum = get_real_wan_interface(); } -$pgtitle = "Status: Traffic Graph"; +$pgtitle = array("Status","Traffic Graph"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN'); diff --git a/usr/local/www/status_graph_cpu.php b/usr/local/www/status_graph_cpu.php index 4d13d49..08fd85a 100644 --- a/usr/local/www/status_graph_cpu.php +++ b/usr/local/www/status_graph_cpu.php @@ -36,7 +36,6 @@ include("fbegin.inc"); $pgtitle = "Status: CPU Graph"; ?> -<p><span class="pgtitle"><?=$pgtitle?></span> <div align="center"> <embed src="graph_cpu.php" type="image/svg+xml" width="550" height="275" pluginspage="http://www.adobe.com/svg/viewer/install/auto" /> diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php index f6d842e..08492d2 100755 --- a/usr/local/www/status_interfaces.php +++ b/usr/local/www/status_interfaces.php @@ -59,14 +59,13 @@ if ($_POST) { } } -$pgtitle = "Status: Interfaces"; +$pgtitle = array("Status","Interfaces"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <?php $i = 0; $ifdescrs = array('wan' => 'WAN', 'lan' => 'LAN'); for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) { diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php index 969808b..a95b4ae 100755 --- a/usr/local/www/status_queues.php +++ b/usr/local/www/status_queues.php @@ -51,14 +51,13 @@ foreach($pfctl_vsq_array as $pfctl) { $a_queues[] = $match_array[1][0]; } -$pgtitle = "Status: Traffic shaper: Queues"; +$pgtitle = array("Status","Traffic shaper","Queues"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <?php if(!isset($config['shaper']['enable'])) { echo "Traffic shaping is currently disabled."; diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php index 2203a74..c734377 100755 --- a/usr/local/www/status_rrd_graph.php +++ b/usr/local/www/status_rrd_graph.php @@ -86,7 +86,7 @@ $styles = array('inverse' => 'Inverse', 'absolute' => 'Absolute'); $periods = array("4h", "16h", "48h", "32d", "6m", "1y", "4y"); -$pgtitle = gettext("Status: RRD Graphs"); +$pgtitle = array("Status","RRD Graphs"); include("head.inc"); ?> diff --git a/usr/local/www/status_rrd_graph_settings.php b/usr/local/www/status_rrd_graph_settings.php index 6a386ad..4eaeb20 100755 --- a/usr/local/www/status_rrd_graph_settings.php +++ b/usr/local/www/status_rrd_graph_settings.php @@ -66,7 +66,7 @@ if ($_POST) { } } -$pgtitle = gettext("Status: RRD Graphs"); +$pgtitle = array("Status","RRD Graphs"); include("head.inc"); ?> @@ -74,7 +74,6 @@ include("head.inc"); <script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script> <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); ?> <form action="status_rrd_graph_settings.php" method="post" name="iform" id="iform"> diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php index f603507..8677cfd 100755 --- a/usr/local/www/status_services.php +++ b/usr/local/www/status_services.php @@ -170,7 +170,7 @@ if($_GET['mode'] == "stopservice" && $_GET['service']) { /* batch mode, allow other scripts to call this script */ if($_GET['batch']) exit; -$pgtitle = "Status: Services"; +$pgtitle = array("Status","Services"); include("head.inc"); ?> @@ -179,7 +179,6 @@ include("head.inc"); <?php include("fbegin.inc"); ?> -<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_slbd_pool.php b/usr/local/www/status_slbd_pool.php index a00503c..0aa9a2c 100755 --- a/usr/local/www/status_slbd_pool.php +++ b/usr/local/www/status_slbd_pool.php @@ -45,13 +45,12 @@ if (!$nentries) $now = time(); $year = date("Y"); -$pgtitle = "Status: Load Balancer: Pool"; +$pgtitle = array("Status","Load Balancer","Pool"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> <?php diff --git a/usr/local/www/status_slbd_vs.php b/usr/local/www/status_slbd_vs.php index f87c9db..4aa5cd8 100755 --- a/usr/local/www/status_slbd_vs.php +++ b/usr/local/www/status_slbd_vs.php @@ -49,13 +49,12 @@ if (!$nentries) $now = time(); $year = date("Y"); -$pgtitle = "Status: Load Balancer: Virtual Server"; +$pgtitle = array("Status","Load Balancer","Virtual Server"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> <?php diff --git a/usr/local/www/status_upnp.php b/usr/local/www/status_upnp.php index cea49a8..7b8cde5 100644 --- a/usr/local/www/status_upnp.php +++ b/usr/local/www/status_upnp.php @@ -44,7 +44,7 @@ exec("/sbin/pfctl -aminiupnpd -sn", $rdr_entries, $pf_ret); $now = time(); $year = date("Y"); -$pgtitle = "Status: UPnP Status"; +$pgtitle = array("Status","UPnP Status"); include("head.inc"); /* put your custom HTML head content here */ /* using some of the $pfSenseHead function calls */ @@ -54,7 +54,6 @@ include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></font></p> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if(!$config['installedpackages']['miniupnpd']['config'][0]['iface_array'] || diff --git a/usr/local/www/status_wireless.php b/usr/local/www/status_wireless.php index 916706b..6ea74e3 100755 --- a/usr/local/www/status_wireless.php +++ b/usr/local/www/status_wireless.php @@ -33,7 +33,7 @@ function gentitle_pkg($pgname) { return $config['system']['hostname'] . "." . $config['system']['domain'] . " - " . $pgname; } -$pgtitle = "Diagnostics: Wireless Status"; +$pgtitle = array("Diagnostics","Wireless Status"); include("head.inc"); $if = $_POST['if']; @@ -54,7 +54,6 @@ if($if == "") { <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="status_wireless.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/system.php b/usr/local/www/system.php index 87461be..16f6a62 100755 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -181,14 +181,13 @@ if ($_POST) { } } -$pgtitle = "System: General Setup"; +$pgtitle = array("System","General Setup"); 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); ?> <form action="system.php" method="post"> diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php index b0adaa1..056a6a8 100755 --- a/usr/local/www/system_advanced.php +++ b/usr/local/www/system_advanced.php @@ -264,7 +264,7 @@ if ($_POST) { } } -$pgtitle = "System: Advanced functions"; +$pgtitle = array("System","Advanced functions"); include("head.inc"); ?> @@ -272,7 +272,6 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<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); ?> diff --git a/usr/local/www/system_advanced_create_certs.php b/usr/local/www/system_advanced_create_certs.php index 854a614..1b2c32c 100755 --- a/usr/local/www/system_advanced_create_certs.php +++ b/usr/local/www/system_advanced_create_certs.php @@ -138,13 +138,12 @@ if ($_POST) { fwrite($fd, "authorityKeyIdentifier=keyid:always,issuer:always\n"); fclose($fd); -$pgtitle = "System: Advanced functions: Create Certificates"; +$pgtitle = array("System","Advanced functions","Create Certificates"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<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); ?> diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index 807e0cf..f5d6175 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -35,7 +35,7 @@ require_once("xmlrpc_client.inc"); /* if upgrade in progress, alert user */ if(file_exists($d_firmwarelock_path)) { - $pgtitle = "System: Firmware: Manual Update"; + $pgtitle = array("System","Firmware","Manual Update"); include("head.inc"); echo "<body link=\"#0000CC\" vlink=\"#0000CC\" alink=\"#0000CC\">\n"; include("fbegin.inc"); @@ -135,7 +135,6 @@ 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); ?> <?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 98e46fb..7a4b339 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -39,14 +39,13 @@ exit; require_once("guiconfig.inc"); require_once("xmlrpc.inc"); -$pgtitle = "System: Firmware: Auto Update"; +$pgtitle = array("System","Firmware","Auto Update"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<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 3563e07..e3fec38 100755 --- a/usr/local/www/system_firmware_check.php +++ b/usr/local/www/system_firmware_check.php @@ -37,13 +37,12 @@ if(isset($config['system']['disablefirmwarecheck'])) Header("Location: system_firmware.php"); $versions = check_firmware_version(); -$pgtitle = "System: Firmware: Auto Update"; +$pgtitle = array("System","Firmware","Auto Update"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <SCRIPT> <!-- function toggleTable (table, img) { diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php index bf12d90..2f3b5ef 100755 --- a/usr/local/www/system_firmware_settings.php +++ b/usr/local/www/system_firmware_settings.php @@ -55,7 +55,7 @@ if ($_POST) { $curcfg = $config['system']['firmware']; -$pgtitle = "System: Firmware: Settings"; +$pgtitle = array("System","Firmware","Settings"); include("head.inc"); ?> @@ -91,7 +91,6 @@ function enable_altfirmwareurl(enable_over) { <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="system_firmware_settings.php" method="post" name="iform" id="iform"> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/system_gateways.php b/usr/local/www/system_gateways.php index bca50c4..f3651d2 100755 --- a/usr/local/www/system_gateways.php +++ b/usr/local/www/system_gateways.php @@ -70,14 +70,13 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "System: Gateways"; +$pgtitle = array("System","Gateways"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="system_gateways.php" method="post"> <input type="hidden" name="y1" value="1"> <?php if ($savemsg) print_info_box($savemsg); ?> diff --git a/usr/local/www/system_gateways_edit.php b/usr/local/www/system_gateways_edit.php index 3fc140d..a8b85e1 100755 --- a/usr/local/www/system_gateways_edit.php +++ b/usr/local/www/system_gateways_edit.php @@ -149,14 +149,13 @@ if ($_POST) { } } -$pgtitle = "System: Gateways: Edit gateway"; +$pgtitle = array("System","Gateways","Edit gateway"); 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="system_gateways_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php index d66b9fa..d658d93 100644 --- a/usr/local/www/system_groupmanager.php +++ b/usr/local/www/system_groupmanager.php @@ -1,542 +1,310 @@ -<?php +#!/usr/local/bin/php +<?php /* - $Id$ - part of pfSense (http://www.pfSense.com) - originally part of part of m0n0wall (http://m0n0.ch/wall) - - Copyright (C) 2007 Bill Marquette <bill.marquette@gmail.com>. - All rights reserved. - - Copyright (C) 2006 Scott Ullrich <sullrich@gmail.com>. - All rights reserved. - - Copyright (C) 2005 Paul Taylor <paultaylor@winn-dixie.com>. - All rights reserved. - - Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + $Id: system_groupmanager.php + part of m0n0wall (http://m0n0.ch/wall) + + Copyright (C) 2005 Paul Taylor <paultaylor@winn-dixie.com>. + All rights reserved. + + Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ require("guiconfig.inc"); -//$_SESSION['NO_AJAX'] = true; - -$pgtitle = "System: Group manager"; -$treeItemID = 0; - -function walkArea($title, - $t, - $area, - $id, - &$counter, - &$script_tag, - $tmpfname, - &$group) { - global $treeItemID; - - foreach($area as $a => $aa) { - if (is_array($aa) && count($aa) > 0) { - $title .= "_{$a}"; - echo "<li class=\"closed\"><a id=\"treeitem_{$treeItemID}\" href=\"#\">$a</a><ul>"; - $treeItemID++; - walkArea($title, - $a, - $aa, - $id, - $counter, - $script_tag, - $tmpfname, - $group); - echo "</ul>\n"; - } else { - $tmp_string = "{$t}"; - $tmp_string .= ": "; - $tmp_string .= $a; - $trimmed_title = trim($title); - $trimmed_a = trim($a); - $this_id = "{$trimmed_title}_{$trimmed_a}_{$counter}"; - $this_id = str_replace(" ", "", $this_id); - $this_id = str_replace("/", "", $this_id); - $stripped_session = str_replace("/tmp/", "", $tmpfname); - $allowed = false; - if (is_array($group['pages'])) { - foreach($group['pages'] as $page) { - if (stristr($aa, $page)) - $allowed = true; - // echo "$page || $aa"; - } - } - $allowed ? $checked = " checked=\"checked\"" : $checked = ""; - echo " <li id=\"treeitem_{$treeItemID}\" class=\"closed\" title=\"{$aa}\"><a name=\"anchor_{$treeItemID}\" style=\"display: none;\"> </a>"; - $idForOnClick = $treeItemID; - $treeItemID++; - echo "<input type=\"checkbox\" class=\"formfld\" id=\"treeitem_{$treeItemID}\" "; - $treeItemID++; - echo "name=\"treeitem_{$treeItemID}\" title=\"{$area}\" onClick=\"getURL('system_groupmanager.php?id={$id}&toggle={$aa}&item={$idForOnClick}&session={$stripped_session}', after_request_callback); rotate();\" {$checked} /> "; - $treeItemID++; - echo "<a id=\"treeitem_{$treeItemID}\" href=\"#anchor_{$idForOnClick}\" onclick=\"getURL('system_groupmanager.php?id={$id}&toggle={$aa}&item={$idForOnClick}&session={$stripped_session}', after_request_callback); rotate();\">{$a}</a></li>\n"; - $idForScript = $treeItemID; - $treeItemID++; - -//echo "$script_tag <hr />"; - $script_tag .= "var item = document.getElementById('treeitem_{$idForScript}');\n"; - if ($allowed) { - $script_tag .= "item.style.backgroundImage = \"url('/tree/page-file_play.gif')\";\n"; - } else { - $script_tag .= "item.style.backgroundImage = \"url('/tree/page-file_x.gif')\";\n"; - } - $counter++; - } // end if - } // end foreach -} - -function init_ajax_helper_file() -{ - global $config, $id, $global; - $a_group = &$config['system']['group']; - $id = $_GET['id']; - if (isset($id) && $a_group[$id]) - $group = $a_group[$id]; - else - $group = array(); - $_SESSION['group_pages'] = $group['pages']; - return; -} - -if ($_GET['toggle'] <> "") { - /* AJAX is calling, lets take care of it */ - if (!file_exists("/tmp/" . $_GET['session'])) { - init_ajax_helper_file($_GET['session']); - } - $fc = file_get_contents("/tmp/" . $_GET['session']); - $file_split = split("\n", $fc); - $found = -1; - for($x = 0; $x < count($file_split); $x++) { - if ($file_split[$x] == $_GET['toggle']) { - $found = $x; - } - } - if ($found == -1) { - $file_split[] = $_GET['toggle']; - $image = "/tree/page-file_play.gif"; - } else { - unset($file_split[$found]); - $image = "/tree/page-file_x.gif"; - } - $fd = fopen("/tmp/{$_GET['session']}", "w"); - if ($file_split) - foreach($file_split as $fs) { - if ($fs) - fwrite($fd, $fs . "\n"); - } - fclose($fd); - echo $_GET['item'] . "_a||" . "{$image}"; - exit; -} +$pgtitle = array("System", "Group manager"); -function convert_array_to_pgtitle($orig) -{ - $newstring = ""; - foreach($orig as $o) { - if ($newstring <> "") - $newstring .= ": "; - $newstring .= $o; - } - return $newstring; -} // Returns an array of pages with their descriptions -function getAdminPageList() -{ - global $g; - +function getAdminPageList() { + global $g; + $tmp = Array(); if ($dir = opendir($g['www_path'])) { - while ($file = readdir($dir)) { - // Make sure the file exists and is not a directory - if ($file == "." or $file == ".." or $file[0] == '.') - continue; - // Is this a .inc.php file? pfSense! - if (fnmatch('guiconfig.inc', $file)) - continue; - if (fnmatch('*.inc', $file)) - continue; - if (fnmatch('*.inc.php', $file)) - continue; - if (fnmatch('*.php', $file)) { - // Read the description out of the file - $contents = file_get_contents($file); - $contents_split = split("\n", $contents); - $mlinestr = ""; - foreach($contents_split as $contents) { - $pgtitle = ""; - // Looking for a line like: - // $pgtitle = array(gettext("System"), gettext("Group manager")); // - DO NOT REMOVE. - if ($mlinestr == "" && stristr($contents, "\$pgtitle") == false) - continue; - if ($mlinestr == "" && stristr($contents, "=") == false) - continue; - if (stristr($contents, "<")) - continue; - if (stristr($contents, ">")) - continue; - /* at this point its evalable */ - $contents = trim ($contents); - $lastchar = substr($contents, strlen($contents) - 1, strlen($contents)); - $firstchar = substr($contents, 0, 1); - - /* check whether pgtitle is on one or multible lines */ - if ($firstchar <> "/" && $firstchar <> "#" && $lastchar <> ";") { - /* remember the partitial pgtitle string for the next loop iteration */ - $mlinestr .= $contents; - continue; - } else if ($mlinestr <> "" && $lastchar == ";") { - /* this is the final pgtitle part including the semicolon */ - $mlinestr .= $contents; - } else if ($mlinestr == "" && $lastchar == ";") { - /* this is a single line pgtitle, hence just - * copy its contents into mlinestr - */ - $mlinestr = $contents; - } else if ($firstchar == "/" || $firstchar == "#") { - /* same applies for comment lines */ - $mlinestr = $contents; - } - - eval($mlinestr); - - /* after eval, if not an array, continue */ - if (!is_array($pgtitle)) { - /* reset mlinestr for the next loop iteration */ - $mlinestr = ""; - continue; - } - - $tmp[$file] = $pgtitle; - - /* break out of the for loop, on to next file */ - break; - } - } - } - - /* loop through and read in wizard information */ - if ($dir = opendir("{$g['www_path']}/wizards")) { - while ($file = readdir($dir)) { - // Make sure the file exists and is not directory - if ($file == "." or $file == ".." or $file[0] == '.') - continue; - // Is this a .xml file? pfSense! - if (fnmatch('*.xml', $file)) { - /* parse package and retrieve the package title */ - $pkg = parse_xml_config_pkg("{$g['www_path']}/wizards/{$file}", "pfsensewizard"); - $title = $pkg['title']; - if ($title) - $tmp[$file] = trim($title); - } - } - } - - /* loop through and read in package information */ - if ($dir = opendir("{$g['pkg_path']}")) { - while ($file = readdir($dir)) { - // Make sure the file exists and is not directory - if ($file == "." or $file == ".." or $file[0] == '.') - continue; - // Is this a .xml file? pfSense! - if (fnmatch('*.xml', $file)) { - /* parse package and retrieve the package title */ - $pkg = @parse_xml_config_pkg("{$g['pkg_path']}/{$file}", "packagegui"); - $title = $pkg['title']; - if ($title) - $tmp[$file] = trim($title); - } - } - closedir($dir); - } - + while($file = readdir($dir)) { + // Make sure the file exists + if($file != "." && $file != ".." && $file[0] != '.') { + // Is this a .php file? + if (fnmatch('*.php',$file)) { + // Read the description out of the file + $contents = file_get_contents($file); + // Looking for a line like: + // $pgtitle = array("System", "Group manager"); + $offset = strpos($contents,'$pgtitle'); + $titlepos = strpos($contents,'(',$offset); + $titleendpos = strpos($contents,')',$titlepos); + if (($offset > 0) && ($titlepos > 0) && ($titleendpos > 0)) { + // Title found, extract it + $title = str_replace(',',':',str_replace(array('"'),'',substr($contents,++$titlepos,($titleendpos - $titlepos)))); + $tmp[$file] = trim($title); + } + else { + $tmp[$file] = ''; + } + + } + } + } + + closedir($dir); + // Sets Interfaces:Optional page that didn't read in properly with the above method, // and pages that don't have descriptions. - $tmp['interfaces_opt.php'] = ("Interfaces: Optional"); - $tmp['graph.php'] = ("Status: Traffic Graph"); - $tmp['graph_cpu.php'] = ("Diagnostics: CPU Utilization"); - $tmp['exec_raw.php'] = ("Hidden: Exec Raw"); - $tmp['uploadconfig.php'] = ("Hidden: Upload Configuration"); - $tmp['index.php'] = ("Status: System"); - $tmp['system_usermanager.php'] = ("System: User Password"); - $tmp['diag_logs_settings.php'] = ("Diagnostics: Logs: Settings"); - $tmp['diag_logs_vpn.php'] = ("Diagnostics: Logs: PPTP VPN"); - $tmp['diag_logs_filter.php'] = ("Diagnostics: Logs: Firewall"); - $tmp['diag_logs_portal.php'] = ("Diagnostics: Logs: Captive Portal"); - $tmp['diag_logs_dhcp.php'] = ("Diagnostics: Logs: DHCP"); - $tmp['diag_logs.php'] = ("Diagnostics: Logs: System"); - - $tmp['ifstats.php'] = ("Hidden: *XMLRPC Interface Stats"); - $tmp['license.php'] = ("System: License"); - $tmp['progress.php'] = ("Hidden: *No longer included"); - $tmp['diag_logs_filter_dynamic.php'] = ("Hidden: *No longer included"); - $tmp['preload.php'] = ("Hidden: *XMLRPC Preloader"); - $tmp['xmlrpc.php'] = ("Hidden: *XMLRPC Library"); - $tmp['pkg.php'] = ("System: *Renderer for XML based package GUIs (Part I)"); - $tmp['pkg_edit.php'] = ("System: *Renderer for XML based package GUIs (Part II)"); - - $tmp['functions.inc.php'] = ("Hidden: Ajax Helper 1"); - $tmp['javascript.inc.php'] = ("Hidden: Ajax Helper 2 "); - $tmp['sajax.class.php'] = ("Hidden: Ajax Helper 3"); + $tmp['interfaces_opt.php'] = "Interfaces: Optional"; + $tmp['graph.php'] = "Diagnostics: Interface Traffic"; + $tmp['graph_cpu.php'] = "Diagnostics: CPU Utilization"; + $tmp['exec.php'] = "Hidden: Exec"; + $tmp['exec_raw.php'] = "Hidden: Exec Raw"; + $tmp['status.php'] = "Hidden: Detailed Status"; + $tmp['uploadconfig.php'] = "Hidden: Upload Configuration"; + $tmp['index.php'] = "*Landing Page after Login"; + $tmp['system_usermanager.php'] = "*User Password"; + $tmp['diag_logs_settings.php'] = "Diagnostics: Logs: Settings"; + $tmp['diag_logs_vpn.php'] = "Diagnostics: Logs: PPTP VPN"; + $tmp['diag_logs_filter.php'] = "Diagnostics: Logs: Firewall"; + $tmp['diag_logs_portal.php'] = "Diagnostics: Logs: Captive Portal"; + $tmp['diag_logs_dhcp.php'] = "Diagnostics: Logs: DHCP"; + $tmp['diag_logs.php'] = "Diagnostics: Logs: System"; + + // Add appropriate descriptions for extensions, if they exist + if(file_exists("extensions.inc")){ + include("extensions.inc"); + } asort($tmp); - return $tmp; } } + // Get a list of all admin pages & Descriptions $pages = getAdminPageList(); if (!is_array($config['system']['group'])) { - $config['system']['group'] = array(); + $config['system']['group'] = array(); } admin_groups_sort(); $a_group = &$config['system']['group']; $id = $_GET['id']; if (isset($_POST['id'])) - $id = $_POST['id']; - + $id = $_POST['id']; + if ($_GET['act'] == "del") { - if ($a_group[$_GET['id']]) { - $ok_to_delete = true; - if (isset($config['system']['user'])) { - foreach ($config['system']['user'] as $userent) { - if ($userent['groupname'] == $a_group[$_GET['id']]['name']) { - $ok_to_delete = false; - $input_errors[] = gettext("users still exist who are members of this group!"); - break; - } - } - } + if ($a_group[$_GET['id']]) { + $ok_to_delete = true; + if (isset($config['system']['user'])) { + foreach ($config['system']['user'] as $userent) { + if ($userent['groupname'] == $a_group[$_GET['id']]['name']) { + $ok_to_delete = false; + $input_errors[] = "users still exist who are members of this group!"; + break; + } + } + } if ($ok_to_delete) { - unset($a_group[$_GET['id']]); - write_config(); - pfSenseHeader("system_groupmanager.php"); - exit; - } - } -} - + unset($a_group[$_GET['id']]); + write_config(); + header("Location: system_groupmanager.php"); + exit; + } + } +} + if ($_POST) { - unset($input_errors); - $pconfig = $_POST; - /* input validation */ - $reqdfields = explode(" ", "groupname"); - $reqdfieldsn = explode(",", "Group Name"); - - do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); - - if (preg_match("/[^a-zA-Z0-9\.\-_ ]/", $_POST['groupname'])) - $input_errors[] = gettext("The group name contains invalid characters."); - - if (!$input_errors && !(isset($id) && $a_group[$id])) { - /* make sure there are no dupes */ - foreach ($a_group as $group) { - if ($group['name'] == $_POST['groupname']) { - $input_errors[] = gettext("Another entry with the same group name already exists."); - break; - } - } - } - - if (!$input_errors) { - if (isset($id) && $a_group[$id]) - $group = $a_group[$id]; - - $group['name'] = $_POST['groupname']; - isset($_POST['homepage']) ? $group['home'] = $_POST['homepage'] : $group['home'] = "index.php"; - isset($_POST['gtype']) ? $group['scope'] = $_POST['gtype'] : $group['scope'] = "system"; - $group['description'] = $_POST['description']; - unset($group['pages'][0]['page']); - - $file_split = split("\n", file_get_contents("/tmp/" . $_POST['session'])); - for($x = 0; $x < count($file_split); $x++) { - if ($file_split[$x]) - $group['pages'][0]['page'][] = $file_split[$x]; - } - - if (isset($id) && $a_group[$id]) - $a_group[$id] = $group; - else - $a_group[] = $group; - - write_config(); - pfSenseHeader("system_groupmanager.php"); - exit; - } + unset($input_errors); + $pconfig = $_POST; + + /* input validation */ + $reqdfields = explode(" ", "groupname"); + $reqdfieldsn = explode(",", "Group Name"); + + do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); + + if (preg_match("/[^a-zA-Z0-9\.\-_ ]/", $_POST['groupname'])) + $input_errors[] = "The group name contains invalid characters."; + + if (!$input_errors && !(isset($id) && $a_group[$id])) { + /* make sure there are no dupes */ + foreach ($a_group as $group) { + if ($group['name'] == $_POST['groupname']) { + $input_errors[] = "Another entry with the same group name already exists."; + break; + } + } + } + + if (!$input_errors) { + + if (isset($id) && $a_group[$id]) + $group = $a_group[$id]; + + $group['name'] = $_POST['groupname']; + $group['description'] = $_POST['description']; + unset($group['pages']); + foreach ($pages as $fname => $title) { + $identifier = str_replace('.php','',$fname); + if ($_POST[$identifier] == 'yes') { + $group['pages'][] = $fname; + } + } + + if (isset($id) && $a_group[$id]) + $a_group[$id] = $group; + else + $a_group[] = $group; + + write_config(); + + header("Location: system_groupmanager.php"); + exit; + } } include("head.inc"); -?><script type="text/javascript"> - - function checkallareas(enable) { - var elem = document.iform.elements.length; - var endis = (document.iform.checkall.checked || enable); - - for (i = 0; i < elem; i++) { - if (document.iform.elements[i].name.indexOf("chk-") >= 0) { - document.iform.elements[i].checked = true; - document.iform.elements[i].click(); - } - } - } - -</script> -<link href="/tree/tree.css" rel="stylesheet" type="text/css" /> -<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script> -<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script> - -<? - -// XXX: billm TODO -//echo $pfSenseHead->getHTML(); - ?> - -<body link="#000000" vlink="#000000" alink="#000000" onload="<?= $jsevents["body"]["onload"] ?>"> -<?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);?> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td class="tabnavtbl"> +<?php include("fbegin.inc"); ?> +<?php if ($input_errors) print_input_errors($input_errors); ?> +<?php if ($savemsg) print_info_box($savemsg); ?> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr><td class="tabnavtbl"> + <ul id="tabnav"> + <?php + $tab_array = array(); + $tab_array[] = array(gettext("Users"), false, "system_usermanager.php"); + $tab_array[] = array(gettext("Group"), true, "system_groupmanager.php"); + $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php"); + display_top_tabs($tab_array); + ?> + </ul> + </td></tr> +<tr> + <td class="tabcont"> <?php - $tab_array = array(); - $tab_array[] = array(gettext("Users"), false, "system_usermanager.php"); - $tab_array[] = array(gettext("Group"), true, "system_groupmanager.php"); - $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php"); - display_top_tabs($tab_array); -?> - </td> - </tr> - <tr> - <td class="tabcont"> - - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="35%" class="listhdrr"><?=gettext("Group name");?></td> - <td width="20%" class="listhdrr"><?=gettext("Description");?></td> - <td width="20%" class="listhdrr"><?=gettext("Pages Accessible");?></td> - <td width="10%" class="list"></td> - </tr> -<?php - $i = 0; - foreach($a_group as $group): +if($_GET['act']=="new" || $_GET['act']=="edit"){ + if($_GET['act']=="edit"){ + if (isset($id) && $a_group[$id]) { + $pconfig['name'] = $a_group[$id]['name']; + $pconfig['description'] = $a_group[$id]['description']; + $pconfig['pages'] = $a_group[$id]['pages']; + } + } ?> - <tr> - <td class="listlr" valign="middle" nowrap="nowrap"> - <table border="0" cellpadding="0" cellspacing="0"> - <tr> - <td align="left" valign="middle"> - <?php if($group['scope'] == "user"): ?> - <img src="/themes/<?=$g['theme'];?>/images/icons/icon_system-group.png" alt="Group" title="Group" border="0" height="20" width="20" /> - <?php else: ?> - <img src="/themes/<?=$g['theme'];?>/images/icons/icon_system-group-grey.png" alt="Group" title="Group" border="0" height="20" width="20" /> - <?php endif; ?> - - </td> - <td align="left" valign="middle"> - <? - if($group['name'] != "") - echo htmlspecialchars($group['name']); - else - echo " "; - ?> - </td> - </tr> - </table> - </td> - <td class="listr"> - <? - if($group['description'] != "") - echo htmlspecialchars($group['description']); - else - echo " "; - ?> - </td> - <td class="listbg"> - <?php if(is_array($group['pages'])): ?> - <?php if ($group['pages'][0] == 'ANY'): ?> - <font color="white">ANY</font> - <? else: ?> - <font color="white"><?=count($group['pages']);?> pages</font> - <?php endif; ?> - <?php endif; ?> - </td> - <?php if($group['scope'] == "user"): ?> - <td valign="middle" nowrap class="list"> - <a href="system_groupmanager_edit.php?act=edit&id=<?=$i;?>"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit group");?>" width="17" height="17" border="0" alt="" /> - </a> - <a href="system_groupmanager.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this group?");?>')"> - <img src="./themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete group");?>" width="17" height="17" border="0" alt="" /> - </a> - </td> - <?php endif; ?> - </tr> +<form action="system_groupmanager.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="22%" valign="top" class="vncellreq">Group name</td> + <td width="78%" class="vtable"> + <input name="groupname" type="text" class="formfld" id="groupname" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"> + </td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell">Description</td> + <td width="78%" class="vtable"> + <input name="description" type="text" class="formfld" id="description" size="20" value="<?=htmlspecialchars($pconfig['description']);?>"> + <br> + Group description, for your own information only</td> + </tr> + <tr> + <td colspan="4"><br> Select that pages that this group may access. Members of this group will be able to perform all actions that<br> are possible from each individual web page. Ensure you set access levels appropriately.<br><br> + <span class="vexpl"><span class="red"><strong> Note: </strong></span>Pages + marked with an * are strongly recommended for every group.</span> + </td> + </tr> + <tr> + <td colspan="2"> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="listhdrr"> </td> + <td class="listhdrr">Page Description</td> + <td class="listhdr">Filename</td> + </tr> + <?php + foreach ($pages as $fname => $title) { + $identifier = str_replace('.php','',$fname); + ?> + <tr><td class="listlr"> + <input name="<?=$identifier?>" type="checkbox" id="<?=$identifier?>" value="yes" <?php if (in_array($fname,$pconfig['pages'])) echo "checked"; ?>></td> + <td class="listr"><?=$title?></td> + <td class="listr"><?=$fname?></td> + </tr> + <? + } ?> + </table> + </td> + </tr> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input name="save" type="submit" class="formbtn" value="Save"> + <?php if (isset($id) && $a_group[$id]): ?> + <input name="id" type="hidden" value="<?=$id;?>"> + <?php endif; ?> + </td> + </tr> + </table> + </form> <?php - $i++; - endforeach; +} else { ?> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td class="list" colspan="3"></td> - <td class="list"> - <a href="system_groupmanager_edit.php?act=new"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("add group");?>" width="17" height="17" border="0" alt="" /> - </a> - </td> - </tr> - <tr> - <td colspan="3"> - <p> - <?=gettext("Additional webConfigurator admin groups can be added here. Each group can be restricted to specific portions of the webConfigurator. Individually select the desired web pages each group may access. For example, a troubleshooting group could be created which has access only to selected Status and Diagnostics pages.");?> - </p> - <p> - <?=gettext("A group icon that appears grey indicates that it is a system group and thus can't be modified or deleted.");?> - </p> - </td> - </tr> + <td width="35%" class="listhdrr">Group name</td> + <td width="20%" class="listhdrr">Description</td> + <td width="20%" class="listhdrr">Pages Accessible</td> + <td width="10%" class="list"></td> + </tr> + <?php $i = 0; foreach($a_group as $group): ?> + <tr> + <td class="listlr"> + <?=htmlspecialchars($group['name']); ?> + </td> + <td class="listr"> + <?=htmlspecialchars($group['description']);?> + </td> + <td class="listbg"> + <?=count($group['pages']);?> + </td> + <td valign="middle" nowrap class="list"> <a href="system_groupmanager.php?act=edit&id=<?=$i; ?>"><img src="e.gif" title="edit group" width="17" height="17" border="0"></a> + <a href="system_groupmanager.php?act=del&id=<?=$i; ?>" onclick="return confirm('Do you really want to delete this group?')"><img src="x.gif" title="delete group" width="17" height="17" border="0"></a></td> + </tr> + <?php $i++; endforeach; ?> + <tr> + <td class="list" colspan="3"></td> + <td class="list"> <a href="system_groupmanager.php?act=new"><img src="plus.gif" title="add group" width="17" height="17" border="0"></a></td> + </tr> + <tr> + <td colspan="3"> + Additional webGui admin groups can be added here. Each group can be restricted to specific portions of the webGUI. Individually select the desired web pages each group may access. For example, a troubleshooting group could be created which has access only to selected Status and Diagnostics pages. + </td> + </tr> + </table> +<?php } ?> + + </td> + </tr> </table> - </td></tr> -</table> - -<script type="text/javascript"> - window.setTimeout('afterload()', '10'); - function afterload() { - <?php echo $script_tag ?> - } -</script> -<?php include("fend.inc");?> -</body> -</html> -
\ No newline at end of file +<?php include("fend.inc"); ?>
\ No newline at end of file diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php index 8bd3acd..57c37ee 100755 --- a/usr/local/www/system_routes.php +++ b/usr/local/www/system_routes.php @@ -91,14 +91,13 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "System: Static Routes"; +$pgtitle = array("System","Static Routes"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<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 18e27e6..16ef541 100755 --- a/usr/local/www/system_routes_edit.php +++ b/usr/local/www/system_routes_edit.php @@ -118,14 +118,13 @@ if ($_POST) { } } -$pgtitle = "System: Static Routes: Edit route"; +$pgtitle = array("System","Static Routes","Edit route"); 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="system_routes_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php index 3e8133c..95030f2 100644 --- a/usr/local/www/system_usermanager.php +++ b/usr/local/www/system_usermanager.php @@ -1,479 +1,300 @@ -<?php -/* $Id$ */ +#!/usr/local/bin/php +<?php /* - system_usermanager.php - part of m0n0wall (http://m0n0.ch/wall) - - Copyright (C) 2005 Paul Taylor <paultaylor@winn-dixie.com>. - All rights reserved. - - Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + $Id: system_usermanager.php + part of m0n0wall (http://m0n0.ch/wall) + + Copyright (C) 2005 Paul Taylor <paultaylor@winn-dixie.com>. + All rights reserved. + + Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ require("guiconfig.inc"); + // The page title for non-admins -$pgtitle = "System: User Password"; +$pgtitle = array("System", "User password"); -if (isSystemAdmin($HTTP_SERVER_VARS['AUTH_USER'])) { +if ($_SERVER['REMOTE_USER'] === $config['system']['username']) { + // Page title for main admin - $pgtitle = "System: User Manager"; + $pgtitle = array("System", "User manager"); $id = $_GET['id']; if (isset($_POST['id'])) - $id = $_POST['id']; - + $id = $_POST['id']; + if (!is_array($config['system']['user'])) { - $config['system']['user'] = array(); + $config['system']['user'] = array(); } - admin_users_sort(); $a_user = &$config['system']['user']; - $t_privs = $a_user[$id]['priv']; - - if ($_GET['act'] == "del" && $_GET['what'] == "user") { - if ($a_user[$_GET['id']]) { - $userdeleted = $a_user[$_GET['id']]['name']; - unset($a_user[$_GET['id']]); - write_config(); - $retval = system_password_configure(); - $savemsg = get_std_save_message($retval); - $savemsg = gettext("User") . " " . $userdeleted . " " . gettext("successfully deleted") . "<br />"; - } - } else if ($_GET['act'] == "del" && $_GET['what'] == "priv") { - if ($t_privs[$_GET['privid']]) { - $privdeleted = $t_privs[$_GET['privid']]['id']; - unset($t_privs[$_GET['privid']]); - write_config(); - $_GET['act'] = "edit"; - $retval = 0; - $savemsg = get_std_save_message($retval); - $savemsg = gettext("Privilege") . " " . $privdeleted . " " . gettext("of user") . " " . $a_user[$_GET['id']]['name'] . " " . gettext("successfully deleted") . "<br />"; - } + + if ($_GET['act'] == "del") { + if ($a_user[$_GET['id']]) { + $userdeleted = $a_user[$_GET['id']]['name']; + unset($a_user[$_GET['id']]); + write_config(); + $retval = system_password_configure(); + $savemsg = get_std_save_message($retval); + $savemsg = "User ".$userdeleted." successfully deleted<br>"; + } } - + if ($_POST) { - unset($input_errors); - $pconfig = $_POST; - - /* input validation */ - if (isset($id) && ($a_user[$id])) { - $reqdfields = explode(" ", "usernamefld"); - $reqdfieldsn = explode(",", "Username"); - } else { - $reqdfields = explode(" ", "usernamefld passwordfld1"); - $reqdfieldsn = explode(",", "Username,Password"); - } - - do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); - - if (hasShellAccess($_POST['usernamefld'])) { - if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['usernamefld'])) - $input_errors[] = gettext("The username contains invalid characters."); - } else { - if (preg_match("/[^a-zA-Z0-9\@\.\-_]/", $_POST['usernamefld'])) - $input_errors[] = gettext("The username contains invalid characters."); - } - - if (($_POST['passwordfld1']) && ($_POST['passwordfld1'] != $_POST['passwordfld2'])) - $input_errors[] = gettext("The passwords do not match."); - - if (!$input_errors && !(isset($id) && $a_user[$id])) { - /* make sure there are no dupes */ - foreach ($a_user as $userent) { - if ($userent['name'] == $_POST['usernamefld']) { - $input_errors[] = gettext("Another entry with the same username already exists."); - break; - } - } - } - - if ($pconfig['utype'] <> "system" && !isset($groupindex[$_POST['groupname']])) { - $input_errors[] = gettext("group does not exist, please define the group before assigning users."); - } - - if (isset($config['system']['ssh']['sshdkeyonly']) && - empty($_POST['authorizedkeys'])) { - $input_errors[] = gettext("You must provide an authorized key otherwise you won't be able to login into this system."); - } - - /* if this is an AJAX caller then handle via JSON */ - if (isAjax() && is_array($input_errors)) { - input_errors2Ajax($input_errors); - exit; - } - - if (!$input_errors) { - $userent = ""; - if (isset($id) && $a_user[$id]) - $userent = $a_user[$id]; - - /* the user did change his username */ - if ($_POST['usernamefld'] <> $_POST['oldusername']) { - $_SERVER['REMOTE_USER'] = $_POST['usernamefld']; - } - - $userent['name'] = $_POST['usernamefld']; - $userent['fullname'] = $_POST['fullname']; - if ($pconfig['utype'] <> "system") { - $userent['groupname'] = $_POST['groupname']; - } - isset($_POST['utype']) ? $userent['scope'] = $_POST['utype'] : $userent['scope'] = "system"; - - if ($_POST['passwordfld1']) - $userent['password'] = crypt($_POST['passwordfld1']); - - if(isset($config['system']['ssh']['sshdkeyonly'])) { - $userent['authorizedkeys'] = base64_encode($_POST['authorizedkeys']); - } - - if (isset($id) && $a_user[$id]) - $a_user[$id] = $userent; - else - $a_user[] = $userent; - - write_config(); - $retval = system_password_configure(); - sync_webgui_passwords(); - - pfSenseHeader("system_usermanager.php"); - } + + unset($input_errors); + $pconfig = $_POST; + + /* input validation */ + if (isset($id) && ($a_user[$id])) { + $reqdfields = explode(" ", "username"); + $reqdfieldsn = explode(",", "Username"); + } else { + $reqdfields = explode(" ", "username password"); + $reqdfieldsn = explode(",", "Username,Password"); + } + + do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); + + if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['username'])) + $input_errors[] = "The username contains invalid characters."; + + if($_POST['username']==$config['system']['username']) { + $input_errors[] = "username can not match the administrator username!"; + } + + if (($_POST['password']) && ($_POST['password'] != $_POST['password2'])) + $input_errors[] = "The passwords do not match."; + + if (!$input_errors && !(isset($id) && $a_user[$id])) { + /* make sure there are no dupes */ + foreach ($a_user as $userent) { + if ($userent['name'] == $_POST['username']) { + $input_errors[] = "Another entry with the same username already exists."; + break; + } + } + } + + if(!isset($groupindex[$_POST['groupname']])) { + $input_errors[] = "group does not exist, please define the group before assigning users."; + } + + if (!$input_errors) { + + if (isset($id) && $a_user[$id]) + $userent = $a_user[$id]; + + $userent['name'] = $_POST['username']; + $userent['fullname'] = $_POST['fullname']; + $userent['groupname'] = $_POST['groupname']; + + if ($_POST['password']) + $userent['password'] = crypt($_POST['password']); + + if (isset($id) && $a_user[$id]) + $a_user[$id] = $userent; + else + $a_user[] = $userent; + + write_config(); + $retval = system_password_configure(); + $savemsg = get_std_save_message($retval); + + header("Location: system_usermanager.php"); + } } - include("head.inc"); -?> +include("head.inc"); -<body link="#000000" vlink="#000000" alink="#000000" onload="<?= $jsevents["body"]["onload"] ?>"> -<?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);?> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td class="tabnavtbl"> -<?php - $tab_array = array(); - $tab_array[] = array(gettext("Users"), true, "system_usermanager.php"); - $tab_array[] = array(gettext("Group"), false, "system_groupmanager.php"); - $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php"); - display_top_tabs($tab_array); ?> - </td> - </tr> - <tr> - <td class="tabcont"> +<?php include("fbegin.inc"); ?> +<?php if ($input_errors) print_input_errors($input_errors); ?> +<?php if ($savemsg) print_info_box($savemsg); ?> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr><td class="tabnavtbl"> + <ul id="tabnav"> + <?php + $tab_array = array(); + $tab_array[] = array(gettext("Users"), true, "system_usermanager.php"); + $tab_array[] = array(gettext("Group"), false, "system_groupmanager.php"); + $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php"); + display_top_tabs($tab_array); + ?> + </ul> + </td></tr> +<tr> + <td class="tabcont"> <?php - if ($_GET['act'] == "new" || $_GET['act'] == "edit" || $input_errors) { - if ($_GET['act'] == "edit") { - if (isset($id) && $a_user[$id]) { - $pconfig['usernamefld'] = $a_user[$id]['name']; - $pconfig['fullname'] = $a_user[$id]['fullname']; - $pconfig['groupname'] = $a_user[$id]['groupname']; - $pconfig['utype'] = $a_user[$id]['scope']; - $pconfig['authorizedkeys'] = base64_decode($a_user[$id]['authorizedkeys']); - } - } else if ($_GET['act'] == "new") { - /* set this value cause the text field is read only - * and the user should not be able to mess with this - * setting. - */ - $pconfig['utype'] = "user"; +if($_GET['act']=="new" || $_GET['act']=="edit" || $input_errors){ + if($_GET['act']=="edit"){ + if (isset($id) && $a_user[$id]) { + $pconfig['username'] = $a_user[$id]['name']; + $pconfig['fullname'] = $a_user[$id]['fullname']; + $pconfig['groupname'] = $a_group[$id]['groupname']; } + } ?> - <form action="system_usermanager.php" method="post" name="iform" id="iform"> - <div id="inputerrors"></div> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td width="22%" valign="top" class="vncellreq"><?=gettext("Username");?></td> - <td width="78%" class="vtable"> - <input name="usernamefld" type="text" class="formfld user" id="usernamefld" size="20" value="<?=htmlspecialchars($pconfig['usernamefld']);?>" <?php if ($pconfig['utype'] == "system") { echo "readonly=\"readonly\" "; }?>/> - <input name="oldusername" type="hidden" id="oldusername" value="<?=htmlspecialchars($pconfig['usernamefld']);?>" /> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncellreq" rowspan="2"><?=gettext("Password");?></td> - <td width="78%" class="vtable"> - <input name="passwordfld1" type="password" class="formfld pwd" id="passwordfld1" size="20" value="" /> - </td> - </tr> - <tr> - <td width="78%" class="vtable"> - <input name="passwordfld2" type="password" class="formfld pwd" id="passwordfld2" size="20" value="" /> <?= gettext("(confirmation)"); ?> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Full name");?></td> - <td width="78%" class="vtable"> - <input name="fullname" type="text" class="formfld unknown" id="fullname" size="20" value="<?=htmlspecialchars($pconfig['fullname']);?>" <?php if ($pconfig['utype'] == "system") { echo "readonly=\"readonly\" "; }?>/> - <br /> - <?=gettext("User's full name, for your own information only");?> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("User type");?></td> - <td width="78%" class="vtable"> - <input name="utype" type="text" class="formfld unknown" id="utype" size="20" value="<?=htmlspecialchars($pconfig['utype']);?>" readonly="readonly" /> - <br /> - <?=gettext("Indicates whether this is a system (aka non-deletable) user or a user created by a particular user.");?> - </td> - </tr> - <?php if (isSystemAdmin($HTTP_SERVER_VARS['AUTH_USER'])): ?> - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("User Privileges");?></td> - <td width="78%" class="vtable"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td width="5%" class="listhdrr"><?=gettext("ID");?></td> - <td width="30%" class="listhdrr"><?=gettext("Name");?></td> - <td width="40%" class="listhdrr"><?=gettext("Description");?></td> - <td width="5%" class="list"></td> + <form action="system_usermanager.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td width="22%" valign="top" class="vncellreq">Username</td> + <td width="78%" class="vtable"> + <input name="username" type="text" class="formfld" id="username" size="20" value="<?=htmlspecialchars($pconfig['username']);?>"> + </td> </tr> - - <?php if(is_array($t_privs)): ?> - <?php $i = 0; foreach ($t_privs as $priv): ?> - <?php if($priv['id'] <> ""): ?> - <tr> - <td class="listlr" <?php if($a_user[$id]['scope'] == "user") echo "ondblclick=\"document.location='system_usermanager_edit.php?id={$i}&userid={$id}&useract={$_GET['act']}';\""; ?>> - <?=htmlspecialchars($priv['id']);?> - </td> - <td class="listlr" <?php if($a_user[$id]['scope'] == "user") echo "ondblclick=\"document.location='system_usermanager_edit.php?id={$i}&userid={$id}&useract={$_GET['act']}';\""; ?>> - <?=htmlspecialchars($priv['name']);?> - </td> - <td class="listbg" <?php if($a_user[$id]['scope'] == "user") echo "ondblclick=\"document.location='system_usermanager_edit?id={$i}&userid={$id}&useract={$_GET['act']}';\""; ?>> - <font color="#FFFFFF"><?=htmlspecialchars($priv['descr']);?> </font> - </td> - <td valign="middle" nowrap class="list"> - <?php if($a_user[$id]['scope'] == "user"): ?> - <table border="0" cellspacing="0" cellpadding="1"> - <tr> - <td valign="middle"><a href="system_usermanager_edit.php?id=<?=$i;?>&userid=<?= $id ?>&useract=<?= $_GET['act'] ?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="" /></a></td> - <td valign="middle"><a href="system_usermanager.php?act=del&privid=<?=$i;?>&what=priv&id=<?= $id ?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="" /></a></td> - </tr> - </table> - <?php endif; ?> - </td> + <tr> + <td width="22%" valign="top" class="vncellreq">Password</td> + <td width="78%" class="vtable"> + <input name="password" type="password" class="formfld" id="password" size="20" value=""> <br> + <input name="password2" type="password" class="formfld" id="password2" size="20" value=""> + (confirmation) </td> </tr> - <?php endif; ?> - <?php $i++; endforeach; ?> - <?php endif; ?> - - <?php if($a_user[$id]['scope'] == "user"): ?> - <tr> - <td class="list" colspan="3"></td> - <td class="list"> - <table border="0" cellspacing="0" cellpadding="1"> - <tr> - <td valign="middle"><a href="system_usermanager_edit.php?userid=<?= $id ?>&useract=<?= $_GET['act'] ?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="" /></a></td> - </tr> - </table> + <tr> + <td width="22%" valign="top" class="vncell">Full name</td> + <td width="78%" class="vtable"> + <input name="fullname" type="text" class="formfld" id="fullname" size="20" value="<?=htmlspecialchars($pconfig['fullname']);?>"> + <br> + User's full name, for your own information only</td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell">Group Name</td> + <td width="78%" class="vtable"> + <select name="groupname" class="formfld" id="groupname"> + <?php foreach ($config['system']['group'] as $group): ?> + <option value="<?=$group['name'];?>" <?php if ($group['name'] == $pconfig['groupname']) echo "selected"; ?>> + <?=htmlspecialchars($group['name']);?> + </option> + <?php endforeach; ?> + </select> + <br> + The admin group to which this user is assigned.</td> + </tr> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input name="save" type="submit" class="formbtn" value="Save"> + <?php if (isset($id) && $a_user[$id]): ?> + <input name="id" type="hidden" value="<?=$id;?>"> + <?php endif; ?> </td> </tr> - <?php endif; ?> </table> - </td> - </tr> - <?php endif; ?> - <?php if (isset($config['system']['ssh']['sshdkeyonly'])): ?> - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Authorized keys");?></td> - <td width="78%" class="vtable"> - <textarea name="authorizedkeys" cols="65" rows="7" id="authorizedkeys" class="formfld_cert" wrap="off"><?=htmlspecialchars($pconfig['authorizedkeys']);?></textarea> - <br /> - <?=gettext("Paste an authorized keys file here.");?> - </td> - </tr> - <?php endif; ?> - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Group Name");?></td> - <td width="78%" class="vtable"> - <select name="groupname" class="formselect" id="groupname" <?php if ($pconfig['utype'] == "system") { echo "disabled=\"disabled\" "; } ?>> - <?php foreach ($config['system']['group'] as $group): ?> - <option value="<?=$group['name'];?>" <?php if ($group['name'] == $pconfig['groupname']) { echo "selected"; } ?>> - <?=htmlspecialchars($group['name']);?> - </option> - <?php endforeach;?> - </select> - <br /> - <?=gettext("The admin group to which this user is assigned.");?> - </td> - </tr> - <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <input id="submit" name="save" type="submit" class="formbtn" value="Save" /> - <?php if (isset($id) && $a_user[$id]): ?> - <input name="id" type="hidden" value="<?=$id;?>" /> - <?php endif;?> - </td> - </tr> - </table> - </form> + </form> <?php - } else { +} else { ?> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td width="35%" class="listhdrr">Username</td> - <td width="20%" class="listhdrr">Full name</td> - <td width="20%" class="listhdrr">Group</td> - <td width="10%" class="list"></td> - </tr> -<?php - $i = 0; - foreach($a_user as $userent): -?> - <tr ondblclick="document.location='system_usermanager.php?act=edit&id=<?=$i;?>'"> - <td class="listlr"> - <table border="0" cellpadding="0" cellspacing="0"> - <tr> - <td align="left" valign="middle"> - <?php if($userent['scope'] == "user"): ?> - <img src="/themes/<?=$g['theme'];?>/images/icons/icon_system-user.png" alt="User" title="User" border="0" height="20" width="20" /> - <?php else: ?> - <img src="/themes/<?=$g['theme'];?>/images/icons/icon_system-user-grey.png" alt="User" title="User" border="0" height="20" width="20" /> - <?php endif; ?> - - </td> - <td align="left" valign="middle"> - <?=htmlspecialchars($userent['name']);?> - </td> - </tr> - </table> - </td> - <td class="listr"><?=htmlspecialchars($userent['fullname']);?> </td> - <td class="listbg"> - <font color="white"><?=htmlspecialchars($userent['groupname']);?></font> - </td> - <td valign="middle" nowrap class="list"> - <a href="system_usermanager.php?act=edit&id=<?=$i;?>"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="edit user" alt="edit user" width="17" height="17" border="0" /> - </a> - <?php if($userent['scope'] == "user"): ?> - - <a href="system_usermanager.php?act=del&what=user&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this User?");?>')"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="delete user" alt="delete user" width="17" height="17" border="0" /> - </a> - <?php endif; ?> - </td> - </tr> -<?php - $i++; - endforeach; -?> - <tr> - <td class="list" colspan="3"></td> - <td class="list"> - <a href="system_usermanager.php?act=new"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add user" alt="add user" width="17" height="17" border="0" /> - </a> - </td> - </tr> - <tr> - <td colspan="3"> - <p> - <?=gettext("Additional webConfigurator users can be added here. User permissions are determined by the admin group they are a member of.");?> - </p> - <p> - <?=gettext("An user icon that appears grey indicates that it is a system user and thus it's only possible to modified a subset of the regular user data. Additionally such an user can't be deleted.");?> - </p> - </td> - </tr> - </table> -<?php - } -?> - </td> + <td width="35%" class="listhdrr">Username</td> + <td width="20%" class="listhdrr">Full name</td> + <td width="20%" class="listhdrr">Group</td> + <td width="10%" class="list"></td> + </tr> + <?php $i = 0; foreach($a_user as $userent): ?> + <tr> + <td class="listlr"> + <?=htmlspecialchars($userent['name']); ?> + </td> + <td class="listr"> + <?=htmlspecialchars($userent['fullname']);?> + </td> + <td class="listbg"> + <?=htmlspecialchars($userent['groupname']); ?> + </td> + <td valign="middle" nowrap class="list"> <a href="system_usermanager.php?act=edit&id=<?=$i; ?>"><img src="e.gif" title="edit user" width="17" height="17" border="0"></a> + <a href="system_usermanager.php?act=del&id=<?=$i; ?>" onclick="return confirm('Do you really want to delete this User?')"><img src="x.gif" title="delete user" width="17" height="17" border="0"></a></td> + </tr> + <?php $i++; endforeach; ?> + <tr> + <td class="list" colspan="3"></td> + <td class="list"> <a href="system_usermanager.php?act=new"><img src="plus.gif" title="add user" width="17" height="17" border="0"></a></td> + </tr> + <tr> + <td colspan="3"> + Additional webGUI users can be added here. User permissions are determined by the admin group they are a member of. + </td> + </tr> + </table> +<?php } ?> + + </td> </tr> -</table> -<?php + </table> +<?php } else { // end of admin user code, start of normal user code - if (isset($_POST['save'])) { - unset($input_errors); - - /* input validation */ - $reqdfields = explode(" ", "passwordfld1"); - $reqdfieldsn = explode(",", "Password"); - - do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); - - if ($_POST['passwordfld1'] != $_POST['passwordfld2']) - $input_errors[] = "The passwords do not match."; - - if (!$input_errors) { - // all values are okay --> saving changes - $config['system']['user'][$userindex[$HTTP_SERVER_VARS['AUTH_USER']]]['password'] = crypt(trim($_POST['passwordfld1'])); - - write_config(); - - sync_webgui_passwords(); - - $retval = system_password_configure(); - $savemsg = get_std_save_message($retval); - $savemsg = "Password successfully changed<br />"; - } - } -?> - -<?php - include("head.inc"); - //echo $pfSenseHead->getHTML(); -?> -<?php include("fbegin.inc");?> -<?php if ($input_errors) print_input_errors($input_errors);?> -<?php if ($savemsg) print_info_box($savemsg);?> - <body link="#000000" vlink="#000000" alink="#000000" onload="<?= $jsevents["body"]["onload"] ?>"> - <form action="system_usermanager.php" method="post" name="iform" id="iform"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> - <tr> - <td colspan="2" valign="top" class="listtopic"><?=$HTTP_SERVER_VARS['AUTH_USER']?>'s Password</td> - </tr> - <tr> - <td width="22%" valign="top" class="vncell" rowspan="2">Password</td> - <td width="78%" class="vtable"> - <input name="passwordfld1" type="password" class="formfld pwd" id="passwordfld1" size="20" /> - </td> - </tr> - <tr> - <td width="78%" class="vtable"> - <input name="passwordfld2" type="password" class="formfld pwd" id="passwordfld2" size="20" /> - <?=gettext("(confirmation)");?> - <br /> - <span class="vexpl"><?=gettext("Select a new password");?></span> - </td> - </tr> - <tr> - <td width="22%" valign="top"> </td> - <td width="78%"> - <input name="save" type="submit" class="formbtn" value="<?=gettext("Save");?>" /> - </td> - </tr> - </table> - </form> -<?php -} // end of normal user code + if (isset($_POST['save'])) { + + unset($input_errors); + + /* input validation */ + $reqdfields = explode(" ", "password"); + $reqdfieldsn = explode(",", "Password"); + + do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); + + if ($_POST['password'] != $_POST['password2']) + $input_errors[] = "The passwords do not match."; + + if (!$input_errors) { + //all values are okay --> saving changes + $config['system']['user'][$userindex[$_SERVER['REMOTE_USER']]]['password']=crypt(trim($_POST['password'])); + + write_config(); + $retval = system_password_configure(); + $savemsg = get_std_save_message($retval); + $savemsg = "Password successfully changed<br>"; + } + } + + ?> - -<?php include("fend.inc");?> -</body> -</html> +<?php include("fbegin.inc"); ?> +<?php if ($input_errors) print_input_errors($input_errors); ?> +<?php if ($savemsg) print_info_box($savemsg); ?> + <form action="system_usermanager.php" method="post" name="iform" id="iform"> + <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <tr> + <td colspan="2" valign="top" class="listtopic"><?=$_SERVER['REMOTE_USER']?>'s Password</td> + </tr> + <tr> + <td width="22%" valign="top" class="vncell">Password</td> + <td width="78%" class="vtable"> <input name="password" type="password" class="formfld" id="password" size="20"> + <br> <input name="password2" type="password" class="formfld" id="password2" size="20"> + (confirmation) <br> <span class="vexpl">Select a new password</span></td> + </tr> + <tr> + <td width="22%" valign="top"> </td> + <td width="78%"> + <input name="save" type="submit" class="formbtn" value="Save"> + </td> + </tr> + </table> + </form> + +<?php +} // end of normal user code ?> +<?php include("fend.inc"); ?> diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php index eb5f089..b707461 100755 --- a/usr/local/www/system_usermanager_settings.php +++ b/usr/local/www/system_usermanager_settings.php @@ -31,7 +31,7 @@ require("guiconfig.inc"); $pconfig['session_timeout'] = &$config['system']['webgui']['session_timeout']; // Page title for main admin -$pgtitle = "System: User manager settings"; +$pgtitle = array("System","User manager settings"); if ($_POST) { unset($input_errors); @@ -68,7 +68,6 @@ include("head.inc"); <body link="#000000" vlink="#000000" alink="#000000" onload="<?= $jsevents["body"]["onload"] ?>"> <?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);?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php index 5bdfc11..8b5a0ef 100755 --- a/usr/local/www/vpn_ipsec.php +++ b/usr/local/www/vpn_ipsec.php @@ -82,7 +82,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "VPN: IPsec"; +$pgtitle = array("VPN","IPsec"); include("head.inc"); ?> @@ -90,7 +90,6 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="vpn_ipsec.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (file_exists($d_ipsecconfdirty_path)): ?><p> diff --git a/usr/local/www/vpn_ipsec_ca.php b/usr/local/www/vpn_ipsec_ca.php index 254cc23..17195ae 100755 --- a/usr/local/www/vpn_ipsec_ca.php +++ b/usr/local/www/vpn_ipsec_ca.php @@ -46,7 +46,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "VPN: IPsec: Certificate Authority"; +$pgtitle = array("VPN","IPsec","Certificate Authority"); include("head.inc"); ?> @@ -54,7 +54,6 @@ include("head.inc"); <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="vpn_ipsec.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (file_exists($d_ipsecconfdirty_path)): ?><p> diff --git a/usr/local/www/vpn_ipsec_ca_edit.php b/usr/local/www/vpn_ipsec_ca_edit.php index 124897a..73b55a6 100755 --- a/usr/local/www/vpn_ipsec_ca_edit.php +++ b/usr/local/www/vpn_ipsec_ca_edit.php @@ -92,14 +92,13 @@ if ($_POST) { } } -$pgtitle = "VPN: IPsec: Certificate Authority: Edit"; +$pgtitle = array("VPN","IPsec","Certificate Authority","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="vpn_ipsec_ca_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/vpn_ipsec_ca_edit_create_cert.php b/usr/local/www/vpn_ipsec_ca_edit_create_cert.php index 74fa1d5..9f428b5 100755 --- a/usr/local/www/vpn_ipsec_ca_edit_create_cert.php +++ b/usr/local/www/vpn_ipsec_ca_edit_create_cert.php @@ -44,7 +44,7 @@ preg_match('/\nO\=(.*)\n/', $openssl, $orginizationnameA); preg_match('/\nOU\=(.*)\n/', $openssl, $orginizationdepartmentA); preg_match('/\nCN\=(.*)\n/', $openssl, $commonnameA); -$pgtitle = 'IPSEC: Certificate Authority: Create CertificatesS'; +$pgtitle = array("IPSEC","Certificate Authority","Create Certificates"); $countrycode = $countrycodeA[1]; $stateorprovince = $stateorprovinceA[1]; @@ -147,7 +147,6 @@ include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <? include('fbegin.inc'); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="vpn_ipsec_ca_edit_create_cert.php" method="post" name="iform" id="iform"> <? if($input_errors) diff --git a/usr/local/www/vpn_ipsec_edit.php b/usr/local/www/vpn_ipsec_edit.php index 4e2b8b2..7e4331d 100755 --- a/usr/local/www/vpn_ipsec_edit.php +++ b/usr/local/www/vpn_ipsec_edit.php @@ -291,14 +291,13 @@ if ($_POST) { } } -$pgtitle = "VPN: IPsec: Edit tunnel"; +$pgtitle = array("VPN","IPsec","Edit tunnel"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <script language="JavaScript"> <!-- function typesel_change() { diff --git a/usr/local/www/vpn_ipsec_keys.php b/usr/local/www/vpn_ipsec_keys.php index 1d1add5..49112ff 100755 --- a/usr/local/www/vpn_ipsec_keys.php +++ b/usr/local/www/vpn_ipsec_keys.php @@ -46,14 +46,14 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "VPN: IPsec: Keys"; +$pgtitle = array("VPN","IPsec","Keys"); + include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="vpn_ipsec.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (file_exists($d_ipsecconfdirty_path)): ?><p> diff --git a/usr/local/www/vpn_ipsec_keys_edit.php b/usr/local/www/vpn_ipsec_keys_edit.php index dc3d5f5..f612bcc 100755 --- a/usr/local/www/vpn_ipsec_keys_edit.php +++ b/usr/local/www/vpn_ipsec_keys_edit.php @@ -90,14 +90,13 @@ if ($_POST) { } } -$pgtitle = "VPN: IPsec: Edit pre-shared key"; +$pgtitle = array("VPN","IPsec","Edit pre-shared key"); 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="vpn_ipsec_keys_edit.php" method="post" name="iform" id="iform"> <table width="100%" border="0" cellpadding="6" cellspacing="0"> diff --git a/usr/local/www/vpn_ipsec_mobile.php b/usr/local/www/vpn_ipsec_mobile.php index 71d94fb..6a105e3 100755 --- a/usr/local/www/vpn_ipsec_mobile.php +++ b/usr/local/www/vpn_ipsec_mobile.php @@ -162,13 +162,12 @@ if ($_POST) { } } -$pgtitle = "VPN: IPsec: Mobile"; +$pgtitle = array("VPN","IPsec","Mobile"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <script language="JavaScript"> <!-- function methodsel_change() { diff --git a/usr/local/www/vpn_openvpn.php b/usr/local/www/vpn_openvpn.php index d6d3684..896a4cc 100755 --- a/usr/local/www/vpn_openvpn.php +++ b/usr/local/www/vpn_openvpn.php @@ -142,14 +142,13 @@ if ($_POST) { /* Simply take a copy of the array */ $pconfig = $config['ovpn']['server']; -$pgtitle = "VPN: OpenVPN"; +$pgtitle = array("VPN","OpenVPN"); include("head.inc"); ?> <?php include("fbegin.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="vpn_openvpn.php" method="post" enctype="multipart/form-data" name="iform" id="iform"> diff --git a/usr/local/www/vpn_openvpn_ccd.php b/usr/local/www/vpn_openvpn_ccd.php index c20c580..d8c236d 100755 --- a/usr/local/www/vpn_openvpn_ccd.php +++ b/usr/local/www/vpn_openvpn_ccd.php @@ -93,13 +93,13 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "VPN: OpenVPN"; +$pgtitle = array("VPN","OpenVPN"); include("head.inc"); ?> <?php include("fbegin.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<p class="pgtitle"><?=$pgtitle?></p> + <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if (file_exists($d_sysrebootreqd_path) && !file_exists($d_ovpnccddirty_path)) print_info_box(get_std_save_message(0)); ?> diff --git a/usr/local/www/vpn_openvpn_ccd_edit.php b/usr/local/www/vpn_openvpn_ccd_edit.php index 8ec53e5..4affb4a 100755 --- a/usr/local/www/vpn_openvpn_ccd_edit.php +++ b/usr/local/www/vpn_openvpn_ccd_edit.php @@ -213,7 +213,6 @@ 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);?> <script language="JavaScript"> function enable_change(enable_over) { diff --git a/usr/local/www/vpn_openvpn_cli.php b/usr/local/www/vpn_openvpn_cli.php index 2b28ec2..285518c 100755 --- a/usr/local/www/vpn_openvpn_cli.php +++ b/usr/local/www/vpn_openvpn_cli.php @@ -81,13 +81,12 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "VPN: OpenVPN"; +$pgtitle = array("VPN","OpenVPN"); include("head.inc"); ?> <?php include("fbegin.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if (file_exists($d_sysrebootreqd_path) && !file_exists($d_ovpnclidirty_path)) print_info_box(get_std_save_message(0)); ?> <form action="vpn_openvpn_cli.php" method="post" enctype="multipart/form-data" name="iform" id="iform"> diff --git a/usr/local/www/vpn_openvpn_cli_edit.php b/usr/local/www/vpn_openvpn_cli_edit.php index 3e19a32..be8fd9f 100755 --- a/usr/local/www/vpn_openvpn_cli_edit.php +++ b/usr/local/www/vpn_openvpn_cli_edit.php @@ -283,13 +283,12 @@ if ($_POST) { } } -$pgtitle = "VPN: OpenVPN: Edit client"; +$pgtitle = array("VPN","OpenVPN","Edit client"); 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);?> <script language="JavaScript"> function enable_change(enable_over) { diff --git a/usr/local/www/vpn_openvpn_create_certs.php b/usr/local/www/vpn_openvpn_create_certs.php index 62f9ba1..b665aa8 100755 --- a/usr/local/www/vpn_openvpn_create_certs.php +++ b/usr/local/www/vpn_openvpn_create_certs.php @@ -149,7 +149,8 @@ if ($_POST) { fwrite($fd, "authorityKeyIdentifier=keyid:always,issuer:always\n"); fclose($fd); -$pgtitle = "VPN: OpenVPN: Create Certs"; +$pgtitle = array("VPN","OpenVPN","Create Certs"); + include("head.inc"); ?> @@ -176,7 +177,6 @@ function f(ta_id){ <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<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); ?> diff --git a/usr/local/www/vpn_openvpn_crl.php b/usr/local/www/vpn_openvpn_crl.php index e8f6187..6314607 100755 --- a/usr/local/www/vpn_openvpn_crl.php +++ b/usr/local/www/vpn_openvpn_crl.php @@ -74,13 +74,12 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "VPN: OpenVPN"; +$pgtitle = array("VPN","OpenVPN"); include("head.inc"); ?> <?php include("fbegin.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<p class="pgtitle"><?=$pgtitle?></p> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if (file_exists($d_sysrebootreqd_path) && !file_exists($d_ovpncrldirty_path)) print_info_box(get_std_save_message(0)); ?> diff --git a/usr/local/www/vpn_openvpn_crl_edit.php b/usr/local/www/vpn_openvpn_crl_edit.php index 9c5c484..e982e11 100755 --- a/usr/local/www/vpn_openvpn_crl_edit.php +++ b/usr/local/www/vpn_openvpn_crl_edit.php @@ -150,13 +150,12 @@ if ($_POST) { } } -$pgtitle = "VPN: OpenVPN: Edit CRL"; +$pgtitle = array("VPN","OpenVPN","Edit CRL"); 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);?> <script language="JavaScript"> function enable_change(enable_over) { diff --git a/usr/local/www/vpn_openvpn_srv.php b/usr/local/www/vpn_openvpn_srv.php index 2dc2457..2d194af 100755 --- a/usr/local/www/vpn_openvpn_srv.php +++ b/usr/local/www/vpn_openvpn_srv.php @@ -82,13 +82,13 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "VPN: OpenVPN"; +$pgtitle = array("VPN","OpenVPN"); include("head.inc"); ?> <?php include("fbegin.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<p class="pgtitle"><?=$pgtitle?></p> + <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if (file_exists($d_sysrebootreqd_path) && !file_exists($d_ovpnsrvdirty_path)) print_info_box(get_std_save_message(0)); ?> diff --git a/usr/local/www/vpn_openvpn_srv_edit.php b/usr/local/www/vpn_openvpn_srv_edit.php index cdbceef..3fa8715 100755 --- a/usr/local/www/vpn_openvpn_srv_edit.php +++ b/usr/local/www/vpn_openvpn_srv_edit.php @@ -511,13 +511,12 @@ if ($_POST) { } } -$pgtitle = "VPN: OpenVPN: Edit server"; +$pgtitle = array("VPN","OpenVPN","Edit server"); 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);?> <script language="JavaScript"> function enable_change(enable_over) { diff --git a/usr/local/www/vpn_pppoe.php b/usr/local/www/vpn_pppoe.php index 24ba1e5..4e737fb 100755 --- a/usr/local/www/vpn_pppoe.php +++ b/usr/local/www/vpn_pppoe.php @@ -173,14 +173,13 @@ if ($_POST) { } } -$pgtitle = "VPN: PPPoE"; +$pgtitle = array("VPN","PPPoE"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <script language="JavaScript"> <!-- function get_radio_value(obj) diff --git a/usr/local/www/vpn_pppoe_users.php b/usr/local/www/vpn_pppoe_users.php index a8d6df6..8373c75 100755 --- a/usr/local/www/vpn_pppoe_users.php +++ b/usr/local/www/vpn_pppoe_users.php @@ -65,14 +65,13 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "VPN: PPPoE: Users"; +$pgtitle = array("VPN","PPPoE","Users"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="vpn_pppoe_users.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (isset($config['pppoe']['radius']['enable'])) diff --git a/usr/local/www/vpn_pppoe_users_edit.php b/usr/local/www/vpn_pppoe_users_edit.php index 32c53a6..5316e4d 100755 --- a/usr/local/www/vpn_pppoe_users_edit.php +++ b/usr/local/www/vpn_pppoe_users_edit.php @@ -111,13 +111,12 @@ if ($_POST) { } } -$pgtitle = "VPN: PPPoE: User: Edit"; +$pgtitle = array("VPN","PPPoE","User","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="vpn_pppoe_users_edit.php" method="post" name="iform" id="iform"> <div id="mainarea"> diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php index 742e4a0..325a15f 100755 --- a/usr/local/www/vpn_pptp.php +++ b/usr/local/www/vpn_pptp.php @@ -191,14 +191,13 @@ if ($_POST) { } } -$pgtitle = "VPN PPTP"; +$pgtitle = array("VPN,"VPN PPTP"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <script language="JavaScript"> <!-- function get_radio_value(obj) diff --git a/usr/local/www/vpn_pptp_users.php b/usr/local/www/vpn_pptp_users.php index 628652c..d6127ca 100755 --- a/usr/local/www/vpn_pptp_users.php +++ b/usr/local/www/vpn_pptp_users.php @@ -63,14 +63,13 @@ if ($_GET['act'] == "del") { } } -$pgtitle = "VPN: PPTP: Users"; +$pgtitle = array("VPN","VPN PPTP","Users"); include("head.inc"); ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle"><?=$pgtitle?></p> <form action="vpn_pptp_users.php" method="post"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (isset($config['pptpd']['radius']['enable'])) diff --git a/usr/local/www/vpn_pptp_users_edit.php b/usr/local/www/vpn_pptp_users_edit.php index 0d831b7..bafb704 100755 --- a/usr/local/www/vpn_pptp_users_edit.php +++ b/usr/local/www/vpn_pptp_users_edit.php @@ -108,13 +108,12 @@ if ($_POST) { } } -$pgtitle = "VPN: PPTP: User: Edit"; +$pgtitle = array("VPN","VPN PPTP","User","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="vpn_pptp_users_edit.php" method="post" name="iform" id="iform"> <div id="mainarea"> diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php index a0c324e..2290099 100755 --- a/usr/local/www/wizard.php +++ b/usr/local/www/wizard.php @@ -146,7 +146,7 @@ if($pkg['step'][$stepid]['stepbeforeformdisplay'] <> "") { eval($pkg['step'][$stepid]['stepbeforeformdisplay']); } -$pgtitle = $title; +$pgtitle = array($title); include("head.inc"); ?> |
