Consolidate log filter code and log table header code in to common functions.

1 files changed, 3 insertions, 19 deletions

diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php
index ee2344f..4cde629 100644
--- a/src/usr/local/www/status_logs_vpn.php
+++ b/src/usr/local/www/status_logs_vpn.php
@@ -139,11 +139,7 @@ filter_form_vpn();
 
 // Now the forms are complete we can draw the log table and its controls
 if (!$rawfilter) {
-	if ($filterlogentries_submit) {
-		$filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filterfieldsarray);
-	} else {
-		$filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filtertext);
-	}
+	system_log_filter();
 
 	// Remove those not of the selected vpn type (poes / l2tp).
 	if ($logfile == "vpn") {
@@ -159,13 +155,7 @@ if (!$rawfilter) {
 	<div class="panel-heading">
 		<h2 class="panel-title">
 <?php
-		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);
+	print(system_log_table_header());
 ?>
 		</h2>
 	</div>
@@ -263,13 +253,7 @@ if (!$rawfilter) {
 	<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);
+	print(system_log_table_header());
 ?>
 		</h2>
 	</div>