From 98bf911e939fe8f46974e8f86dbc556d0feeb360 Mon Sep 17 00:00:00 2001
From: NOYB <Al_Stu@Frontier.com>
Date: Sat, 23 Jan 2016 01:11:06 -0800
Subject: 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.
---
 src/usr/local/www/status_logs_vpn.php | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'src/usr/local/www/status_logs_vpn.php')

diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php
index 111e00a..ee2344f 100644
--- a/src/usr/local/www/status_logs_vpn.php
+++ b/src/usr/local/www/status_logs_vpn.php
@@ -159,10 +159,10 @@ if (!$rawfilter) {
 	<div class="panel-heading">
 		<h2 class="panel-title">
 <?php
-		if ((!$filtertext) && (!$filterfieldsarray)) {
-			printf(gettext("Last %d %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"]));
-		} else {
+		if (($filtersubmit) || ($filterlogentries_submit)) {
 			printf(gettext("%d matched %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"]));
+		} else {
+			printf(gettext("Last %d %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"]));
 		}
 
 		printf(" (" . gettext("Maximum %d") . ")", $nentries);
@@ -260,7 +260,19 @@ if (!$rawfilter) {
 } else {
 ?>
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Last ")?><?=$nentries?> <?=gettext($allowed_logs[$logfile]["name"])?><?=gettext(" log entries")?></h2></div>
+	<div class="panel-heading">
+		<h2 class="panel-title">
+<?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);
+?>
+		</h2>
+	</div>
 	<div class="panel-body">
 		<pre><?php 
 			$rows = dump_clog_no_table($logfile_path, $nentries, true, array($filtertext));
@@ -520,4 +532,12 @@ function filter_form_vpn() {
 }
 ?>
 
+<script type="text/javascript">
+//<![CDATA[
+events.push(function() {
+	$("#count").html(<?=$rows?>);
+});
+//]]>
+</script>
+
 <?php include("foot.inc"); ?>
-- 
cgit v1.1