mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Package Logs in with rest of logs. Issue #9714

Browse Source 
Standardize log tab behavior
This commit is contained in:
jim-p 2019-09-04 16:33:44 -04:00
parent 6b061c1a13
commit 280a2ca2a5
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/usr/local/www/head.inc
View File

@ -359,7 +359,6 @@ $status_menu[] = array(gettext("Interfaces"), "/status_interfaces.php");
$status_menu[] = array(gettext("IPsec"), "/status_ipsec.php");
$status_menu[] = array(gettext("NTP"), "/status_ntpd.php");
$status_menu[] = array(gettext("OpenVPN"), "/status_openvpn.php");
$status_menu[] = array(gettext("Package Logs"), "/status_pkglogs.php");
$status_menu[] = array(gettext("Queues"), "/status_queues.php");
$status_menu[] = array(gettext("Services"), "/status_services.php");
$status_menu[] = array(gettext("System Logs"), "/status_logs.php");

3
src/usr/local/www/status_logs_common.inc
View File

@ -96,7 +96,8 @@ function tab_array_logs_common() {
$tab_array[] = array(gettext("VPN"), $is_pppoe_l2tp_vpn_log, "status_logs_vpn.php");
$tab_array[] = array(gettext("OpenVPN"), ($logfile == 'openvpn'), "status_logs.php?logfile=openvpn");
$tab_array[] = array(gettext("NTP"), ($logfile == 'ntpd'), "status_logs.php?logfile=ntpd");
$tab_array[] = array(gettext("Settings"), false, "status_logs_settings.php");
$tab_array[] = array(gettext("Packages"), (basename($_SERVER["SCRIPT_FILENAME"]) == "status_pkglogs.php"), "status_pkglogs.php");
$tab_array[] = array(gettext("Settings"), (basename($_SERVER["SCRIPT_FILENAME"]) == "status_logs_settings.php"), "status_logs_settings.php");
display_top_tabs($tab_array);
$tab_array = array();

14
src/usr/local/www/status_logs_settings.php
View File

@ -36,6 +36,7 @@ require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("shaper.inc");
require_once("status_logs_common.inc");
global $system_log_compression_types;
@ -249,18 +250,7 @@ if ($changes_applied) {
print_apply_result_box($retval, $extra_save_msg);
}
$tab_array = array();
$tab_array[] = array(gettext("System"), false, "status_logs.php");
$tab_array[] = array(gettext("Firewall"), false, "status_logs_filter.php");
$tab_array[] = array(gettext("DHCP"), false, "status_logs.php?logfile=dhcpd");
$tab_array[] = array(gettext("Captive Portal Auth"), false, "status_logs.php?logfile=portalauth");
$tab_array[] = array(gettext("IPsec"), false, "status_logs.php?logfile=ipsec");
$tab_array[] = array(gettext("PPP"), false, "status_logs.php?logfile=ppp");
$tab_array[] = array(gettext("VPN"), false, "status_logs_vpn.php");
$tab_array[] = array(gettext("OpenVPN"), false, "status_logs.php?logfile=openvpn");
$tab_array[] = array(gettext("NTP"), false, "status_logs.php?logfile=ntpd");
$tab_array[] = array(gettext("Settings"), true, "status_logs_settings.php");
display_top_tabs($tab_array);
tab_array_logs_common();
$form = new Form();

3
src/usr/local/www/status_pkglogs.php
View File

@ -42,6 +42,7 @@
require_once("guiconfig.inc");
require_once("pkg-utils.inc");
require_once("status_logs_common.inc");
if (!($nentries = $config['syslog']['nentries'])) {
$nentries = 50;
@ -79,6 +80,8 @@ if ($pkgwithlogging && !empty($apkg)) {
}
include("head.inc");
tab_array_logs_common();
if ($pkgwithlogging == false) {
print_info_box(gettext("No packages with logging facilities are currently installed."));
} else {