diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml index b65ab2778..458017c5c 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml @@ -1,7 +1,7 @@ - + @@ -45,20 +45,12 @@ - - - - - - - - - - - - - - + + + + + + @@ -141,6 +133,11 @@ + + + + + @@ -316,6 +313,13 @@ + + + + + + + diff --git a/src/www/diag_logs.php b/src/www/diag_logs.php index e3873174a..27014000e 100644 --- a/src/www/diag_logs.php +++ b/src/www/diag_logs.php @@ -44,19 +44,11 @@ if (isset($_POST['clear'])) { clear_clog($system_logfile); } -if ($_GET['filtertext']) { - $filtertext = htmlspecialchars($_GET['filtertext']); -} - -if ($_POST['filtertext']) { +if (isset($_POST['filtertext'])) { $filtertext = htmlspecialchars($_POST['filtertext']); } -if ($filtertext) { - $filtertextmeta = "?filtertext={$filtertext}"; -} - -$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("General")); +$pgtitle = array(gettext('System'), gettext('Log Files'), gettext('General')); include("head.inc"); ?> @@ -73,39 +65,31 @@ include("head.inc");
- -
-
- -
-
+ -
+
+ + " /> +
+
-
- -
- +
" />
- -
- - " /> -
- -
+ + +
diff --git a/src/www/diag_logs_dhcp.php b/src/www/diag_logs_dhcp.php index bbbf71700..5a3a0e6dd 100644 --- a/src/www/diag_logs_dhcp.php +++ b/src/www/diag_logs_dhcp.php @@ -64,27 +64,19 @@ include("head.inc");
- - - -
-
- -
+ + +
+
+ " /> +
+
NOTE: Clearing the log file will restart the DHCP daemon.
- -
- -
- " /> -
-

NOTE: Clearing the log file will restart the DHCP daemon.

-
diff --git a/src/www/diag_logs_filter.php b/src/www/diag_logs_filter.php index beca6d6fd..3c6bbc2ba 100644 --- a/src/www/diag_logs_filter.php +++ b/src/www/diag_logs_filter.php @@ -590,7 +590,7 @@ if (isset($_POST['clear'])) { clear_clog($filter_logfile); } -$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Firewall")); +$pgtitle = array(gettext('Firewall'), gettext('Log Files'), gettext('Normal View')); $shortcut_section = "firewall"; include("head.inc"); @@ -609,15 +609,7 @@ include("head.inc"); 0) print_input_errors($input_errors); ?>
- - -
-
- - - -
- - " /> + + TCP Flags: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, W - CWR + + + + + " /> +
-
-
@@ -703,11 +699,12 @@ include("head.inc"); ?> @@ -810,7 +807,7 @@ include("head.inc"); + +
" class="listtopic"> + + echo sprintf(gettext('Showing %s matching log entries (maximum is %s).'), count($filterlog), $nentries);?> +
-
+
+ " /> +
+
@@ -825,16 +827,6 @@ include("head.inc"); - - -
- " /> -
- -

TCP Flags: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, W - CWR

- - -
diff --git a/src/www/diag_logs_filter_dynamic.php b/src/www/diag_logs_filter_dynamic.php index c2b5e2eba..214c8a630 100644 --- a/src/www/diag_logs_filter_dynamic.php +++ b/src/www/diag_logs_filter_dynamic.php @@ -47,7 +47,7 @@ if (isset($_POST['clear'])) { $filterlog = conv_log_filter($filter_logfile, $nentries, $nentries + 100); -$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Firewall (Dynamic View)")); +$pgtitle = array(gettext('Firewall'), gettext('Log Files'), gettext('Dynamic View')); $shortcut_section = "firewall"; include("head.inc"); @@ -91,22 +91,19 @@ include("head.inc");
- -
-
- - - - -
+ + + @@ -156,9 +153,6 @@ include("head.inc");
- .      + +
+  
-
- -

: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR

diff --git a/src/www/diag_logs_filter_summary.php b/src/www/diag_logs_filter_summary.php index b7404011d..a0cd67428 100644 --- a/src/www/diag_logs_filter_summary.php +++ b/src/www/diag_logs_filter_summary.php @@ -27,8 +27,9 @@ POSSIBILITY OF SUCH DAMAGE. */ -$pgtitle = gettext("Status").": ".gettext("System logs").": ".gettext("Firewall Log Summary"); +$pgtitle = array(gettext('Firewall'), gettext('Log Files'), gettext('Summary View')); $shortcut_section = "firewall"; + require_once("guiconfig.inc"); require_once("filter_log.inc"); require_once("interfaces.inc"); @@ -115,11 +116,14 @@ include("head.inc"); ?>
0) print_input_errors($input_errors); ?>
-
-
- -


+
+ + + +
+ +
diff --git a/src/www/diag_logs_gateways.php b/src/www/diag_logs_gateways.php index 611323c7c..ed2ae859b 100644 --- a/src/www/diag_logs_gateways.php +++ b/src/www/diag_logs_gateways.php @@ -46,19 +46,11 @@ if ($_POST['clear']) { clear_clog($system_logfile); } -if ($_GET['filtertext']) { - $filtertext = htmlspecialchars($_GET['filtertext']); -} - -if ($_POST['filtertext']) { +if (isset($_POST['filtertext'])) { $filtertext = htmlspecialchars($_POST['filtertext']); } -if ($filtertext) { - $filtertextmeta = "?filtertext={$filtertext}"; -} - -$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Gateways")); +$pgtitle = array(gettext('System'), gettext('Log Files'), gettext('Gateways')); $shortcut_section = "gateways"; include("head.inc"); @@ -75,38 +67,30 @@ include("head.inc"); 0) print_input_errors($input_errors); ?>
- - -
-
- - - -
- -
+ -
+
+ + " /> +
+
-
- -
+
" />
-
- - " /> -
-
+ + + +
diff --git a/src/www/diag_logs_pills.inc b/src/www/diag_logs_pills.inc index 1ee99d50a..b51c22515 100644 --- a/src/www/diag_logs_pills.inc +++ b/src/www/diag_logs_pills.inc @@ -36,19 +36,9 @@ if ($tab_group == 'vpn') { $tab_array[] = array(gettext("PPPoE Raw"), (($vpntype == "poes") && ($mode == "raw")), "/diag_logs_vpn.php?vpntype=poes&mode=raw"); $tab_array[] = array(gettext("L2TP Logins"), (($vpntype == "l2tp") && ($mode != "raw")), "/diag_logs_vpn.php?vpntype=l2tp"); $tab_array[] = array(gettext("L2TP Raw"), (($vpntype == "l2tp") && ($mode == "raw")), "/diag_logs_vpn.php?vpntype=l2tp&mode=raw"); -} elseif ($tab_group == 'firewall') { - $tab_array[] = array(gettext("Normal View"), true, "/diag_logs_filter.php"); - $tab_array[] = array(gettext("Dynamic View"), false, "/diag_logs_filter_dynamic.php"); - $tab_array[] = array(gettext("Summary View"), false, "/diag_logs_filter_summary.php"); -} elseif ($tab_group == 'proxy') { +} else { $tab_array[] = array(gettext('Cache'), true, '/diag_logs_proxy.php?type=cache'); $tab_array[] = array(gettext('Access'), false, '/diag_logs_proxy.php?type=access'); -} else { - $tab_array[] = array(gettext("General"), true, "/diag_logs.php"); - $tab_array[] = array(gettext("Gateways"), false, "/diag_logs_gateways.php"); - $tab_array[] = array(gettext("Routing"), false, "/diag_logs_routing.php"); - $tab_array[] = array(gettext("Resolver"), false, "/diag_logs_resolver.php"); - $tab_array[] = array(gettext("Wireless"), false, "/diag_logs_wireless.php"); } ?>
    diff --git a/src/www/diag_logs_ppp.php b/src/www/diag_logs_ppp.php index 7db95e6fc..a3ad25f66 100644 --- a/src/www/diag_logs_ppp.php +++ b/src/www/diag_logs_ppp.php @@ -60,27 +60,21 @@ include("head.inc"); 0) print_input_errors($input_errors); ?>
    - - - - -
    -
    - -

    + +
    +
    + " /> +
    +
    -
    - " /> -
    -
    diff --git a/src/www/diag_logs_resolver.php b/src/www/diag_logs_resolver.php index 927eabb53..a57e00e5b 100644 --- a/src/www/diag_logs_resolver.php +++ b/src/www/diag_logs_resolver.php @@ -46,19 +46,11 @@ if ($_POST['clear']) { clear_clog($system_logfile); } -if ($_GET['filtertext']) { - $filtertext = htmlspecialchars($_GET['filtertext']); -} - -if ($_POST['filtertext']) { +if (isset($_POST['filtertext'])) { $filtertext = htmlspecialchars($_POST['filtertext']); } -if ($filtertext) { - $filtertextmeta = "?filtertext={$filtertext}"; -} - -$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Resolver")); +$pgtitle = array(gettext('System'), gettext('Log Files'), gettext('Resolver')); $shortcut_section = "resolver"; include("head.inc"); @@ -75,38 +67,30 @@ include("head.inc"); 0) print_input_errors($input_errors); ?>
    - - -
    -
    - - - -
    + -
    +
    + + " /> +
    +
    -
    - -
    +
    " />
    + + +
    -
    - - " /> -
    - -
    diff --git a/src/www/diag_logs_routing.php b/src/www/diag_logs_routing.php index ec2154f79..98c1856e6 100644 --- a/src/www/diag_logs_routing.php +++ b/src/www/diag_logs_routing.php @@ -43,7 +43,11 @@ if ($_POST['clear']) { clear_clog($routing_logfile); } -$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Routing")); +if (isset($_POST['filtertext'])) { + $filtertext = htmlspecialchars($_POST['filtertext']); +} + +$pgtitle = array(gettext('System'), gettext('Log Files'), gettext('Routing')); $shortcut_section = "routing"; include("head.inc"); @@ -61,26 +65,31 @@ include("head.inc");
    - -
    -
    - -
    -
    - -
    -
    -
    + +
    + + " /> +
    + + +
    " />
    + + +
    -
    diff --git a/src/www/diag_logs_tabs.inc b/src/www/diag_logs_tabs.inc deleted file mode 100644 index 4f03ae97d..000000000 --- a/src/www/diag_logs_tabs.inc +++ /dev/null @@ -1,36 +0,0 @@ - - -
    -
    - - -
    + @@ -141,17 +136,17 @@ include("head.inc"); -
    -
    - +
    " />
    + + +
    -
diff --git a/src/www/diag_logs_wireless.php b/src/www/diag_logs_wireless.php index c3464a7a7..73648c0c1 100644 --- a/src/www/diag_logs_wireless.php +++ b/src/www/diag_logs_wireless.php @@ -45,7 +45,11 @@ if ($_POST['clear']) { clear_clog($wireless_logfile); } -$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Wireless")); +if (isset($_POST['filtertext'])) { + $filtertext = htmlspecialchars($_POST['filtertext']); +} + +$pgtitle = array(gettext('System'),gettext('Log Files'),gettext('Wireless')); include("head.inc"); @@ -62,28 +66,30 @@ include("head.inc"); 0) print_input_errors($input_errors); ?>
- - -
-
- - -
- + + +
+
+ + " /> +
+
+
+ " /> +
+
- -
- " /> -
- - -
diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc index dfdf2983a..bbb79e1fc 100644 --- a/src/www/guiconfig.inc +++ b/src/www/guiconfig.inc @@ -425,7 +425,7 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = '', $grepinvert } if (!count($logarr)) { - $logarr[] = sprintf(gettext('File %s is empty.'), $logfile); + $logarr[] = sprintf(gettext('File %s yielded no results.'), $logfile); } print_dump($logarr, $withorig); @@ -456,7 +456,7 @@ function dump_log($logfile, $tail, $withorig = true, $grepfor = '', $grepinvert } if (!count($logarr)) { - $logarr[] = sprintf(gettext('File %s is empty.'), $logfile); + $logarr[] = sprintf(gettext('File %s yielded no results.'), $logfile); } print_dump($logarr, $withorig);