Status / System Logs - Filter Refinements

Use advanced filter in firewall dynamic view even if raw mode is set.  Raw mode is not applicable to the firewall dynamic view.
Update the count in firewall dynamic view.
JQuery the actual count in raw mode instead of just displaying the max setting value.
Change some negative logic to positive.

1 files changed, 21 insertions, 1 deletions

diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php
index 92e95dc..838578a 100755
--- a/src/usr/local/www/status_logs_filter_dynamic.php
+++ b/src/usr/local/www/status_logs_filter_dynamic.php
@@ -132,6 +132,7 @@ if ($system_logs_manage_log_form_hidden) {
 
 
 // Log Filter Submit - Firewall
+$rawfilter = false;
 filter_form_firewall();
 
 
@@ -369,6 +370,8 @@ function update_table_rows(data) {
 		rows[i].className = i % 2 == 0 ? 'listMRodd' : 'listMReven';
 	}
 
+	$("#count").html(rows.length);
+
 	$('.fa').tooltip();
 }
 
@@ -404,7 +407,16 @@ function toggleListDescriptions() {
 <div class="panel panel-default">
 	<div class="panel-heading">
 		<h2 class="panel-title">
-			<?=gettext('Last ') . $nentries . gettext(' records. ') . gettext('Pause ')?><input type="checkbox" onclick="javascript:toggle_pause();" />
+<?php
+	if (($filtersubmit) || ($filterlogentries_submit)) {
+		printf(gettext("%s matched %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"]));
+	} else {
+		printf(gettext("Last %s %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"]));
+	}
+
+	printf(" (" . gettext("Maximum %d") . ")", $nentries);
+?>
+<?=" " . gettext('Pause') . " "?><input type="checkbox" onclick="javascript:toggle_pause();" />
 		</h2>
 	</div>
 	<div class="panel-body">
@@ -510,4 +522,12 @@ events.push(function() {
 //]]>
 </script>
 
+<script type="text/javascript">
+//<![CDATA[
+events.push(function() {
+	$("#count").html(<?=count($filterlog);?>);
+});
+//]]>
+</script>
+
 <?php include("foot.inc");