diff options
140 files changed, 217 insertions, 24 deletions
diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index cb4a073..88e44a8 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -554,6 +554,7 @@ function build_area_list($showall) { } $pgtitle = array(gettext("Diagnostics"), htmlspecialchars(gettext("Backup & Restore")), htmlspecialchars(gettext("Backup & Restore"))); +$pglinks = array("", "@self", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php index 315f197..0ae3773 100644 --- a/src/usr/local/www/diag_confbak.php +++ b/src/usr/local/www/diag_confbak.php @@ -131,6 +131,7 @@ $confvers = get_backups(); unset($confvers['versions']); $pgtitle = array(gettext("Diagnostics"), htmlspecialchars(gettext("Backup & Restore")), gettext("Config History")); +$pglinks = array("", "diag_backup.php", "@self"); include("head.inc"); if ($savemsg) { diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php index 877bfe8..553b117 100644 --- a/src/usr/local/www/diag_dump_states.php +++ b/src/usr/local/www/diag_dump_states.php @@ -105,6 +105,7 @@ if (isset($_POST['filter']) && isset($_POST['killfilter'])) { } $pgtitle = array(gettext("Diagnostics"), gettext("States"), gettext("States")); +$pglinks = array("", "@self", "@self"); include("head.inc"); ?> diff --git a/src/usr/local/www/diag_dump_states_sources.php b/src/usr/local/www/diag_dump_states_sources.php index 1661db5..97d3b7d 100644 --- a/src/usr/local/www/diag_dump_states_sources.php +++ b/src/usr/local/www/diag_dump_states_sources.php @@ -83,6 +83,7 @@ if ($_POST['filter']) { $pgtitle = array(gettext("Diagnostics"), gettext("States"), gettext("Source Tracking")); +$pglinks = array("", "diag_dump_states.php", "@self"); include("head.inc"); $tab_array = array(); diff --git a/src/usr/local/www/diag_resetstate.php b/src/usr/local/www/diag_resetstate.php index c776d71..a7b4f4d 100644 --- a/src/usr/local/www/diag_resetstate.php +++ b/src/usr/local/www/diag_resetstate.php @@ -86,6 +86,7 @@ if ($_POST) { } $pgtitle = array(gettext("Diagnostics"), gettext("States"), gettext("Reset States")); +$pglinks = array("", "diag_dump_states.php", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/diag_smart.php b/src/usr/local/www/diag_smart.php index fffde5b..22f6062 100644 --- a/src/usr/local/www/diag_smart.php +++ b/src/usr/local/www/diag_smart.php @@ -66,6 +66,7 @@ require_once("guiconfig.inc"); $action = (isset($_POST['action']) ? $_POST['action'] : $_GET['action']); $pgtitle = array(gettext("Diagnostics"), gettext("S.M.A.R.T. Status")); +$pglinks = array("", "@self", "@self"); if ($action != 'config') { $pgtitle[] = htmlspecialchars(gettext('Information & Tests')); diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php index 9eb7264..1f5b57e 100644 --- a/src/usr/local/www/firewall_aliases.php +++ b/src/usr/local/www/firewall_aliases.php @@ -201,6 +201,7 @@ foreach ($tab_array as $dtab) { } $pgtitle = array(gettext("Firewall"), gettext("Aliases"), $bctab); +$pglinks = array("", "firewall_aliases.php", "@self"); $shortcut_section = "aliases"; include("head.inc"); diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index bad45a5..f62bea0 100644 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -67,8 +67,6 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); -$pgtitle = array(gettext("Firewall"), gettext("Aliases"), gettext("Edit")); - if (isset($_POST['referer'])) { $referer = $_POST['referer']; } else { @@ -94,8 +92,6 @@ if (!is_array($config['aliases']['alias'])) { } $a_aliases = &$config['aliases']['alias']; -$tab = $_REQUEST['tab']; - if ($_POST) { $origname = $_POST['origname']; } @@ -163,6 +159,21 @@ if (isset($id) && $a_aliases[$id]) { } } +$tab = $_REQUEST['tab']; + +if (empty($tab)) { + if (preg_match("/url/i", $pconfig['type'])) { + $tab = 'url'; + } else if ($pconfig['type'] == 'host') { + $tab = 'ip'; + } else { + $tab = $pconfig['type']; + } +} + +$pgtitle = array(gettext("Firewall"), gettext("Aliases"), gettext("Edit")); +$pglinks = array("", "firewall_aliases.php?tab=" . $tab, "@self"); + if ($_POST) { unset($input_errors); @@ -644,16 +655,6 @@ $types = array( 'urltable_ports' => gettext("URL Table (Ports)"), ); -if (empty($tab)) { - if (preg_match("/url/i", $pconfig['type'])) { - $tab = 'url'; - } else if ($pconfig['type'] == 'host') { - $tab = 'ip'; - } else { - $tab = $pconfig['type']; - } -} - if ($input_errors) { print_input_errors($input_errors); } diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php index 8799dbb..e5695cf 100644 --- a/src/usr/local/www/firewall_aliases_import.php +++ b/src/usr/local/www/firewall_aliases_import.php @@ -67,8 +67,6 @@ require_once("util.inc"); require_once("filter.inc"); require_once("shaper.inc"); -$pgtitle = array(gettext("Firewall"), gettext("Aliases"), gettext("Bulk import")); - $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_aliases.php'); // Add all Load balance names to reserved_keywords @@ -86,6 +84,9 @@ if (empty($tab)) { $tab = 'ip'; } +$pgtitle = array(gettext("Firewall"), gettext("Aliases"), gettext("Bulk import")); +$pglinks = array("", "firewall_aliases.php?tab=" . $tab, "@self"); + if (!is_array($config['aliases']['alias'])) { $config['aliases']['alias'] = array(); } diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php index ac2498f..a75b8f0 100644 --- a/src/usr/local/www/firewall_nat.php +++ b/src/usr/local/www/firewall_nat.php @@ -216,6 +216,7 @@ if (isset($_POST['del_x'])) { } $pgtitle = array(gettext("Firewall"), gettext("NAT"), gettext("Port Forward")); +$pglinks = array("", "@self", "@self"); include("head.inc"); if ($savemsg) { diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php index 93f8bb6..0588826 100644 --- a/src/usr/local/www/firewall_nat_1to1.php +++ b/src/usr/local/www/firewall_nat_1to1.php @@ -152,6 +152,7 @@ if (isset($_POST['del_x'])) { } $pgtitle = array(gettext("Firewall"), gettext("NAT"), gettext("1:1")); +$pglinks = array("", "firewall_nat.php", "@self"); include("head.inc"); if ($savemsg) { diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php index a091612..2fc3fd2 100644 --- a/src/usr/local/www/firewall_nat_1to1_edit.php +++ b/src/usr/local/www/firewall_nat_1to1_edit.php @@ -320,6 +320,7 @@ if ($_POST) { } $pgtitle = array(gettext("Firewall"), gettext("NAT"), gettext("1:1"), gettext("Edit")); +$pglinks = array("", "firewall_nat.php", "firewall_nat_1to1.php", "@self"); include("head.inc"); function build_srctype_list() { diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index 90b563a..1b1bd82 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -669,6 +669,7 @@ function dsttype_selected() { } $pgtitle = array(gettext("Firewall"), gettext("NAT"), gettext("Port Forward"), gettext("Edit")); +$pglinks = array("", "firewall_nat.php", "firewall_nat.php", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php index 0bbb7df..4fdbadc 100644 --- a/src/usr/local/www/firewall_nat_npt.php +++ b/src/usr/local/www/firewall_nat_npt.php @@ -152,6 +152,7 @@ if (isset($_POST['del_x'])) { } $pgtitle = array(gettext("Firewall"), gettext("NAT"), gettext("NPt")); +$pglinks = array("", "firewall_nat.php", "@self"); include("head.inc"); if ($savemsg) { diff --git a/src/usr/local/www/firewall_nat_npt_edit.php b/src/usr/local/www/firewall_nat_npt_edit.php index d991472..52fc20b 100644 --- a/src/usr/local/www/firewall_nat_npt_edit.php +++ b/src/usr/local/www/firewall_nat_npt_edit.php @@ -208,6 +208,7 @@ function build_if_list() { } $pgtitle = array(gettext("Firewall"), gettext("NAT"), gettext("NPt"), gettext("Edit")); +$pglinks = array("", "firewall_nat.php", "firewall_nat_npt.php", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index e310165..22143f0 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -236,6 +236,7 @@ if (isset($_POST['del_x'])) { } $pgtitle = array(gettext("Firewall"), gettext("NAT"), gettext("Outbound")); +$pglinks = array("", "firewall_nat.php", "@self"); include("head.inc"); if ($savemsg) { diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index 030ed7d..aa23717 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -408,6 +408,7 @@ if ($_POST) { } $pgtitle = array(gettext("Firewall"), gettext("NAT"), gettext("Outbound"), gettext("Edit")); +$pglinks = array("", "firewall_nat.php", "firewall_nat_out.php", "@self"); include("head.inc"); function build_target_list() { diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 9ad2329..dabfca5 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -71,7 +71,6 @@ require_once("shaper.inc"); $XmoveTitle = gettext("Move checked rules above this one. Shift+Click to move checked rules below."); $ShXmoveTitle = gettext("Move checked rules below this one. Release shift to move checked rules above."); -$pgtitle = array(gettext("Firewall"), gettext("Rules")); $shortcut_section = "firewall"; function get_pf_rules($rules, $tracker) { @@ -354,6 +353,7 @@ foreach ($tab_array as $dtab) { } $pgtitle = array(gettext("Firewall"), gettext("Rules"), $bctab); +$pglinks = array("", "firewall_rules.php", "@self"); $shortcut_section = "firewall"; include("head.inc"); diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 3656b21..6373b0d 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -1126,11 +1126,20 @@ function build_if_list() { } $pgtitle = array(gettext("Firewall"), gettext("Rules")); +$pglinks = array(""); if ($if == "FloatingRules" || isset($pconfig['floating'])) { + $pglinks[] = "firewall_rules.php?if=FloatingRules"; $pgtitle[] = gettext('Floating'); + $pglinks[] = "firewall_rules.php?if=FloatingRules"; +} elseif (!empty($if)) { + $pglinks = array("", "firewall_rules.php?if=" . $if); +} else { + $pglinks = array("", "firewall_rules.php"); } + $pgtitle[] = gettext("Edit"); +$pglinks[] = "@self"; $shortcut_section = "firewall"; $page_filename = "firewall_rules_edit.php"; diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php index ee9ab56..fa8708d 100644 --- a/src/usr/local/www/firewall_schedule_edit.php +++ b/src/usr/local/www/firewall_schedule_edit.php @@ -82,6 +82,7 @@ require_once("filter.inc"); require_once("shaper.inc"); $pgtitle = array(gettext("Firewall"), gettext("Schedules"), gettext("Edit")); +$pglinks = array("", "firewall_schedule.php", "@self"); $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_schedule.php'); diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php index d74e987..1e70c63 100644 --- a/src/usr/local/www/firewall_shaper.php +++ b/src/usr/local/www/firewall_shaper.php @@ -71,6 +71,7 @@ if ($_GET['reset'] != "") { } $pgtitle = array(gettext("Firewall"), gettext("Traffic Shaper"), gettext("By Interface")); +$pglinks = array("", "@self", "@self"); $shortcut_section = "trafficshaper"; $shaperIFlist = get_configured_interface_with_descr(); diff --git a/src/usr/local/www/firewall_shaper_queues.php b/src/usr/local/www/firewall_shaper_queues.php index 8a8cdce..0700aea 100644 --- a/src/usr/local/www/firewall_shaper_queues.php +++ b/src/usr/local/www/firewall_shaper_queues.php @@ -218,6 +218,7 @@ if ($_POST['apply']) { } $pgtitle = array(gettext("Firewall"), gettext("Traffic Shaper"), gettext("By Queue")); +$pglinks = array("", "firewall_shaper.php", "@self"); $shortcut_section = "trafficshaper"; include("head.inc"); diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php index 0648b97..d732bfe 100644 --- a/src/usr/local/www/firewall_shaper_vinterface.php +++ b/src/usr/local/www/firewall_shaper_vinterface.php @@ -69,6 +69,7 @@ if ($_GET['reset'] != "") { } $pgtitle = array(gettext("Firewall"), gettext("Traffic Shaper"), gettext("Limiters")); +$pglinks = array("", "firewall_shaper.php", "@self"); $shortcut_section = "trafficshaper-limiters"; $dfltmsg = false; diff --git a/src/usr/local/www/firewall_shaper_wizards.php b/src/usr/local/www/firewall_shaper_wizards.php index 97b9c8a..25c25b8 100644 --- a/src/usr/local/www/firewall_shaper_wizards.php +++ b/src/usr/local/www/firewall_shaper_wizards.php @@ -92,6 +92,7 @@ if ($_POST['apply']) { } $pgtitle = array(gettext("Firewall"), gettext("Traffic Shaper"), gettext("Wizards")); +$pglinks = array("", "firewall_shaper.php", "@self"); $shortcut_section = "trafficshaper"; $wizards = array( diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php index a6ae2f4..fad6b20 100644 --- a/src/usr/local/www/firewall_virtual_ip_edit.php +++ b/src/usr/local/www/firewall_virtual_ip_edit.php @@ -326,6 +326,7 @@ $ipaliashelp = gettext('The mask must be the network\'s subnet mask. It does not $proxyarphelp = gettext('Enter a CIDR block of proxy ARP addresses.'); $pgtitle = array(gettext("Firewall"), gettext("Virtual IPs"), gettext("Edit")); +$pglinks = array("", "firewall_virtual_ip.php", "@self"); include("head.inc"); function build_if_list() { diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 190a662..abcf0ad 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -517,13 +517,24 @@ function gentitle($title) { } } -function genhtmltitle($title, $links=array()) { +function genhtmltitle($title, $links=true) { + + $num_crumbs = count($title); // If the array contains only one element, there are no breadcrumbs, so don't // add anything else - if (count($title) > 1) { + if ($num_crumbs > 1) { $bc = '<ol class="breadcrumb">'; + if (!is_array($links)) { + $gen_default = ($links === true); + $links = array_fill(0, $num_crumbs, ''); + // If no links passed, then default to a link to self on the last entry. + if ($gen_default) { + $links[$num_crumbs-1] = '@self'; + } + } + foreach ($title as $idx => $el) { $href = $links[$idx]; if (strlen($href) > 0) { diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index 600fc9e..299e0e9 100644 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc @@ -530,7 +530,11 @@ if (are_notices_pending()) { print('<br />'); unset($notitle); } else { - print(genhtmltitle($pgtitle, $pglinks)); + if (isset($pglinks)) { + print(genhtmltitle($pgtitle, $pglinks)); + } else { + print(genhtmltitle($pgtitle)); + } } ?> <ul class="context-links"> diff --git a/src/usr/local/www/interfaces_bridge_edit.php b/src/usr/local/www/interfaces_bridge_edit.php index 46cc53e..6089071 100644 --- a/src/usr/local/www/interfaces_bridge_edit.php +++ b/src/usr/local/www/interfaces_bridge_edit.php @@ -414,6 +414,7 @@ function build_port_list($selecton) { } $pgtitle = array(gettext("Interfaces"), gettext("Bridges"), gettext("Edit")); +$pglinks = array("", "interfaces_bridge.php", "@self"); $shortcut_section = "interfaces"; include("head.inc"); diff --git a/src/usr/local/www/interfaces_gif_edit.php b/src/usr/local/www/interfaces_gif_edit.php index f954ea5..e0f8165 100644 --- a/src/usr/local/www/interfaces_gif_edit.php +++ b/src/usr/local/www/interfaces_gif_edit.php @@ -195,6 +195,7 @@ function build_parent_list() { } $pgtitle = array(gettext("Interfaces"), gettext("GIFs"), gettext("Edit")); +$pglinks = array("", "interfaces_gif.php", "@self"); $shortcut_section = "interfaces"; include("head.inc"); diff --git a/src/usr/local/www/interfaces_gre_edit.php b/src/usr/local/www/interfaces_gre_edit.php index 21b30f8..72c6ac9 100644 --- a/src/usr/local/www/interfaces_gre_edit.php +++ b/src/usr/local/www/interfaces_gre_edit.php @@ -189,6 +189,7 @@ function build_parent_list() { } $pgtitle = array(gettext("Interfaces"), gettext("GREs"), gettext("Edit")); +$pglinks = array("", "interfaces_gre.php", "@self"); $shortcut_section = "interfaces"; include("head.inc"); diff --git a/src/usr/local/www/interfaces_groups_edit.php b/src/usr/local/www/interfaces_groups_edit.php index e8bbf4d..aeefd16 100644 --- a/src/usr/local/www/interfaces_groups_edit.php +++ b/src/usr/local/www/interfaces_groups_edit.php @@ -63,6 +63,7 @@ require_once("guiconfig.inc"); require_once("functions.inc"); $pgtitle = array(gettext("Interfaces"), gettext("Interface Groups"), gettext("Edit")); +$pglinks = array("", "interfaces_groups.php", "@self"); $shortcut_section = "interfaces"; if (!is_array($config['ifgroups']['ifgroupentry'])) { diff --git a/src/usr/local/www/interfaces_lagg_edit.php b/src/usr/local/www/interfaces_lagg_edit.php index 2e0bf0b..3f0d5dd 100644 --- a/src/usr/local/www/interfaces_lagg_edit.php +++ b/src/usr/local/www/interfaces_lagg_edit.php @@ -253,6 +253,7 @@ function build_member_list() { } $pgtitle = array(gettext("Interfaces"), gettext("LAGGs"), gettext("Edit")); +$pglinks = array("", "interfaces_lagg.php", "@self"); $shortcut_section = "interfaces"; include("head.inc"); diff --git a/src/usr/local/www/interfaces_ppps_edit.php b/src/usr/local/www/interfaces_ppps_edit.php index d30a62a..6627831 100644 --- a/src/usr/local/www/interfaces_ppps_edit.php +++ b/src/usr/local/www/interfaces_ppps_edit.php @@ -484,6 +484,7 @@ if (isset($_POST) && is_array($_POST) && count($_POST) > 0) { } // end if ($_POST) $pgtitle = array(gettext("Interfaces"), gettext("PPPs"), gettext("Edit")); +$pglinks = array("", "interfaces_ppps.php", "@self"); $shortcut_section = "interfaces"; include("head.inc"); diff --git a/src/usr/local/www/interfaces_qinq_edit.php b/src/usr/local/www/interfaces_qinq_edit.php index da4acf1..6ef24df 100644 --- a/src/usr/local/www/interfaces_qinq_edit.php +++ b/src/usr/local/www/interfaces_qinq_edit.php @@ -59,6 +59,7 @@ ##|-PRIV $pgtitle = array(gettext("Interfaces"), gettext("QinQs"), gettext("Edit")); +$pglinks = array("", "interfaces_qinq.php", "@self"); $shortcut_section = "interfaces"; require_once("guiconfig.inc"); diff --git a/src/usr/local/www/interfaces_vlan_edit.php b/src/usr/local/www/interfaces_vlan_edit.php index 9f4266f..0eb6f5c 100644 --- a/src/usr/local/www/interfaces_vlan_edit.php +++ b/src/usr/local/www/interfaces_vlan_edit.php @@ -202,6 +202,7 @@ function build_interfaces_list() { } $pgtitle = array(gettext("Interfaces"), gettext("VLANs"), gettext("Edit")); +$pglinks = array("", "interfaces_vlan.php", "@self"); $shortcut_section = "interfaces"; include("head.inc"); diff --git a/src/usr/local/www/interfaces_wireless_edit.php b/src/usr/local/www/interfaces_wireless_edit.php index 91a8e01..d11c376 100644 --- a/src/usr/local/www/interfaces_wireless_edit.php +++ b/src/usr/local/www/interfaces_wireless_edit.php @@ -197,6 +197,7 @@ function build_parent_list() { } $pgtitle = array(gettext("Interfaces"), gettext("Wireless"), gettext("Edit")); +$pglinks = array("", "interfaces_wireless.php", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/load_balancer_monitor.php b/src/usr/local/www/load_balancer_monitor.php index 1a1b31d..abfeeaf 100644 --- a/src/usr/local/www/load_balancer_monitor.php +++ b/src/usr/local/www/load_balancer_monitor.php @@ -103,6 +103,7 @@ if ($_GET['act'] == "del") { } $pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Monitors")); +$pglinks = array("", "load_balancer_pool.php", "@self"); $shortcut_section = "relayd"; include("head.inc"); diff --git a/src/usr/local/www/load_balancer_monitor_edit.php b/src/usr/local/www/load_balancer_monitor_edit.php index 00dcb3b..7be2d55 100644 --- a/src/usr/local/www/load_balancer_monitor_edit.php +++ b/src/usr/local/www/load_balancer_monitor_edit.php @@ -232,6 +232,7 @@ if ($_POST) { } $pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Monitors"), gettext("Edit")); +$pglinks = array("", "load_balancer_pool.php", "load_balancer_monitor.php", "@self"); $shortcut_section = "relayd"; include("head.inc"); diff --git a/src/usr/local/www/load_balancer_pool.php b/src/usr/local/www/load_balancer_pool.php index a1efe02..94b5a9e 100644 --- a/src/usr/local/www/load_balancer_pool.php +++ b/src/usr/local/www/load_balancer_pool.php @@ -117,6 +117,7 @@ for ($i = 0; isset($config['load_balancer']['lbpool'][$i]); $i++) { } $pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Pools")); +$pglinks = array("", "@self", "@self"); $shortcut_section = "relayd"; include("head.inc"); diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php index 48c654c..b93044c 100644 --- a/src/usr/local/www/load_balancer_pool_edit.php +++ b/src/usr/local/www/load_balancer_pool_edit.php @@ -215,6 +215,7 @@ if ($_POST) { } $pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Pools"), gettext("Edit")); +$pglinks = array("", "load_balancer_pool.php", "load_balancer_pool.php", "@self"); $shortcut_section = "relayd"; include("head.inc"); diff --git a/src/usr/local/www/load_balancer_setting.php b/src/usr/local/www/load_balancer_setting.php index 821d91a..91b9f94 100644 --- a/src/usr/local/www/load_balancer_setting.php +++ b/src/usr/local/www/load_balancer_setting.php @@ -116,6 +116,7 @@ if ($_POST) { } $pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Settings")); +$pglinks = array("", "load_balancer_pool.php", "@self"); $shortcut_section = "relayd"; include("head.inc"); diff --git a/src/usr/local/www/load_balancer_virtual_server.php b/src/usr/local/www/load_balancer_virtual_server.php index 629c551..9d2414c 100644 --- a/src/usr/local/www/load_balancer_virtual_server.php +++ b/src/usr/local/www/load_balancer_virtual_server.php @@ -137,6 +137,7 @@ function alias_idx($name, $type) { } $pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Virtual Servers")); +$pglinks = array("", "load_balancer_pool.php", "@self"); $shortcut_section = "relayd-virtualservers"; include("head.inc"); diff --git a/src/usr/local/www/load_balancer_virtual_server_edit.php b/src/usr/local/www/load_balancer_virtual_server_edit.php index 36ae7ec..1ae1653 100644 --- a/src/usr/local/www/load_balancer_virtual_server_edit.php +++ b/src/usr/local/www/load_balancer_virtual_server_edit.php @@ -189,6 +189,7 @@ if ($_POST) { } $pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Virtual Servers"), gettext("Edit")); +$pglinks = array("", "load_balancer_pool.php", "load_balancer_virtual_server.php", "@self"); $shortcut_section = "relayd-virtualservers"; include("head.inc"); diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php index 5edc566..7f92d3b 100644 --- a/src/usr/local/www/pkg.php +++ b/src/usr/local/www/pkg.php @@ -69,6 +69,7 @@ $xml = $_REQUEST['xml']; if ($xml == "") { $pgtitle = array(gettext("Package"), gettext("Editor")); + $pglinks = array("", "@self"); include("head.inc"); print_info_box(gettext("No valid package defined."), 'danger', false); include("foot.inc"); @@ -195,12 +196,15 @@ if ($pkg['title'] != "") { foreach ($title as $subtitle) { $pgtitle[] = gettext($subtitle); + $pglinks[] = "@self"; } } else { $pgtitle = array(gettext("Package"), gettext($pkg['title'])); + $pglinks = array("", "@self"); } } else { $pgtitle = array(gettext("Package"), gettext("Editor")); + $pglinks = array("", "@self"); } if ($pkg['tabs'] != "") { @@ -214,6 +218,7 @@ if ($pkg['tabs'] != "") { if (isset($tab['active'])) { $active = true; $pgtitle[] = $tab['text']; + $pglinks[] = "@self"; } else { $active = false; } diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php index 8680cfe..07a359b 100644 --- a/src/usr/local/www/pkg_edit.php +++ b/src/usr/local/www/pkg_edit.php @@ -80,6 +80,7 @@ $xml_fullpath = realpath('/usr/local/pkg/' . $xml); if ($xml == "" || $xml_fullpath === false || substr($xml_fullpath, 0, strlen('/usr/local/pkg/')) != '/usr/local/pkg/') { $pgtitle = array(gettext("Package"), gettext("Editor")); + $pglinks = array("", "@self"); include("head.inc"); print_info_box(gettext("No valid package defined."), 'danger', false); include("foot.inc"); @@ -537,12 +538,15 @@ if ($pkg['title'] != "") { foreach ($title as $subtitle) { $pgtitle[] = gettext($subtitle); + $pglinks[] = ((($subtitle == "Edit") || (strlen($pkg['menu'][0]['url']) == 0)) ? "@self" : $pkg['menu'][0]['url']); } } else { $pgtitle = array(gettext("Package"), gettext($pkg['title'])); + $pglinks = array("", ((($subtitle == "Edit") || (strlen($pkg['menu'][0]['url']) == 0)) ? "@self" : $pkg['menu'][0]['url'])); } } else { $pgtitle = array(gettext("Package"), gettext("Editor")); + $pglinks = array("", "@self"); } // Create any required tabs @@ -558,6 +562,7 @@ if ($pkg['tabs'] != "") { if (isset($tab['active'])) { $active = true; $pgtitle[] = $tab['text'] ; + $pglinks[] = ((strlen($tab['url']) > 0) ? $tab['url'] : "@self"); } else { $active = false; } diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php index 896d4ab..e384095 100644 --- a/src/usr/local/www/pkg_mgr.php +++ b/src/usr/local/www/pkg_mgr.php @@ -68,6 +68,7 @@ require_once("pkg-utils.inc"); // if upgrade in progress, alert user if (is_subsystem_dirty('packagelock')) { $pgtitle = array(gettext("System"), gettext("Package Manager")); + $pglinks = array("", "@self"); include("head.inc"); print_info_box("Please wait while packages are reinstalled in the background."); include("foot.inc"); @@ -159,6 +160,7 @@ function get_pkg_table() { } $pgtitle = array(gettext("System"), gettext("Package Manager"), gettext("Available Packages")); +$pglinks = array("", "pkg_mgr_installed.php", "@self"); include("head.inc"); $tab_array = array(); diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index 7ab7e42..1ffad16 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -269,10 +269,12 @@ $tab_array = array(); if ($firmwareupdate) { $pgtitle = array(gettext("System"), gettext("Update"), gettext("System Update")); + $pglinks = array("", "@self", "@self"); $tab_array[] = array(gettext("System Update"), true, "pkg_mgr_install.php?id=firmware"); $tab_array[] = array(gettext("Update Settings"), false, "system_update_settings.php"); } else { $pgtitle = array(gettext("System"), gettext("Package Manager"), gettext("Package Installer")); + $pglinks = array("", "pkg_mgr_installed.php", "@self"); $tab_array[] = array(gettext("Installed Packages"), false, "pkg_mgr_installed.php"); $tab_array[] = array(gettext("Available Packages"), false, "pkg_mgr.php"); $tab_array[] = array(gettext("Package Installer"), true, ""); diff --git a/src/usr/local/www/pkg_mgr_installed.php b/src/usr/local/www/pkg_mgr_installed.php index 0fa8a18..75ebe20 100644 --- a/src/usr/local/www/pkg_mgr_installed.php +++ b/src/usr/local/www/pkg_mgr_installed.php @@ -64,6 +64,7 @@ require_once("pkg-utils.inc"); /* if upgrade in progress, alert user */ if (is_subsystem_dirty('packagelock')) { $pgtitle = array(gettext("System"), gettext("Package Manager")); + $pglinks = array("", "@self"); include("head.inc"); print_info_box("Please wait while packages are reinstalled in the background."); include("foot.inc"); @@ -233,6 +234,7 @@ function get_pkg_table() { } $pgtitle = array(gettext("System"), gettext("Package Manager"), gettext("Installed Packages")); +$pglinks = array("", "@self", "@self"); include("head.inc"); $tab_array = array(); diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php index f58dc0a..0143dd6 100644 --- a/src/usr/local/www/services_captiveportal.php +++ b/src/usr/local/www/services_captiveportal.php @@ -94,6 +94,7 @@ if (!is_array($config['captiveportal'])) { $a_cp =& $config['captiveportal']; $pgtitle = array(gettext("Services"), gettext("Captive Portal"), $a_cp[$cpzone]['zone'], gettext("Configuration")); +$pglinks = array("", "services_captiveportal_zones.php", "@self", "@self"); $shortcut_section = "captiveportal"; if ($_GET['act'] == "viewhtml") { diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php index 027f760..0b0848c 100644 --- a/src/usr/local/www/services_captiveportal_filemanager.php +++ b/src/usr/local/www/services_captiveportal_filemanager.php @@ -97,6 +97,7 @@ if (!is_array($config['captiveportal'])) { $a_cp =& $config['captiveportal']; $pgtitle = array(gettext("Services"), gettext("Captive Portal"), $a_cp[$cpzone]['zone'], gettext("File Manager")); +$pglinks = array("", "services_captiveportal_zones.php", "services_captiveportal.php?zone=" . $cpzone, "@self"); $shortcut_section = "captiveportal"; if (!is_array($a_cp[$cpzone]['element'])) { diff --git a/src/usr/local/www/services_captiveportal_hostname.php b/src/usr/local/www/services_captiveportal_hostname.php index b84b357..82efac1 100644 --- a/src/usr/local/www/services_captiveportal_hostname.php +++ b/src/usr/local/www/services_captiveportal_hostname.php @@ -92,6 +92,7 @@ if (isset($cpzone) && !empty($cpzone) && isset($a_cp[$cpzone]['zoneid'])) { } $pgtitle = array(gettext("Services"), gettext("Captive Portal"), $a_cp[$cpzone]['zone'], gettext("Allowed Hostnames")); +$pglinks = array("", "services_captiveportal_zones.php", "services_captiveportal.php?zone=" . $cpzone, "@self"); $shortcut_section = "captiveportal"; if ($_GET['act'] == "del" && !empty($cpzone) && isset($cpzoneid)) { diff --git a/src/usr/local/www/services_captiveportal_hostname_edit.php b/src/usr/local/www/services_captiveportal_hostname_edit.php index 6b2b9d2..54e76d1 100644 --- a/src/usr/local/www/services_captiveportal_hostname_edit.php +++ b/src/usr/local/www/services_captiveportal_hostname_edit.php @@ -94,6 +94,7 @@ if (!is_array($config['captiveportal'])) { $a_cp =& $config['captiveportal']; $pgtitle = array(gettext("Services"), gettext("Captive Portal"), $a_cp[$cpzone]['zone'], gettext("Allowed Hostnames"), gettext("Edit")); +$pglinks = array("", "services_captiveportal_zones.php", "services_captiveportal.php?zone=" . $cpzone, "services_captiveportal_hostname.php?zone=" . $cpzone, "@self"); $shortcut_section = "captiveportal"; if (is_numericint($_GET['id'])) { diff --git a/src/usr/local/www/services_captiveportal_ip.php b/src/usr/local/www/services_captiveportal_ip.php index ceb6631..c766ea8 100644 --- a/src/usr/local/www/services_captiveportal_ip.php +++ b/src/usr/local/www/services_captiveportal_ip.php @@ -92,6 +92,7 @@ if (isset($cpzone) && !empty($cpzone) && isset($a_cp[$cpzone]['zoneid'])) { } $pgtitle = array(gettext("Services"), gettext("Captive Portal"), $a_cp[$cpzone]['zone'], gettext("Allowed IP Addresses")); +$pglinks = array("", "services_captiveportal_zones.php", "services_captiveportal.php?zone=" . $cpzone, "@self"); $shortcut_section = "captiveportal"; if ($_GET['act'] == "del" && !empty($cpzone) && isset($cpzoneid)) { diff --git a/src/usr/local/www/services_captiveportal_ip_edit.php b/src/usr/local/www/services_captiveportal_ip_edit.php index 196c0a0..557eb17 100644 --- a/src/usr/local/www/services_captiveportal_ip_edit.php +++ b/src/usr/local/www/services_captiveportal_ip_edit.php @@ -96,6 +96,7 @@ if (!is_array($config['captiveportal'])) { $a_cp =& $config['captiveportal']; $pgtitle = array(gettext("Services"), gettext("Captive Portal"), $a_cp[$cpzone]['zone'], gettext("Allowed IP Addresses"), gettext("Edit")); +$pglinks = array("", "services_captiveportal_zones.php", "services_captiveportal.php?zone=" . $cpzone, "services_captiveportal_ip.php?zone=" . $cpzone, "@self"); $shortcut_section = "captiveportal"; if (is_numericint($_GET['id'])) { diff --git a/src/usr/local/www/services_captiveportal_mac.php b/src/usr/local/www/services_captiveportal_mac.php index 1305f37..98b64fe 100644 --- a/src/usr/local/www/services_captiveportal_mac.php +++ b/src/usr/local/www/services_captiveportal_mac.php @@ -89,6 +89,7 @@ if (!is_array($config['captiveportal'])) { $a_cp =& $config['captiveportal']; $pgtitle = array(gettext("Services"), gettext("Captive Portal"), $a_cp[$cpzone]['zone'], gettext("MACs")); +$pglinks = array("", "services_captiveportal_zones.php", "services_captiveportal.php?zone=" . $cpzone, "@self"); $shortcut_section = "captiveportal"; $actsmbl = array('pass' => '<i class="fa fa-check text-success"></i> ' . gettext("Pass"), diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php index 57eb0ea..b0aa7f3 100644 --- a/src/usr/local/www/services_captiveportal_mac_edit.php +++ b/src/usr/local/www/services_captiveportal_mac_edit.php @@ -99,6 +99,7 @@ if (!is_array($config['captiveportal'])) { $a_cp =& $config['captiveportal']; $pgtitle = array(gettext("Services"), gettext("Captive Portal"), $a_cp[$cpzone]['zone'], gettext("MACs"), gettext("Edit")); +$pglinks = array("", "services_captiveportal_zones.php", "services_captiveportal.php?zone=" . $cpzone, "services_captiveportal_mac.php?zone=" . $cpzone, "@self"); $shortcut_section = "captiveportal"; if (is_numericint($_GET['id'])) { diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php index 39568c4..f9cdbf4 100644 --- a/src/usr/local/www/services_captiveportal_vouchers.php +++ b/src/usr/local/www/services_captiveportal_vouchers.php @@ -108,6 +108,7 @@ if (empty($a_cp[$cpzone])) { } $pgtitle = array(gettext("Services"), gettext("Captive Portal"), $a_cp[$cpzone]['zone'], gettext("Vouchers")); +$pglinks = array("", "services_captiveportal_zones.php", "services_captiveportal.php?zone=" . $cpzone, "@self"); $shortcut_section = "captiveportal-vouchers"; if (!is_array($config['voucher'][$cpzone]['roll'])) { diff --git a/src/usr/local/www/services_captiveportal_vouchers_edit.php b/src/usr/local/www/services_captiveportal_vouchers_edit.php index 9572935..20b02cd 100644 --- a/src/usr/local/www/services_captiveportal_vouchers_edit.php +++ b/src/usr/local/www/services_captiveportal_vouchers_edit.php @@ -83,6 +83,7 @@ if (!is_array($config['captiveportal'])) { $a_cp =& $config['captiveportal']; $pgtitle = array(gettext("Services"), gettext("Captive Portal"), $a_cp[$cpzone]['zone'], gettext("Vouchers"), gettext("Edit")); +$pglinks = array("", "services_captiveportal_zones.php", "services_captiveportal.php?zone=" . $cpzone, "services_captiveportal_vouchers.php?zone=" . $cpzone, "@self"); $shortcut_section = "captiveportal-vouchers"; if (!is_array($config['voucher'])) { diff --git a/src/usr/local/www/services_captiveportal_zones_edit.php b/src/usr/local/www/services_captiveportal_zones_edit.php index b84a1f8..fbf7f48 100644 --- a/src/usr/local/www/services_captiveportal_zones_edit.php +++ b/src/usr/local/www/services_captiveportal_zones_edit.php @@ -65,6 +65,7 @@ require_once("shaper.inc"); require_once("captiveportal.inc"); $pgtitle = array(gettext("Services"), gettext("Captive Portal"), gettext("Add Zone")); +$pglinks = array("", "services_captiveportal_zones.php", "@self"); $shortcut_section = "captiveportal"; if (!is_array($config['captiveportal'])) { diff --git a/src/usr/local/www/services_checkip.php b/src/usr/local/www/services_checkip.php index 511e9ef..5755a86 100644 --- a/src/usr/local/www/services_checkip.php +++ b/src/usr/local/www/services_checkip.php @@ -97,6 +97,7 @@ if ($dirty) { } $pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("Check IP Services")); +$pglinks = array("", "services_dyndns.php", "@self"); include("head.inc"); $tab_array = array(); diff --git a/src/usr/local/www/services_checkip_edit.php b/src/usr/local/www/services_checkip_edit.php index 250bff5..e1a7cc1 100644 --- a/src/usr/local/www/services_checkip_edit.php +++ b/src/usr/local/www/services_checkip_edit.php @@ -138,6 +138,7 @@ if ($_POST) { } $pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("Check IP Services"), gettext("Edit")); +$pglinks = array("", "services_dyndns.php", "services_checkip.php", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php index 1ba6607..848e035 100644 --- a/src/usr/local/www/services_dhcp.php +++ b/src/usr/local/www/services_dhcp.php @@ -749,9 +749,11 @@ function build_pooltable() { } $pgtitle = array(gettext("Services"), gettext("DHCP Server")); +$pglinks = array("", "services_dhcp.php"); if (!empty($if) && isset($iflist[$if])) { $pgtitle[] = $iflist[$if]; + $pglinks[] = "@self"; } $shortcut_section = "dhcp"; diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php index 880ce41..838b827 100644 --- a/src/usr/local/www/services_dhcp_edit.php +++ b/src/usr/local/www/services_dhcp_edit.php @@ -413,6 +413,7 @@ if (!empty($if) && isset($iflist[$if])) { $ifname = $iflist[$if]; } $pgtitle = array(gettext("Services"), gettext("DHCP Server"), $ifname, gettext("Edit Static Mapping")); +$pglinks = array("", "services_dhcp.php", "services_dhcp.php?if={$if}", "@self"); $shortcut_section = "dhcp"; include("head.inc"); diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php index 287fc37..e19b2e0 100644 --- a/src/usr/local/www/services_dhcpv6.php +++ b/src/usr/local/www/services_dhcpv6.php @@ -511,10 +511,13 @@ if ($_GET['act'] == "del") { } $pgtitle = array(gettext("Services"), htmlspecialchars(gettext("DHCPv6 Server & RA"))); +$pglinks = array("", "services_dhcpv6.php"); if (!empty($if) && isset($iflist[$if])) { $pgtitle[] = $iflist[$if]; + $pglinks[] = "@self"; $pgtitle[] = gettext("DHCPv6 Server"); + $pglinks[] = "@self"; } $shortcut_section = "dhcp6"; diff --git a/src/usr/local/www/services_dhcpv6_edit.php b/src/usr/local/www/services_dhcpv6_edit.php index ba35aae..10b2e65 100644 --- a/src/usr/local/www/services_dhcpv6_edit.php +++ b/src/usr/local/www/services_dhcpv6_edit.php @@ -231,6 +231,7 @@ if (!empty($if) && isset($iflist[$if])) { $ifname = $iflist[$if]; } $pgtitle = array(gettext("Services"), htmlspecialchars(gettext("DHCPv6 Server & RA")), $ifname, gettext("DHCPv6 Server"), gettext("Edit Static Mapping")); +$pglinks = array("", "services_dhcp.php", "services_dhcp.php?if={$if}", "services_dhcp.php?if={$if}", "@self"); $shortcut_section = "dhcp6"; include("head.inc"); diff --git a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php index 077bd94..98c2c27 100644 --- a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -150,6 +150,7 @@ if ($_POST) { } $pgtitle = array(gettext("Services"), gettext("DNS Forwarder"), gettext("Edit Domain Override")); +$pglinks = array("", "services_dnsmasq.php", "@self"); $shortcut_section = "forwarder"; include("head.inc"); diff --git a/src/usr/local/www/services_dnsmasq_edit.php b/src/usr/local/www/services_dnsmasq_edit.php index 90dd343..3f1bcee 100644 --- a/src/usr/local/www/services_dnsmasq_edit.php +++ b/src/usr/local/www/services_dnsmasq_edit.php @@ -215,6 +215,7 @@ if ($_GET['act'] == "addopt") { } $pgtitle = array(gettext("Services"), gettext("DNS Forwarder"), gettext("Edit Host Override")); +$pglinks = array("", "services_dnsmasq.php", "@self"); $shortcut_section = "forwarder"; include("head.inc"); diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php index 5d466ed..72fe6cb 100644 --- a/src/usr/local/www/services_dyndns.php +++ b/src/usr/local/www/services_dyndns.php @@ -97,6 +97,7 @@ if ($_GET['act'] == "del") { } } $pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("Dynamic DNS Clients")); +$pglinks = array("", "@self", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php index b0f58ac..f47513a 100644 --- a/src/usr/local/www/services_dyndns_edit.php +++ b/src/usr/local/www/services_dyndns_edit.php @@ -272,6 +272,7 @@ function build_if_list() { } $pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("Dynamic DNS Clients"), gettext("Edit")); +$pglinks = array("", "services_dyndns.php", "services_dyndns.php", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/services_igmpproxy_edit.php b/src/usr/local/www/services_igmpproxy_edit.php index c6a270d..b189a76 100644 --- a/src/usr/local/www/services_igmpproxy_edit.php +++ b/src/usr/local/www/services_igmpproxy_edit.php @@ -63,6 +63,7 @@ ##|-PRIV $pgtitle = array(gettext("Services"), gettext("IGMP Proxy"), gettext("Edit")); +$pglinks = array("", "services_igmpproxy.php", "@self"); require_once("guiconfig.inc"); diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php index 991f9e0..c55a8cc 100644 --- a/src/usr/local/www/services_ntpd.php +++ b/src/usr/local/www/services_ntpd.php @@ -214,6 +214,7 @@ if (empty($pconfig['interface'])) { $pconfig['interface'] = explode(",", $pconfig['interface']); } $pgtitle = array(gettext("Services"), gettext("NTP"), gettext("Settings")); +$pglinks = array("", "@self", "@self"); $shortcut_section = "ntp"; include("head.inc"); diff --git a/src/usr/local/www/services_ntpd_acls.php b/src/usr/local/www/services_ntpd_acls.php index a1a5a93..f6665cc 100644 --- a/src/usr/local/www/services_ntpd_acls.php +++ b/src/usr/local/www/services_ntpd_acls.php @@ -191,6 +191,7 @@ if ($_POST) { $pconfig = &$config['ntpd']; $pgtitle = array(gettext("Services"), gettext("NTP"), gettext("ACLs")); +$pglinks = array("", "services_ntpd.php", "@self"); $shortcut_section = "ntp"; include("head.inc"); diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php index e2f23ea..b56da7e 100644 --- a/src/usr/local/www/services_ntpd_gps.php +++ b/src/usr/local/www/services_ntpd_gps.php @@ -339,6 +339,7 @@ function build_nmea_list() { $pconfig = &$config['ntpd']['gps']; $pgtitle = array(gettext("Services"), gettext("NTP"), gettext("Serial GPS")); +$pglinks = array("", "services_ntpd.php", "@self"); $shortcut_section = "ntp"; include("head.inc"); diff --git a/src/usr/local/www/services_ntpd_pps.php b/src/usr/local/www/services_ntpd_pps.php index 2cc7ede..50a121a 100644 --- a/src/usr/local/www/services_ntpd_pps.php +++ b/src/usr/local/www/services_ntpd_pps.php @@ -132,6 +132,7 @@ if ($_POST) { $pconfig = &$config['ntpd']['pps']; $pgtitle = array(gettext("Services"), gettext("NTP"), gettext("PPS")); +$pglinks = array("", "services_ntpd.php", "@self"); $shortcut_section = "ntp"; include("head.inc"); diff --git a/src/usr/local/www/services_pppoe_edit.php b/src/usr/local/www/services_pppoe_edit.php index 569598b..d746736 100644 --- a/src/usr/local/www/services_pppoe_edit.php +++ b/src/usr/local/www/services_pppoe_edit.php @@ -310,6 +310,7 @@ function build_interface_list() { } $pgtitle = array(gettext("Services"), gettext("PPPoE Server"), gettext("Edit")); +$pglinks = array("", "services_pppoe.php", "@self"); $shortcut_section = "pppoes"; include("head.inc"); diff --git a/src/usr/local/www/services_rfc2136.php b/src/usr/local/www/services_rfc2136.php index 42287ac..e4f86d1 100644 --- a/src/usr/local/www/services_rfc2136.php +++ b/src/usr/local/www/services_rfc2136.php @@ -88,6 +88,7 @@ if ($_GET['act'] == "del") { } $pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("RFC 2136 Clients")); +$pglinks = array("", "services_dyndns.php", "@self"); include("head.inc"); $tab_array = array(); diff --git a/src/usr/local/www/services_rfc2136_edit.php b/src/usr/local/www/services_rfc2136_edit.php index 78d72e7..f1df851 100644 --- a/src/usr/local/www/services_rfc2136_edit.php +++ b/src/usr/local/www/services_rfc2136_edit.php @@ -178,6 +178,7 @@ function build_if_list() { } $pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("RFC 2136 Clients"), gettext("Edit")); +$pglinks = array("", "services_dyndns.php", "services_rfc2136.php", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php index a6c64c6..41dad0f 100644 --- a/src/usr/local/www/services_router_advertisements.php +++ b/src/usr/local/www/services_router_advertisements.php @@ -281,11 +281,14 @@ if ($_POST) { } $pgtitle = array(gettext("Services"), htmlspecialchars(gettext("DHCPv6 Server & RA"))); +$pglinks = array("", "services_dhcpv6.php"); if (!empty($if) && isset($iflist[$if])) { $pgtitle[] = $iflist[$if]; + $pglinks[] = "services_dhcpv6.php?if=" . $if; } $pgtitle[] = gettext("Router Advertisements"); +$pglinks[] = "@self"; include("head.inc"); diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index 4e55186..fcdf7b7 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -268,6 +268,7 @@ function build_if_list($selectedifs) { } $pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("General Settings")); +$pglinks = array("", "@self", "@self"); $shortcut_section = "resolver"; include_once("head.inc"); diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php index e4f150d..31ae00e 100644 --- a/src/usr/local/www/services_unbound_acls.php +++ b/src/usr/local/www/services_unbound_acls.php @@ -206,6 +206,7 @@ $actionHelp = sprintf(gettext('%sRefuse Nonlocal:%s Allow only authoritative local-data queries from hosts within the netblock defined below. Sends a DNS rcode REFUSED error message back to the client for messages that are disallowed.'), '<span class="text-success"><strong>', '</strong></span>'); $pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("Access Lists")); +$pglinks = array("", "services_unbound.php", "@self"); if ($act == "new" || $act == "edit") { $pgtitle[] = gettext('Edit'); diff --git a/src/usr/local/www/services_unbound_advanced.php b/src/usr/local/www/services_unbound_advanced.php index 3edde55..b6d3319 100644 --- a/src/usr/local/www/services_unbound_advanced.php +++ b/src/usr/local/www/services_unbound_advanced.php @@ -217,6 +217,7 @@ if ($_POST) { } $pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("Advanced Settings")); +$pglinks = array("", "services_unbound.php", "@self"); $shortcut_section = "resolver"; include_once("head.inc"); diff --git a/src/usr/local/www/services_unbound_domainoverride_edit.php b/src/usr/local/www/services_unbound_domainoverride_edit.php index d70bdc1..6b486e7 100644 --- a/src/usr/local/www/services_unbound_domainoverride_edit.php +++ b/src/usr/local/www/services_unbound_domainoverride_edit.php @@ -142,6 +142,7 @@ if ($_POST) { } $pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("General Settings"), gettext("Edit Domain Override")); +$pglinks = array("", "services_unbound.php", "services_unbound.php", "@self"); $shortcut_section = "resolver"; include("head.inc"); diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php index 3124343..392f8bd 100644 --- a/src/usr/local/www/services_unbound_host_edit.php +++ b/src/usr/local/www/services_unbound_host_edit.php @@ -230,6 +230,7 @@ if ($_GET['act'] == "addopt") { } $pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("General Settings"), gettext("Edit Host Override")); +$pglinks = array("", "services_unbound.php", "services_unbound.php", "@self"); $shortcut_section = "resolver"; include("head.inc"); diff --git a/src/usr/local/www/services_wol_edit.php b/src/usr/local/www/services_wol_edit.php index 28ab5b0..2ec5a60 100644 --- a/src/usr/local/www/services_wol_edit.php +++ b/src/usr/local/www/services_wol_edit.php @@ -141,6 +141,7 @@ if ($_POST) { } $pgtitle = array(gettext("Services"), gettext("Wake-on-LAN"), gettext("Edit")); +$pglinks = array("", "services_wol.php", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/status_captiveportal.php b/src/usr/local/www/status_captiveportal.php index 21eeefd..f0d3b8d 100644 --- a/src/usr/local/www/status_captiveportal.php +++ b/src/usr/local/www/status_captiveportal.php @@ -160,14 +160,17 @@ if ($_GET['deleteall'] && !empty($cpzone) && isset($cpzoneid)) { } $pgtitle = array(gettext("Status"), gettext("Captive Portal")); +$pglinks = array("", "status_captiveportal.php"); if (!empty($cpzone)) { $cpdb = captiveportal_read_db(); $pgtitle[] = htmlspecialchars($a_cp[$cpzone]['zone']); + $pglinks[] = "status_captiveportal.php?zone=" . $cpzone; if (isset($config['voucher'][$cpzone]['enable'])) { $pgtitle[] = gettext("Active Users"); + $pglinks[] = "status_captiveportal.php?zone=" . $cpzone; } } $shortcut_section = "captiveportal"; diff --git a/src/usr/local/www/status_captiveportal_expire.php b/src/usr/local/www/status_captiveportal_expire.php index f485c30..5ccccbb 100644 --- a/src/usr/local/www/status_captiveportal_expire.php +++ b/src/usr/local/www/status_captiveportal_expire.php @@ -87,6 +87,7 @@ if (empty($cpzone)) { } $pgtitle = array(gettext("Status"), gettext("Captive Portal"), htmlspecialchars($a_cp[$cpzone]['zone']), gettext("Expire Vouchers")); +$pglinks = array("", "status_captiveportal.php", "status_captiveportal.php?zone=" . $cpzone, "@self"); include("head.inc"); diff --git a/src/usr/local/www/status_captiveportal_test.php b/src/usr/local/www/status_captiveportal_test.php index 7b2fdcc..881daf8 100644 --- a/src/usr/local/www/status_captiveportal_test.php +++ b/src/usr/local/www/status_captiveportal_test.php @@ -87,6 +87,7 @@ if (empty($cpzone)) { } $pgtitle = array(gettext("Status"), gettext("Captive Portal"), htmlspecialchars($a_cp[$cpzone]['zone']), gettext("Test Vouchers")); +$pglinks = array("", "status_captiveportal.php", "status_captiveportal.php?zone=" . $cpzone, "@self"); $shortcut_section = "captiveportal-vouchers"; include("head.inc"); diff --git a/src/usr/local/www/status_captiveportal_voucher_rolls.php b/src/usr/local/www/status_captiveportal_voucher_rolls.php index cb478e9..596eb28 100644 --- a/src/usr/local/www/status_captiveportal_voucher_rolls.php +++ b/src/usr/local/www/status_captiveportal_voucher_rolls.php @@ -87,6 +87,7 @@ if (empty($cpzone)) { } $pgtitle = array(gettext("Status"), gettext("Captive Portal"), htmlspecialchars($a_cp[$cpzone]['zone']), gettext("Voucher Rolls")); +$pglinks = array("", "status_captiveportal.php", "status_captiveportal.php?zone=" . $cpzone, "@self"); $shortcut_section = "captiveportal-vouchers"; if (!is_array($config['voucher'][$cpzone]['roll'])) { diff --git a/src/usr/local/www/status_captiveportal_vouchers.php b/src/usr/local/www/status_captiveportal_vouchers.php index 1531df9..688fd01 100644 --- a/src/usr/local/www/status_captiveportal_vouchers.php +++ b/src/usr/local/www/status_captiveportal_vouchers.php @@ -87,6 +87,7 @@ if (empty($cpzone)) { } $pgtitle = array(gettext("Status"), gettext("Captive Portal"), htmlspecialchars($a_cp[$cpzone]['zone']), gettext("Active Vouchers")); +$pglinks = array("", "status_captiveportal.php", "status_captiveportal.php?zone=" . $cpzone, "@self"); $shortcut_section = "captiveportal-vouchers"; if (!is_array($config['voucher'][$cpzone]['roll'])) { diff --git a/src/usr/local/www/status_gateway_groups.php b/src/usr/local/www/status_gateway_groups.php index c205d45..6156a3e 100644 --- a/src/usr/local/www/status_gateway_groups.php +++ b/src/usr/local/www/status_gateway_groups.php @@ -77,6 +77,7 @@ $changedesc = gettext("Gateway Groups") . ": "; $gateways_status = return_gateways_status(); $pgtitle = array(gettext("Status"), gettext("Gateways"), gettext("Gateway Groups")); +$pglinks = array("", "status_gateways.php", "@self"); $shortcut_section = "gateway-groups"; include("head.inc"); diff --git a/src/usr/local/www/status_gateways.php b/src/usr/local/www/status_gateways.php index 6233636..7a99df0 100644 --- a/src/usr/local/www/status_gateways.php +++ b/src/usr/local/www/status_gateways.php @@ -71,6 +71,7 @@ $now = time(); $year = date("Y"); $pgtitle = array(gettext("Status"), gettext("Gateways"), gettext("Gateways")); +$pglinks = array("", "@self", "@self"); $shortcut_section = "gateways"; include("head.inc"); diff --git a/src/usr/local/www/status_ipsec.php b/src/usr/local/www/status_ipsec.php index 0e54af2..8dcdf99 100644 --- a/src/usr/local/www/status_ipsec.php +++ b/src/usr/local/www/status_ipsec.php @@ -492,6 +492,7 @@ function print_ipsec_body() { } $pgtitle = array(gettext("Status"), gettext("IPsec"), gettext("Overview")); +$pglinks = array("", "@self", "@self"); $shortcut_section = "ipsec"; include("head.inc"); diff --git a/src/usr/local/www/status_ipsec_leases.php b/src/usr/local/www/status_ipsec_leases.php index 4947ef0..8076a34 100644 --- a/src/usr/local/www/status_ipsec_leases.php +++ b/src/usr/local/www/status_ipsec_leases.php @@ -62,6 +62,7 @@ require_once("guiconfig.inc"); require_once("ipsec.inc"); $pgtitle = array(gettext("Status"), gettext("IPsec"), gettext("Leases")); +$pglinks = array("", "status_ipsec.php", "@self"); $shortcut_section = "ipsec"; include("head.inc"); diff --git a/src/usr/local/www/status_ipsec_sad.php b/src/usr/local/www/status_ipsec_sad.php index 020914d..f0930f4 100644 --- a/src/usr/local/www/status_ipsec_sad.php +++ b/src/usr/local/www/status_ipsec_sad.php @@ -66,6 +66,7 @@ require_once("guiconfig.inc"); require_once("ipsec.inc"); $pgtitle = array(gettext("Status"), gettext("IPsec"), gettext("SADs")); +$pglinks = array("", "status_ipsec.php", "@self"); $shortcut_section = "ipsec"; include("head.inc"); diff --git a/src/usr/local/www/status_ipsec_spd.php b/src/usr/local/www/status_ipsec_spd.php index 4e5ab9b..a135da4 100644 --- a/src/usr/local/www/status_ipsec_spd.php +++ b/src/usr/local/www/status_ipsec_spd.php @@ -69,6 +69,7 @@ require_once("guiconfig.inc"); require_once("ipsec.inc"); $pgtitle = array(gettext("Status"), gettext("IPsec"), gettext("SPDs")); +$pglinks = array("", "status_ipsec.php", "@self"); $shortcut_section = "ipsec"; include("head.inc"); diff --git a/src/usr/local/www/status_lb_pool.php b/src/usr/local/www/status_lb_pool.php index 2f36be6..7bd2bcd 100644 --- a/src/usr/local/www/status_lb_pool.php +++ b/src/usr/local/www/status_lb_pool.php @@ -89,6 +89,7 @@ $now = time(); $year = date("Y"); $pgtitle = array(gettext("Status"), gettext("Load Balancer"), gettext("Pools")); +$pglinks = array("", "@self", "@self"); $shortcut_section = "relayd"; include("head.inc"); diff --git a/src/usr/local/www/status_lb_vs.php b/src/usr/local/www/status_lb_vs.php index ad30af2..281636c 100644 --- a/src/usr/local/www/status_lb_vs.php +++ b/src/usr/local/www/status_lb_vs.php @@ -75,6 +75,7 @@ $a_pool = &$config['load_balancer']['lbpool']; $rdr_a = get_lb_redirects(); $pgtitle = array(gettext("Status"), gettext("Load Balancer"), gettext("Virtual Servers")); +$pglinks = array("", "status_lb_pool.php", "@self"); include("head.inc"); /* active tabs */ diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php index 9f7cd2e..0a91b28 100644 --- a/src/usr/local/www/status_logs.php +++ b/src/usr/local/www/status_logs.php @@ -126,8 +126,10 @@ if ($filtertext) { if (in_array($logfile, array('system', 'gateways', 'routing', 'resolver', 'wireless'))) { $pgtitle = array(gettext("Status"), gettext("System Logs"), gettext("System"), $allowed_logs[$logfile]["name"]); + $pglinks = array("", "status_logs.php", "status_logs.php", "@self"); } else { $pgtitle = array(gettext("Status"), gettext("System Logs"), $allowed_logs[$logfile]["name"]); + $pglinks = array("", "status_logs.php", "@self"); } include("head.inc"); diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php index 0509f39..83b027b 100644 --- a/src/usr/local/www/status_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -132,6 +132,7 @@ status_logs_common_code(); $pgtitle = array(gettext("Status"), gettext("System Logs"), gettext($allowed_logs[$logfile]["name"]), $view_title); +$pglinks = array("", "status_logs.php", "status_logs_filter.php", "@self"); include("head.inc"); if (!$input_errors && $savemsg) { diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php index 1f25a68..a751103 100644 --- a/src/usr/local/www/status_logs_filter_dynamic.php +++ b/src/usr/local/www/status_logs_filter_dynamic.php @@ -112,6 +112,7 @@ status_logs_common_code(); $pgtitle = array(gettext("Status"), gettext("System Logs"), gettext($allowed_logs[$logfile]["name"]), $view_title); +$pglinks = array("", "status_logs.php", "status_logs_filter.php", "@self"); include("head.inc"); if (!$input_errors && $savemsg) { diff --git a/src/usr/local/www/status_logs_filter_summary.php b/src/usr/local/www/status_logs_filter_summary.php index f6d4e27..8649809 100644 --- a/src/usr/local/www/status_logs_filter_summary.php +++ b/src/usr/local/www/status_logs_filter_summary.php @@ -97,6 +97,7 @@ status_logs_common_code(); $pgtitle = array(gettext("Status"), gettext("System Logs"), gettext($allowed_logs[$logfile]["name"]), $view_title); +$pglinks = array("", "status_logs.php", "status_logs_filter.php", "@self"); include("head.inc"); if (!$input_errors && $savemsg) { diff --git a/src/usr/local/www/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php index c203730..fc2a969 100644 --- a/src/usr/local/www/status_logs_settings.php +++ b/src/usr/local/www/status_logs_settings.php @@ -218,6 +218,7 @@ if ($_POST['resetlogs'] == gettext("Reset Log Files")) { } $pgtitle = array(gettext("Status"), gettext("System Logs"), gettext("Settings")); +$pglinks = array("", "status_logs.php", "@self"); include("head.inc"); $logfilesizeHelp = gettext("Logs are held in constant-size circular log files. This field controls how large each log file is, and thus how many entries may exist inside the log. By default this is approximately 500KB per log file, and there are nearly 20 such log files.") . diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php index fe76454..785d25c 100644 --- a/src/usr/local/www/status_logs_vpn.php +++ b/src/usr/local/www/status_logs_vpn.php @@ -114,6 +114,7 @@ if ($filtertext) { } $pgtitle = array(gettext("Status"), gettext("System Logs"), gettext("VPN"), gettext($allowed_logs[$logfile]["name"])); +$pglinks = array("", "status_logs.php", "status_logs_vpn.php", "@self"); include("head.inc"); if (!$input_errors && $savemsg) { diff --git a/src/usr/local/www/status_pkglogs.php b/src/usr/local/www/status_pkglogs.php index 20f35e5..bd27b91 100644 --- a/src/usr/local/www/status_pkglogs.php +++ b/src/usr/local/www/status_pkglogs.php @@ -101,9 +101,11 @@ if (!$apkg) { // If we aren't looking for a specific package, locate the first p } $pgtitle = array(gettext("Status"), gettext("Package Logs")); +$pglinks = array("", "status_pkglogs.php"); if ($pkgwithlogging && !empty($apkg)) { $pgtitle[] = $apkg; + $pglinks[] = "@self"; } include("head.inc"); diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index 7f0a7e9..8c275eb 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -315,6 +315,7 @@ if ($_POST) { } $pgtitle = array(gettext("System"), gettext("Advanced"), gettext("Admin Access")); +$pglinks = array("", "@self", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/system_advanced_firewall.php b/src/usr/local/www/system_advanced_firewall.php index e39c3a0..f2bf042 100644 --- a/src/usr/local/www/system_advanced_firewall.php +++ b/src/usr/local/www/system_advanced_firewall.php @@ -401,6 +401,7 @@ if ($_POST) { } $pgtitle = array(gettext("System"), gettext("Advanced"), htmlspecialchars(gettext("Firewall & NAT"))); +$pglinks = array("", "system_advanced_admin.php", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php index f00e40f..79ca581 100644 --- a/src/usr/local/www/system_advanced_misc.php +++ b/src/usr/local/www/system_advanced_misc.php @@ -317,6 +317,7 @@ if ($_POST) { } $pgtitle = array(gettext("System"), gettext("Advanced"), gettext("Miscellaneous")); +$pglinks = array("", "system_advanced_admin.php", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php index a20286e..8f28774 100644 --- a/src/usr/local/www/system_advanced_network.php +++ b/src/usr/local/www/system_advanced_network.php @@ -170,6 +170,7 @@ if ($_POST) { } $pgtitle = array(gettext("System"), gettext("Advanced"), gettext("Networking")); +$pglinks = array("", "system_advanced_admin.php", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/system_advanced_notifications.php b/src/usr/local/www/system_advanced_notifications.php index 95bc628..d8851c9 100644 --- a/src/usr/local/www/system_advanced_notifications.php +++ b/src/usr/local/www/system_advanced_notifications.php @@ -228,6 +228,7 @@ if ($_POST) { } $pgtitle = array(gettext("System"), gettext("Advanced"), gettext("Notifications")); +$pglinks = array("", "system_advanced_admin.php", "@self"); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/system_advanced_sysctl.php b/src/usr/local/www/system_advanced_sysctl.php index e482858..3240582 100644 --- a/src/usr/local/www/system_advanced_sysctl.php +++ b/src/usr/local/www/system_advanced_sysctl.php @@ -151,9 +151,11 @@ if ($_POST) { } $pgtitle = array(gettext("System"), gettext("Advanced"), gettext("System Tunables")); +$pglinks = array("", "system_advanced_admin.php", "system_advanced_sysctl.php"); if ($act == "edit") { $pgtitle[] = gettext('Edit'); + $pglinks[] = "@self"; } include("head.inc"); diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index 528104e..9557f50 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -433,9 +433,11 @@ if ($_POST && $input_errors) { } $pgtitle = array(gettext("System"), gettext("User Manager"), gettext("Authentication Servers")); +$pglinks = array("", "system_usermanager.php", "system_authservers.php"); if ($act == "new" || $act == "edit" || $input_errors) { $pgtitle[] = gettext('Edit'); + $pglinks[] = "@self"; } $shortcut_section = "authentication"; include("head.inc"); diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php index d20d14d..65a9bf5 100644 --- a/src/usr/local/www/system_camanager.php +++ b/src/usr/local/www/system_camanager.php @@ -346,9 +346,11 @@ if ($_POST) { } $pgtitle = array(gettext("System"), gettext("Certificate Manager"), gettext("CAs")); +$pglinks = array("", "system_camanager.php", "system_camanager.php"); if ($act == "new" || $act == "edit" || $act == gettext("Save") || $input_errors) { $pgtitle[] = gettext('Edit'); + $pglinks[] = "@self"; } include("head.inc"); diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index e05fbde..9a30ff7 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -548,9 +548,11 @@ if ($_POST) { } $pgtitle = array(gettext("System"), gettext("Certificate Manager"), gettext("Certificates")); +$pglinks = array("", "system_camanager.php", "system_certmanager.php"); if (($act == "new" || ($_POST['save'] == gettext("Save") && $input_errors)) || ($act == "csr" || ($_POST['save'] == gettext("Update") && $input_errors))) { $pgtitle[] = gettext('Edit'); + $pglinks[] = "@self"; } include("head.inc"); diff --git a/src/usr/local/www/system_crlmanager.php b/src/usr/local/www/system_crlmanager.php index d4942a3..4625ad4 100644 --- a/src/usr/local/www/system_crlmanager.php +++ b/src/usr/local/www/system_crlmanager.php @@ -288,9 +288,11 @@ if ($_POST) { } $pgtitle = array(gettext("System"), gettext("Certificate Manager"), gettext("Certificate Revocation")); +$pglinks = array("", "system_camanager.php", "system_crlmanager.php"); if ($act == "new" || $act == gettext("Save") || $input_errors || $act == "edit") { $pgtitle[] = gettext('Edit'); + $pglinks[] = "@self"; } include("head.inc"); ?> diff --git a/src/usr/local/www/system_gateway_groups.php b/src/usr/local/www/system_gateway_groups.php index 253f57b..c72ea26 100644 --- a/src/usr/local/www/system_gateway_groups.php +++ b/src/usr/local/www/system_gateway_groups.php @@ -134,6 +134,7 @@ function gateway_exists($gwname) { } $pgtitle = array(gettext("System"), gettext("Routing"), gettext("Gateway Groups")); +$pglinks = array("", "system_gateways.php", "@self"); $shortcut_section = "gateway-groups"; include("head.inc"); diff --git a/src/usr/local/www/system_gateway_groups_edit.php b/src/usr/local/www/system_gateway_groups_edit.php index 70d8325..bcc9aed 100644 --- a/src/usr/local/www/system_gateway_groups_edit.php +++ b/src/usr/local/www/system_gateway_groups_edit.php @@ -177,6 +177,7 @@ if ($_POST) { } $pgtitle = array(gettext("System"), gettext("Routing"), gettext("Gateway Groups"), gettext("Edit")); +$pglinks = array("", "system_gateways.php", "system_gateway_groups.php", "@self"); $shortcut_section = "gateway-groups"; function build_gateway_protocol_map (&$a_gateways) { diff --git a/src/usr/local/www/system_gateways.php b/src/usr/local/www/system_gateways.php index 9da656d..dc02a5d 100644 --- a/src/usr/local/www/system_gateways.php +++ b/src/usr/local/www/system_gateways.php @@ -255,6 +255,7 @@ if (isset($_POST['del_x'])) { } $pgtitle = array(gettext("System"), gettext("Routing"), gettext("Gateways")); +$pglinks = array("", "@self", "@self"); $shortcut_section = "gateways"; include("head.inc"); diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php index 11ed2c8..85e0afd 100644 --- a/src/usr/local/www/system_gateways_edit.php +++ b/src/usr/local/www/system_gateways_edit.php @@ -581,6 +581,7 @@ if ($_POST) { } $pgtitle = array(gettext("System"), gettext("Routing"), gettext("Gateways"), gettext("Edit")); +$pglinks = array("", "system_gateways.php", "system_gateways.php", "@self"); $shortcut_section = "gateways"; include("head.inc"); diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php index 1a916a4..3fc9af0 100644 --- a/src/usr/local/www/system_groupmanager.php +++ b/src/usr/local/www/system_groupmanager.php @@ -293,9 +293,11 @@ function build_priv_table() { } $pgtitle = array(gettext("System"), gettext("User Manager"), gettext("Groups")); +$pglinks = array("", "system_usermanager.php", "system_groupmanager.php"); if ($act == "new" || $act == "edit") { $pgtitle[] = gettext('Edit'); + $pglinks[] = "@self"; } include("head.inc"); diff --git a/src/usr/local/www/system_groupmanager_addprivs.php b/src/usr/local/www/system_groupmanager_addprivs.php index 2171d36..8a0ed50 100644 --- a/src/usr/local/www/system_groupmanager_addprivs.php +++ b/src/usr/local/www/system_groupmanager_addprivs.php @@ -65,8 +65,6 @@ require_once("guiconfig.inc"); -$pgtitle = array(gettext("System"), gettext("User Manager"), gettext("Groups"), gettext("Edit"), gettext("Add Privileges")); - if (is_numericint($_GET['groupid'])) { $groupid = $_GET['groupid']; } @@ -74,6 +72,9 @@ if (isset($_POST['groupid']) && is_numericint($_POST['groupid'])) { $groupid = $_POST['groupid']; } +$pgtitle = array(gettext("System"), gettext("User Manager"), gettext("Groups"), gettext("Edit"), gettext("Add Privileges")); +$pglinks = array("", "system_usermanager.php", "system_groupmanager.php", "system_groupmanager.php?act=edit&groupid=" . $groupid, "@self"); + $a_group = & $config['system']['group'][$groupid]; if (!is_array($a_group)) { diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php index 67aa9db..c22123e 100644 --- a/src/usr/local/www/system_routes.php +++ b/src/usr/local/www/system_routes.php @@ -243,6 +243,7 @@ if (isset($_POST['del_x'])) { } $pgtitle = array(gettext("System"), gettext("Routing"), gettext("Static Routes")); +$pglinks = array("", "system_gateways.php", "@self"); $shortcut_section = "routing"; include("head.inc"); diff --git a/src/usr/local/www/system_routes_edit.php b/src/usr/local/www/system_routes_edit.php index 0d2f5c5..6ccb85c 100644 --- a/src/usr/local/www/system_routes_edit.php +++ b/src/usr/local/www/system_routes_edit.php @@ -254,6 +254,7 @@ if ($_POST) { } $pgtitle = array(gettext("System"), gettext("Routing"), gettext("Static Routes"), gettext("Edit")); +$pglinks = array("", "system_gateways.php", "system_routes.php", "@self"); $shortcut_section = "routing"; include("head.inc"); diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php index c0b2a3f..2a27fae 100644 --- a/src/usr/local/www/system_update_settings.php +++ b/src/usr/local/www/system_update_settings.php @@ -137,6 +137,7 @@ $curcfg = $config['system']['firmware']; $gitcfg = $config['system']['gitsync']; $pgtitle = array(gettext("System"), gettext("Update"), gettext("Update Settings")); +$pglinks = array("", "pkg_mgr_install.php?id=firmware", "@self"); exec("/usr/bin/fetch -q -o {$g['tmp_path']}/manifest \"{$g['update_manifest']}\""); if (file_exists("{$g['tmp_path']}/manifest")) { diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index 2a087a0..b5b25af 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -563,9 +563,11 @@ function build_cert_table() { } $pgtitle = array(gettext("System"), gettext("User Manager"), gettext("Users")); +$pglinks = array("", "system_usermanager.php", "system_usermanager.php"); if ($act == "new" || $act == "edit" || $input_errors) { $pgtitle[] = gettext('Edit'); + $pglinks[] = "@self"; } include("head.inc"); diff --git a/src/usr/local/www/system_usermanager_addprivs.php b/src/usr/local/www/system_usermanager_addprivs.php index eac066b..cc5e209 100644 --- a/src/usr/local/www/system_usermanager_addprivs.php +++ b/src/usr/local/www/system_usermanager_addprivs.php @@ -65,8 +65,6 @@ function admusercmp($a, $b) { require_once("guiconfig.inc"); -$pgtitle = array(gettext("System"), gettext("User Manager"), gettext("Users"), gettext("Edit"), gettext("Add Privileges")); - if (is_numericint($_GET['userid'])) { $userid = $_GET['userid']; } @@ -75,6 +73,9 @@ if (isset($_POST['userid']) && is_numericint($_POST['userid'])) { $userid = $_POST['userid']; } +$pgtitle = array(gettext("System"), gettext("User Manager"), gettext("Users"), gettext("Edit"), gettext("Add Privileges")); +$pglinks = array("", "system_usermanager.php", "system_usermanager.php", "system_usermanager.php?act=edit&userid=" . $userid, "@self"); + if (!isset($config['system']['user'][$userid]) && !is_array($config['system']['user'][$userid])) { pfSenseHeader("system_usermanager.php"); exit; diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php index 46677cd..1d4d0e3 100644 --- a/src/usr/local/www/system_usermanager_settings.php +++ b/src/usr/local/www/system_usermanager_settings.php @@ -136,6 +136,7 @@ $pconfig['backend'] = &$config['system']['webgui']['backend']; // Page title for main admin $pgtitle = array(gettext("System"), gettext("User Manager"), gettext("Settings")); +$pglinks = array("", "system_usermanager.php", "@self"); $save_and_test = false; diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index de6f940..f3a0991 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -249,6 +249,7 @@ if ($_POST) { } $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Tunnels")); +$pglinks = array("", "@self", "@self"); $shortcut_section = "ipsec"; include("head.inc"); diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php index 41fcc82..6f2515f 100644 --- a/src/usr/local/www/vpn_ipsec_keys.php +++ b/src/usr/local/www/vpn_ipsec_keys.php @@ -102,6 +102,7 @@ if ($_GET['act'] == "del") { } $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Pre-Shared Keys")); +$pglinks = array("", "vpn_ipsec.php", "@self"); $shortcut_section = "ipsec"; include("head.inc"); diff --git a/src/usr/local/www/vpn_ipsec_keys_edit.php b/src/usr/local/www/vpn_ipsec_keys_edit.php index 63c11b0..2f3cb63 100644 --- a/src/usr/local/www/vpn_ipsec_keys_edit.php +++ b/src/usr/local/www/vpn_ipsec_keys_edit.php @@ -152,6 +152,7 @@ if ($_POST) { } $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Pre-Shared Keys"), gettext("Edit")); +$pglinks = array("", "vpn_ipsec.php", "vpn_ipsec_keys.php", "@self"); $shortcut_section = "ipsec"; include("head.inc"); diff --git a/src/usr/local/www/vpn_ipsec_mobile.php b/src/usr/local/www/vpn_ipsec_mobile.php index b4715c6..0d64a35 100644 --- a/src/usr/local/www/vpn_ipsec_mobile.php +++ b/src/usr/local/www/vpn_ipsec_mobile.php @@ -336,6 +336,7 @@ if ($_POST['save']) { } $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Mobile Clients")); +$pglinks = array("", "vpn_ipsec.php", "@self"); $shortcut_section = "ipsec"; include("head.inc"); diff --git a/src/usr/local/www/vpn_ipsec_phase1.php b/src/usr/local/www/vpn_ipsec_phase1.php index aa25eeb..f23b68a 100644 --- a/src/usr/local/www/vpn_ipsec_phase1.php +++ b/src/usr/local/www/vpn_ipsec_phase1.php @@ -665,8 +665,10 @@ function build_eal_list() { if ($pconfig['mobile']) { $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Mobile Clients"), gettext("Edit Phase 1")); + $pglinks = array("", "vpn_ipsec.php", "vpn_ipsec_mobile.php", "@self"); } else { $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Tunnels"), gettext("Edit Phase 1")); + $pglinks = array("", "vpn_ipsec.php", "vpn_ipsec.php", "@self"); } $shortcut_section = "ipsec"; diff --git a/src/usr/local/www/vpn_ipsec_phase2.php b/src/usr/local/www/vpn_ipsec_phase2.php index 109e96b..7928b0d 100644 --- a/src/usr/local/www/vpn_ipsec_phase2.php +++ b/src/usr/local/www/vpn_ipsec_phase2.php @@ -440,9 +440,11 @@ if ($_POST) { if ($pconfig['mobile']) { $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Mobile Clients"), gettext("Edit Phase 2")); + $pglinks = array("", "vpn_ipsec.php", "vpn_ipsec_mobile.php", "@self"); $editing_mobile = true; } else { $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Tunnels"), gettext("Edit Phase 2")); + $pglinks = array("", "vpn_ipsec.php", "vpn_ipsec.php", "@self"); $editing_mobile = false; } $shortcut_section = "ipsec"; diff --git a/src/usr/local/www/vpn_ipsec_settings.php b/src/usr/local/www/vpn_ipsec_settings.php index 2362c7e..840f389 100644 --- a/src/usr/local/www/vpn_ipsec_settings.php +++ b/src/usr/local/www/vpn_ipsec_settings.php @@ -232,6 +232,7 @@ if ($_POST) { } $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Advanced Settings")); +$pglinks = array("", "vpn_ipsec.php", "@self"); $shortcut_section = "ipsec"; include("head.inc"); diff --git a/src/usr/local/www/vpn_l2tp.php b/src/usr/local/www/vpn_l2tp.php index 8f19300..d9e994b 100644 --- a/src/usr/local/www/vpn_l2tp.php +++ b/src/usr/local/www/vpn_l2tp.php @@ -203,6 +203,7 @@ if ($_POST) { } $pgtitle = array(gettext("VPN"), gettext("L2TP"), gettext("Configuration")); +$pglinks = array("", "@self", "@self"); $shortcut_section = "l2tps"; include("head.inc"); diff --git a/src/usr/local/www/vpn_l2tp_users.php b/src/usr/local/www/vpn_l2tp_users.php index 1cb6672..12cec9f 100644 --- a/src/usr/local/www/vpn_l2tp_users.php +++ b/src/usr/local/www/vpn_l2tp_users.php @@ -59,6 +59,7 @@ ##|-PRIV $pgtitle = array(gettext("VPN"), gettext("L2TP"), gettext("Users")); +$pglinks = array("", "vpn_l2tp.php", "@self"); $shortcut_section = "l2tps"; require_once("guiconfig.inc"); diff --git a/src/usr/local/www/vpn_l2tp_users_edit.php b/src/usr/local/www/vpn_l2tp_users_edit.php index d3d7c28..995581d 100644 --- a/src/usr/local/www/vpn_l2tp_users_edit.php +++ b/src/usr/local/www/vpn_l2tp_users_edit.php @@ -59,6 +59,7 @@ ##|-PRIV $pgtitle = array(gettext("VPN"), gettext("L2TP"), gettext("Users"), gettext("Edit")); +$pglinks = array("", "vpn_l2tp.php", "vpn_l2tp_users.php", "@self"); $shortcut_section = "l2tps"; function l2tpusercmp($a, $b) { diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index a48335d..daf1f95 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -439,9 +439,11 @@ if ($_POST) { } $pgtitle = array(gettext("VPN"), gettext("OpenVPN"), gettext("Clients")); +$pglinks = array("", "vpn_openvpn_server.php", "vpn_openvpn_client.php"); if ($act=="new" || $act=="edit") { $pgtitle[] = gettext('Edit'); + $pglinks[] = "@self"; } $shortcut_section = "openvpn"; diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php index 22b1cd7..4e5785a 100644 --- a/src/usr/local/www/vpn_openvpn_csc.php +++ b/src/usr/local/www/vpn_openvpn_csc.php @@ -308,9 +308,11 @@ if ($_POST) { } $pgtitle = array(gettext("VPN"), gettext("OpenVPN"), gettext("Client Specific Overrides")); +$pglinks = array("", "vpn_openvpn_server.php", "vpn_openvpn_csc.php"); if ($act=="new" || $act=="edit") { $pgtitle[] = gettext('Edit'); + $pglinks[] = "@self"; } $shortcut_section = "openvpn"; diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index 84ccfc4..39e9672 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -606,9 +606,11 @@ if ($_POST) { } $pgtitle = array(gettext("VPN"), gettext("OpenVPN"), gettext("Servers")); +$pglinks = array("", "vpn_openvpn_server.php", "vpn_openvpn_server.php"); if ($act=="new" || $act=="edit") { $pgtitle[] = gettext('Edit'); + $pglinks[] = "@self"; } $shortcut_section = "openvpn"; diff --git a/src/usr/local/www/wizard.php b/src/usr/local/www/wizard.php index c3ab379..432737e 100644 --- a/src/usr/local/www/wizard.php +++ b/src/usr/local/www/wizard.php @@ -216,7 +216,9 @@ do { } while ($oldstepid != $stepid); $pgtitle = array(gettext("Wizard"), gettext($pkg['step'][0]['title'])); //First step is main title of the wizard in the breadcrumb +$pglinks = array("", "wizard.php?xml=" . $xml); $pgtitle[] = ($stepid > 0 ? gettext($pkg['step'][$stepid]['title']):' '); //Following steps are sub-level breadcrumbs. +$pglinks[] = ($stepid > 0 ? "wizard.php?xml=" . $xml . "&stepid=" . $stepid:' '); $shortcut_section = "Wizard"; include("head.inc"); |
