diff options
| author | Phil Davis <phil.davis@inf.org> | 2016-01-14 12:24:49 +0545 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2016-01-14 08:14:16 -0500 |
| commit | bb31fda4cc7f43f5be43fe89c2beaaf6f36eace9 (patch) | |
| tree | 4d426e8741b6f4d2b03a106af9ad69ac130b9c1b /src/usr/local/www/status_logs_common.inc | |
| parent | 08e1566a0646005dee20bda39bbc2a204a8e1b54 (diff) | |
| download | pfsense-bb31fda4cc7f43f5be43fe89c2beaaf6f36eace9.zip pfsense-bb31fda4cc7f43f5be43fe89c2beaaf6f36eace9.tar.gz | |
Status Logs breadcrumbs and tab array highlighting
1) When on Status Logs->VPN the VPN part of the breadcrumb list was
missing.
2) When selecting Status Logs-> System->Gateways... the underlining of
the "System" level tab went AWOL.
3) When selecting Status Logs->VPN-> PPPoE Servixce or L2TP Service the
underlining of the "VPN" level tab went AWOL.
Diffstat (limited to 'src/usr/local/www/status_logs_common.inc')
| -rw-r--r-- | src/usr/local/www/status_logs_common.inc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/usr/local/www/status_logs_common.inc b/src/usr/local/www/status_logs_common.inc index 56bbdd7..f82176c 100644 --- a/src/usr/local/www/status_logs_common.inc +++ b/src/usr/local/www/status_logs_common.inc @@ -92,14 +92,18 @@ function status_logs_common_code() { function tab_array_logs_common() { global $tab_array, $logfile, $vpntype, $view; + $is_system_log = in_array($logfile, array('system', 'gateways', 'routing', 'resolver', 'wireless')); + $is_filter_log = in_array($logfile, array('filter')); + $is_pppoe_l2tp_vpn_log = in_array($logfile, array('poes', 'l2tps', 'vpn')); + $tab_array = array(); - $tab_array[] = array(gettext("System"), ($logfile == 'system'), "status_logs.php"); - $tab_array[] = array(gettext("Firewall"), ($logfile == 'filter'), "status_logs_filter.php"); + $tab_array[] = array(gettext("System"), $is_system_log, "status_logs.php"); + $tab_array[] = array(gettext("Firewall"), $is_filter_log, "status_logs_filter.php"); $tab_array[] = array(gettext("DHCP"), ($logfile == 'dhcpd'), "status_logs.php?logfile=dhcpd"); $tab_array[] = array(gettext("Portal Auth"), ($logfile == 'portalauth'), "status_logs.php?logfile=portalauth"); $tab_array[] = array(gettext("IPsec"), ($logfile == 'ipsec'), "status_logs.php?logfile=ipsec"); $tab_array[] = array(gettext("PPP"), ($logfile == 'ppp'), "status_logs.php?logfile=ppp"); - $tab_array[] = array(gettext("VPN"), ($logfile == 'vpn'), "status_logs_vpn.php"); + $tab_array[] = array(gettext("VPN"), $is_pppoe_l2tp_vpn_log, "status_logs_vpn.php"); $tab_array[] = array(gettext("Load Balancer"), ($logfile == 'relayd'), "status_logs.php?logfile=relayd"); $tab_array[] = array(gettext("OpenVPN"), ($logfile == 'openvpn'), "status_logs.php?logfile=openvpn"); $tab_array[] = array(gettext("NTP"), ($logfile == 'ntpd'), "status_logs.php?logfile=ntpd"); @@ -107,19 +111,19 @@ function tab_array_logs_common() { display_top_tabs($tab_array); $tab_array = array(); - if (in_array($logfile, array('system', 'gateways', 'routing', 'resolver', 'wireless'))) { + if ($is_system_log) { $tab_array[] = array(gettext("General"), ($logfile == 'system'), "/status_logs.php"); $tab_array[] = array(gettext("Gateways"), ($logfile == 'gateways'), "/status_logs.php?logfile=gateways"); $tab_array[] = array(gettext("Routing"), ($logfile == 'routing'), "/status_logs.php?logfile=routing"); $tab_array[] = array(gettext("Resolver"), ($logfile == 'resolver'), "/status_logs.php?logfile=resolver"); $tab_array[] = array(gettext("Wireless"), ($logfile == 'wireless'), "/status_logs.php?logfile=wireless"); } - else if (in_array($logfile, array('filter'))) { + else if ($is_filter_log) { $tab_array[] = array(gettext("Normal View"), ($view == 'normal'), "/status_logs_filter.php"); $tab_array[] = array(gettext("Dynamic View"), ($view == 'dynamic'), "/status_logs_filter_dynamic.php?logfile=filter&view=dynamic"); $tab_array[] = array(gettext("Summary View"), ($view == 'summary'), "/status_logs_filter_summary.php?logfile=filter&view=summary"); } - else if (in_array($logfile, array('poes', 'l2tps', 'vpn'))) { + else if ($is_pppoe_l2tp_vpn_log) { $tab_array[] = array(gettext("PPPoE Logins"), (($logfile == 'vpn') && ($vpntype == "poes")), "/status_logs_vpn.php?logfile=vpn&vpntype=poes"); |
