From d88c6a9fdfb0a872dadfb90a8f93ba16714240b8 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Fri, 16 Nov 2007 00:48:53 +0000 Subject: Switch over to array style page titles. Obtained-from: m0n0wall --- usr/local/www/carp_status.php | 3 +- usr/local/www/diag_arp.php | 3 +- usr/local/www/diag_backup.php | 4 +- usr/local/www/diag_confbak.php | 3 +- usr/local/www/diag_defaults.php | 3 +- usr/local/www/diag_dhcp_leases.php | 3 +- usr/local/www/diag_dump_states.php | 3 +- usr/local/www/diag_ipsec.php | 3 +- usr/local/www/diag_ipsec_sad.php | 3 +- usr/local/www/diag_ipsec_spd.php | 3 +- usr/local/www/diag_logs.php | 3 +- usr/local/www/diag_logs_auth.php | 3 +- usr/local/www/diag_logs_dhcp.php | 3 +- usr/local/www/diag_logs_filter.php | 3 +- usr/local/www/diag_logs_filter_dynamic.php | 2 +- usr/local/www/diag_logs_ipsec.php | 3 +- usr/local/www/diag_logs_ntpd.php | 3 +- usr/local/www/diag_logs_openvpn.php | 3 +- usr/local/www/diag_logs_settings.php | 3 +- usr/local/www/diag_logs_slbd.php | 3 +- usr/local/www/diag_logs_vpn.php | 3 +- usr/local/www/diag_packet_capture.php | 3 - usr/local/www/diag_ping.php | 2 - usr/local/www/diag_pkglogs.php | 3 +- usr/local/www/diag_resetstate.php | 3 +- usr/local/www/diag_routes.php | 3 +- usr/local/www/diag_traceroute.php | 3 +- usr/local/www/edit.php | 3 +- usr/local/www/exec.php | 3 +- usr/local/www/firewall_aliases.php | 3 +- usr/local/www/firewall_aliases_edit.php | 4 +- usr/local/www/firewall_aliases_import.php | 3 +- usr/local/www/firewall_nat.php | 3 +- usr/local/www/firewall_nat_1to1.php | 3 +- usr/local/www/firewall_nat_1to1_edit.php | 3 +- usr/local/www/firewall_nat_edit.php | 3 +- usr/local/www/firewall_nat_out.php | 3 +- usr/local/www/firewall_nat_out_edit.php | 3 +- usr/local/www/firewall_nat_server.php | 3 +- usr/local/www/firewall_nat_server_edit.php | 3 +- usr/local/www/firewall_rules.php | 1 - usr/local/www/firewall_rules_edit.php | 3 +- usr/local/www/firewall_schedule.php | 3 +- usr/local/www/firewall_schedule_edit.php | 5 +- usr/local/www/firewall_shaper.php | 3 +- usr/local/www/firewall_shaper_edit.php | 3 +- usr/local/www/firewall_shaper_queues.php | 3 +- usr/local/www/firewall_shaper_queues_edit.php | 3 +- usr/local/www/firewall_system_tunables.php | 3 +- usr/local/www/firewall_system_tunables_edit.php | 3 +- usr/local/www/firewall_virtual_ip.php | 3 +- usr/local/www/firewall_virtual_ip_edit.php | 3 +- usr/local/www/halt.php | 3 +- usr/local/www/index.php | 2 +- usr/local/www/interfaces.php | 3 +- usr/local/www/interfaces_assign.php | 3 - usr/local/www/interfaces_lan.php | 3 +- usr/local/www/interfaces_opt.php | 3 +- usr/local/www/interfaces_vlan.php | 3 +- usr/local/www/interfaces_vlan_edit.php | 3 +- usr/local/www/interfaces_wan.php | 3 +- usr/local/www/interfaces_wlan_scan.php | 3 +- usr/local/www/load_balancer_pool.php | 3 +- usr/local/www/load_balancer_pool_edit.php | 3 +- usr/local/www/load_balancer_virtual_server.php | 3 +- .../www/load_balancer_virtual_server_edit.php | 3 +- usr/local/www/pkg.php | 3 +- usr/local/www/pkg_edit.php | 1 - usr/local/www/pkg_mgr.php | 3 +- usr/local/www/pkg_mgr_install.php | 3 +- usr/local/www/pkg_mgr_installed.php | 3 +- usr/local/www/reboot.php | 3 +- usr/local/www/restart_httpd.php | 4 +- usr/local/www/services_captiveportal.php | 3 +- .../www/services_captiveportal_filemanager.php | 3 +- usr/local/www/services_captiveportal_ip.php | 3 +- usr/local/www/services_captiveportal_ip_edit.php | 3 +- usr/local/www/services_captiveportal_mac.php | 3 +- usr/local/www/services_captiveportal_mac_edit.php | 3 +- usr/local/www/services_captiveportal_users.php | 3 +- .../www/services_captiveportal_users_edit.php | 3 +- usr/local/www/services_dhcp.php | 3 +- usr/local/www/services_dhcp_edit.php | 3 +- usr/local/www/services_dhcp_relay.php | 3 +- usr/local/www/services_dnsmasq.php | 3 +- .../www/services_dnsmasq_domainoverride_edit.php | 3 +- usr/local/www/services_dnsmasq_edit.php | 3 +- usr/local/www/services_dyndns.php | 3 +- usr/local/www/services_proxyarp.php | 3 +- usr/local/www/services_proxyarp_edit.php | 3 +- usr/local/www/services_snmp.php | 3 +- usr/local/www/services_usermanager.php | 3 +- usr/local/www/services_wol.php | 3 +- usr/local/www/services_wol_edit.php | 3 +- usr/local/www/status.php | 3 +- usr/local/www/status_captiveportal.php | 3 +- usr/local/www/status_filter_reload.php | 4 +- usr/local/www/status_graph.php | 3 +- usr/local/www/status_graph_cpu.php | 1 - usr/local/www/status_interfaces.php | 3 +- usr/local/www/status_queues.php | 3 +- usr/local/www/status_rrd_graph.php | 2 +- usr/local/www/status_rrd_graph_settings.php | 3 +- usr/local/www/status_services.php | 3 +- usr/local/www/status_slbd_pool.php | 3 +- usr/local/www/status_slbd_vs.php | 3 +- usr/local/www/status_upnp.php | 3 +- usr/local/www/status_wireless.php | 3 +- usr/local/www/system.php | 3 +- usr/local/www/system_advanced.php | 3 +- usr/local/www/system_advanced_create_certs.php | 3 +- usr/local/www/system_firmware.php | 3 +- usr/local/www/system_firmware_auto.php | 3 +- usr/local/www/system_firmware_check.php | 3 +- usr/local/www/system_firmware_settings.php | 3 +- usr/local/www/system_gateways.php | 3 +- usr/local/www/system_gateways_edit.php | 3 +- usr/local/www/system_groupmanager.php | 768 +++++++-------------- usr/local/www/system_routes.php | 3 +- usr/local/www/system_routes_edit.php | 3 +- usr/local/www/system_usermanager.php | 711 +++++++------------ usr/local/www/system_usermanager_settings.php | 3 +- usr/local/www/vpn_ipsec.php | 3 +- usr/local/www/vpn_ipsec_ca.php | 3 +- usr/local/www/vpn_ipsec_ca_edit.php | 3 +- usr/local/www/vpn_ipsec_ca_edit_create_cert.php | 3 +- usr/local/www/vpn_ipsec_edit.php | 3 +- usr/local/www/vpn_ipsec_keys.php | 4 +- usr/local/www/vpn_ipsec_keys_edit.php | 3 +- usr/local/www/vpn_ipsec_mobile.php | 3 +- usr/local/www/vpn_openvpn.php | 3 +- usr/local/www/vpn_openvpn_ccd.php | 4 +- usr/local/www/vpn_openvpn_ccd_edit.php | 1 - usr/local/www/vpn_openvpn_cli.php | 3 +- usr/local/www/vpn_openvpn_cli_edit.php | 3 +- usr/local/www/vpn_openvpn_create_certs.php | 4 +- usr/local/www/vpn_openvpn_crl.php | 3 +- usr/local/www/vpn_openvpn_crl_edit.php | 3 +- usr/local/www/vpn_openvpn_srv.php | 4 +- usr/local/www/vpn_openvpn_srv_edit.php | 3 +- usr/local/www/vpn_pppoe.php | 3 +- usr/local/www/vpn_pppoe_users.php | 3 +- usr/local/www/vpn_pppoe_users_edit.php | 3 +- usr/local/www/vpn_pptp.php | 3 +- usr/local/www/vpn_pptp_users.php | 3 +- usr/local/www/vpn_pptp_users_edit.php | 3 +- usr/local/www/wizard.php | 2 +- 147 files changed, 676 insertions(+), 1235 deletions(-) (limited to 'usr/local/www') 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"); ?> -

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"); ?> -

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"); ?> -

- 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"); ?> -

-

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"); -

-

-

   {$loadmsg}

"; ?> 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 { -

Note: this function is unsupported. Use it on your own risk!

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"); ?> -

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"; -

-
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"); ?> -

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"); ?> -

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"); ?> -

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"); ?> -

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"); -

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"); ?> -

Firewall: NAT: Outbound

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() { -

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"); ?> -

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"); ?> -

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 " 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"); -

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"); -

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; - -

-
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"); ?> -

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() { -

0)): ?> 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"); ?> -

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) { -

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"); ?> "> -

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"); "> -

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"); ?> -

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"); ?> -

-

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"); ?> -

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"); ?> -

-

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"); -

-

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"); ?> -

-

Are you sure you want to reboot the system?

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"); -

- Mounting file systems read/write... Done.
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) { //--> -

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"); ?> -

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"); ?> -

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"); ?> -

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"); ?> -

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"); ?> -

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"); ?> -

-

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() { -

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"); ?> -

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) { -

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) { -

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"); ?> -

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"); ?> -

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) { -

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"); ?> -

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() { -

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) { -

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"); ?> -

-

-

-
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"); ?> -

'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"; ?> -

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"); ?> -

'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"); ?> -

'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"); -

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"); -

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"); ?> -

-

-

-

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"); ?> -

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"); -

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"); ?> -

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 "\n"; include("fbegin.inc"); @@ -135,7 +135,6 @@ include("head.inc"); ?> -

"") 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"); ?> -

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"); ?> -