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

1 files changed, 4 insertions, 24 deletions

diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php
index dff8641..d8f5424 100644
--- a/src/usr/local/www/status_logs_filter.php
+++ b/src/usr/local/www/status_logs_filter.php
@@ -163,24 +163,14 @@ if (!$rawfilter) {
 		$interfacefilter = $iflist[$interfacefilter];
 	}
 
-	if ($filterlogentries_submit) {
-		$filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filterfieldsarray);
-	} else {
-		$filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filtertext, $interfacefilter);
-	}
+	system_log_filter();
 ?>
 
 <div class="panel panel-default">
 	<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>
@@ -328,13 +318,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>
@@ -348,11 +332,7 @@ if (!$rawfilter) {
 			</thead>
 			<tbody>
 <?php
-	if ($filtertext) {
-		$rows = dump_clog($logfile_path, $nentries, true, array("$filtertext"));
-	} else {
-		$rows = dump_clog($logfile_path, $nentries, true, array());
-	}
+	system_log_filter();
 ?>
 			</tbody>
 		</table>