Consolidate with status_logs_common.inc

2 files changed, 206 insertions, 485 deletions

diff --git a/src/usr/local/www/status_logs_common.inc b/src/usr/local/www/status_logs_common.inc
index 51c0646..35098ee 100644
--- a/src/usr/local/www/status_logs_common.inc
+++ b/src/usr/local/www/status_logs_common.inc
@@ -119,17 +119,17 @@ function tab_array_logs_common() {
 		$tab_array[] = array(gettext("Dynamic View"), ($view == 'dynamic'), "/status_logs_filter_dynamic.php?logfile=filter&view=dynamic");
 		$tab_array[] = array(gettext("Summary View"), ($view == 'summary'), "/status_logs_filter_summary.php?logfile=filter&view=summary");
 	}
-	else if (in_array($logfile, array('poes', 'l2tp', 'vpn')))	 {
+	else if (in_array($logfile, array('poes', 'l2tps', 'vpn')))	 {
 		$tab_array[] = array(gettext("PPPoE Logins"),
 					(($logfile == 'vpn') && ($vpntype == "poes")),
 					"/status_logs_vpn.php?logfile=vpn&vpntype=poes");
-		$tab_array[] = array(gettext("PPPoE Raw"),
+		$tab_array[] = array(gettext("PPPoE Service"),
 					(($logfile == 'poes') && ($vpntype == "poes")),
 					"/status_logs_vpn.php?logfile=poes&vpntype=poes");
 		$tab_array[] = array(gettext("L2TP Logins"),
 					(($logfile == 'vpn') && ($vpntype == "l2tp")),
 					"/status_logs_vpn.php?logfile=vpn&vpntype=l2tp");
-		$tab_array[] = array(gettext("L2TP Raw"),
+		$tab_array[] = array(gettext("L2TP Service"),
 					(($logfile == 'l2tps') && ($vpntype == "l2tp")),
 					"/status_logs_vpn.php?logfile=l2tps&vpntype=l2tp");
 	}
diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php
index a4883bb..8c69998 100644
--- a/src/usr/local/www/status_logs_vpn.php
+++ b/src/usr/local/www/status_logs_vpn.php
@@ -64,8 +64,7 @@
 ##|-PRIV
 
 
-require("guiconfig.inc");
-require_once("filter_log.inc");
+require_once("status_logs_common.inc");
 require_once("vpn.inc");
 
 /*
@@ -101,168 +100,22 @@ if ($vpntype == 'l2tp') { $allowed_logs['vpn']['name'] = "L2TP Logins"; }
 $vpn_logfile = "{$g['varlog_path']}/" . basename($logfile) . ".log";
 
 
-$filtersubmit = getGETPOSTsettingvalue('filtersubmit', null);
+// Log Filter Submit - VPN
+log_filter_form_vpn_submit();
 
-if ($filtersubmit) {
-	$filter_active = true;
-	$filtertext = getGETPOSTsettingvalue('filtertext', "");
-	$filterlogentries_qty = getGETPOSTsettingvalue('filterlogentries_qty', null);
-}
-
-$filterlogentries_submit = getGETPOSTsettingvalue('filterlogentries_submit', null);
-
-if ($filterlogentries_submit) {
-	$filter_active = true;
-	$filterfieldsarray = array();
-
-	$filterfieldsarray['time'] = getGETPOSTsettingvalue('filterlogentries_time', null);
-	$filterfieldsarray['type'] = getGETPOSTsettingvalue('filterlogentries_type', null);
-	$filterfieldsarray['pid'] = getGETPOSTsettingvalue('filterlogentries_pid', null);
-	$filterfieldsarray['message'] = getGETPOSTsettingvalue('filterlogentries_message', null);
-	$filterfieldsarray['action'] = getGETPOSTsettingvalue('filterlogentries_action', null);
-	$filterfieldsarray['user'] = getGETPOSTsettingvalue('filterlogentries_user', null);
-	$filterfieldsarray['ip_address'] = getGETPOSTsettingvalue('filterlogentries_ip_address', null);
-	$filterlogentries_qty = getGETPOSTsettingvalue('filterlogentries_qty', null);
-}
-
-
-# Manage Log - Code
-
-$specific_log = basename($logfile) . '_settings';
-
-# All
-$pconfig['cronorder'] = $config['syslog'][$specific_log]['cronorder'];
-$pconfig['nentries'] = $config['syslog'][$specific_log]['nentries'];
-$pconfig['logfilesize'] = $config['syslog'][$specific_log]['logfilesize'];
-$pconfig['format'] = $config['syslog'][$specific_log]['format'];
-
-# System General (main) Specific
-$pconfig['loglighttpd'] = !isset($config['syslog']['nologlighttpd']);
-
-$save_settings = getGETPOSTsettingvalue('save_settings', null);
-
-if ($save_settings) {
 
-	# All
-	$cronorder = getGETPOSTsettingvalue('cronorder',  null);
-	$nentries = getGETPOSTsettingvalue('nentries', null);
-	$logfilesize = getGETPOSTsettingvalue('logfilesize', null);
-	$format  = getGETPOSTsettingvalue('format',  null);
+// Manage Log Section - Code
+manage_log_code();
 
-	# System General (main) Specific
-	$loglighttpd  = getGETPOSTsettingvalue('loglighttpd',  null);
 
-	unset($input_errors);
-	$pconfig = $_POST;
-
-	/* input validation */
-	# All
-	if (isset($nentries) && (strlen($nentries) > 0)) {
-		if (!is_numeric($nentries) || ($nentries < 5) || ($nentries > 2000)) {
-			$input_errors[] = gettext("Number of log entries to show must be between 5 and 2000.");
-		}
-	}
-
-	if (isset($logfilesize) && (strlen($logfilesize) > 0)) {
-		if (!is_numeric($logfilesize) || ($logfilesize < 100000)) {
-			$input_errors[] = gettext("Log file size must be numeric and greater than or equal to 100000.");
-		}
-	}
-
-	if (!$input_errors) {
-
-		# Clear out the specific log settings and leave only the applied settings to override the general logging options (global) settings.
-		unset($config['syslog'][$specific_log]);
-
-	# All
-		if ($cronorder != '') { # if not using the general logging options setting (global)
-			$config['syslog'][$specific_log]['cronorder'] = $cronorder;
-		}
-
-		if (isset($nentries) && (strlen($nentries) > 0)) {
-			$config['syslog'][$specific_log]['nentries'] = (int)$nentries;
-		}
+// Status Logs Common - Code
+status_logs_common_code();
 
-		if (isset($logfilesize) && (strlen($logfilesize) > 0)) {
-			$config['syslog'][$specific_log]['logfilesize'] = (int)$logfilesize;
-		}
-
-		if ($format != '') { # if not using the general logging options setting (global)
-			$config['syslog'][$specific_log]['format'] = $format;
-		}
-
-	# System General (main) Specific
-		if ($logfile == 'system') {
-			$oldnologlighttpd = isset($config['syslog']['nologlighttpd']);
-			$config['syslog']['nologlighttpd'] = $loglighttpd ? false : true;
-
-			if ($oldnologlighttpd !== $config['syslog']['nologlighttpd']) {
-				$logging_changed = $lighttpd_logging_changed = true;
-			}
-		}
-
-
-		// If any of the logging settings were changed then backup and sync (standard write_config).  Otherwise only write config (don't backup, don't sync).
-		if ($logging_changed) {
-			write_config($desc = "Log Display Settings Saved: " . gettext($allowed_logs[$logfile]["name"]), $backup = true, $write_config_only = false);
-			$retval = 0;
-			$retval = system_syslogd_start();
-		} else {
-			write_config($desc = "Log Display Settings Saved (no backup, no sync): " . gettext($allowed_logs[$logfile]["name"]), $backup = false, $write_config_only = true);
-		}
-
-		$savemsg = gettext("The changes have been applied successfully.");
-
-	# System General (main) Specific
-		if ($logfile == 'system') {
-			if ($lighttpd_logging_changed) {
-				ob_flush();
-				flush();
-				log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator."));
-				send_event("service restart webgui");
-				$savemsg .= "<br />" . gettext("WebGUI process is restarting.");
-			}
-		}
-	}
-}
-
-
-# Formatted/Raw Display
-if ($config['syslog'][$specific_log]['format'] == 'formatted') {
-	$rawfilter = false;
-} else if ($config['syslog'][$specific_log]['format'] == 'raw') {
-	$rawfilter = true;
-} else {	# Use the general logging options setting (global).
-	$rawfilter = isset($config['syslog']['rawfilter']);
-}
-
-
-isset($config['syslog'][$specific_log]['nentries']) ? $nentries = $config['syslog'][$specific_log]['nentries'] : $nentries = $config['syslog']['nentries'];
-
-# Override Display Quantity
-if ($filterlogentries_qty) {
-	$nentries = $filterlogentries_qty;
-}
-
-if (!$nentries || !is_numeric($nentries)) {
-	$nentries = 50;
-}
-
-if ($_POST['clear']) {
-	clear_log_file($system_logfile);
-}
 
 if ($filtertext) {
 	$filtertextmeta="?filtertext=$filtertext";
 }
 
-/* Setup shortcuts if they exist */
-
-if (!empty($allowed_logs[$logfile]["shortcut"])) {
-	$shortcut_section = $allowed_logs[$logfile]["shortcut"];
-}
-
-
 #$pgtitle = array(gettext("Status"), gettext("System logs"), gettext("VPN"));
 $pgtitle = array(gettext("Status"), gettext("System logs"), gettext($allowed_logs[$logfile]["name"]));
 include("head.inc");
@@ -273,182 +126,14 @@ if (!$input_errors && $savemsg) {
 }
 
 
-$tab_array = array();
-$tab_array[] = array(gettext("System"), ($logfile == 'system'), "status_logs.php");
-$tab_array[] = array(gettext("Firewall"), ($logfile == 'filter'), "status_logs_filter.php");
-$tab_array[] = array(gettext("DHCP"), ($logfile == 'dhcpd'), "status_logs.php?logfile=dhcpd");
-$tab_array[] = array(gettext("Portal Auth"), ($logfile == 'portalauth'), "status_logs.php?logfile=portalauth");
-$tab_array[] = array(gettext("IPsec"), ($logfile == 'ipsec'), "status_logs.php?logfile=ipsec");
-$tab_array[] = array(gettext("PPP"), ($logfile == 'ppp'), "status_logs.php?logfile=ppp");
-$tab_array[] = array(gettext("VPN"), ($logfile == 'vpn'), "status_logs_vpn.php");
-$tab_array[] = array(gettext("Load Balancer"), ($logfile == 'relayd'), "status_logs.php?logfile=relayd");
-$tab_array[] = array(gettext("OpenVPN"), ($logfile == 'openvpn'), "status_logs.php?logfile=openvpn");
-$tab_array[] = array(gettext("NTP"), ($logfile == 'ntpd'), "status_logs.php?logfile=ntpd");
-$tab_array[] = array(gettext("Settings"), false, "status_logs_settings.php");
-display_top_tabs($tab_array);
-
-$tab_array = array();
-$tab_array[] = array(gettext("PPPoE Logins"),
-			(($logfile == 'vpn') && ($vpntype == "poes")),
-			"/status_logs_vpn.php?logfile=vpn&amp;vpntype=poes");
-$tab_array[] = array(gettext("PPPoE Service"),
-			(($logfile == 'poes') && ($vpntype == "poes")),
-			"/status_logs_vpn.php?logfile=poes&amp;vpntype=poes");
-$tab_array[] = array(gettext("L2TP Logins"),
-			(($logfile == 'vpn') && ($vpntype == "l2tp")),
-			"/status_logs_vpn.php?logfile=vpn&amp;vpntype=l2tp");
-$tab_array[] = array(gettext("L2TP Service"),
-			(($logfile == 'l2tps') && ($vpntype == "l2tp")),
-			"/status_logs_vpn.php?logfile=l2tps&amp;vpntype=l2tp");
-display_top_tabs($tab_array, false, 'nav nav-tabs');
-
-
-if ($filter_active) {
-	$filter_state = SEC_OPEN;
-} else {
-	$filter_state = SEC_CLOSED;
-}
-
-if (!$rawfilter) { // Advanced log filter form
-	$form = new Form(false);
-
-	$section = new Form_Section('Advanced Log Filter', 'adv-filter-panel', COLLAPSIBLE|$filter_state);
-
-	if ($logfile == "vpn") {
-		$group = new Form_Group('');
-
-		$group->add(new Form_Input(
-			'filterlogentries_time',
-			null,
-			'text',
-			$filterfieldsarray['time']
-		))->setWidth(3)->setHelp('Time');
-
-		$group->add(new Form_Input(
-			'filterlogentries_action',
-			null,
-			'text',
-			$filterfieldsarray['action']
-		))->setWidth(3)->setHelp('Action');
-
-		$group->add(new Form_Input(
-			'filterlogentries_qty',
-			null,
-			'number',
-			$filterlogentries_qty,
-			['placeholder' => $nentries]
-		))->setWidth(2)->setHelp('Quantity');
-
-		$section->add($group);
-
-		$group = new Form_Group('');
-
-		$group->add(new Form_Input(
-			'filterlogentries_user',
-			null,
-			'text',
-			$filterfieldsarray['user']
-		))->setWidth(3)->setHelp('User');
-
-		$group->add(new Form_Input(
-			'filterlogentries_ip_address',
-			null,
-			'text',
-			$filterfieldsarray['ip_address']
-		))->setWidth(4)->setHelp('IP Address');
-	} else {
-		$group = new Form_Group('');
-
-		$group->add(new Form_Input(
-			'filterlogentries_time',
-			null,
-			'text',
-			$filterfieldsarray['time']
-		))->setWidth(3)->setHelp('Time');
-
-		$group->add(new Form_Input(
-			'filterlogentries_type',
-			null,
-			'text',
-			$filterfieldsarray['type']
-		))->setWidth(2)->setHelp('Type');
-
-		$group->add(new Form_Input(
-			'filterlogentries_pid',
-			null,
-			'text',
-			$filterfieldsarray['pid']
-		))->setWidth(2)->setHelp('PID');
-
-		$group->add(new Form_Input(
-			'filterlogentries_qty',
-			null,
-			'number',
-			$filterlogentries_qty,
-			['placeholder' => $nentries]
-		))->setWidth(2)->setHelp('Quantity');
-
-		$section->add($group);
-
-		$group = new Form_Group('');
+// Tab Array
+tab_array_logs_common();
 
-		$group->add(new Form_Input(
-			'filterlogentries_message',
-			null,
-			'text',
-			$filterfieldsarray['message']
-		))->setWidth(7)->setHelp('Log Message');
 
-	}
-	$btnsubmit = new Form_Button(
-		'filterlogentries_submit',
-		' ' . gettext('Apply Filter'),
-		null,
-		'fa-filter'
-	);
-} else { // Simple log filter form
-	$form = new Form(false);
-
-	$section = new Form_Section('Log Filter', 'basic-filter-panel', COLLAPSIBLE|$filter_state);
-
-	$group = new Form_Group('');
-
-	$group->add(new Form_Input(
-		'filtertext',
-		null,
-		'text',
-		$filtertext
-	))->setWidth(6)->setHelp('Filter Expression');
-
-	$group->add(new Form_Input(
-		'filterlogentries_qty',
-		null,
-		'number',
-		$filterlogentries_qty,
-		['placeholder' => $nentries]
-	))->setWidth(2)->setHelp('Quantity');
-
-	$btnsubmit = new Form_Button(
-		'filtersubmit',
-		' ' . gettext('Apply Filter'),
-		null,
-		'fa-filter'
-	);
-}
+// Filter Section/Form - VPN
+filter_form_vpn();
 
-$btnsubmit->removeClass('btn-primary')->addClass('btn-success')->addClass('btn-sm');
 
-$group->add(new Form_StaticText(
-	'',
-	$btnsubmit
-));
-
-$group->setHelp('<a target="_blank" href="http://www.php.net/manual/en/book.pcre.php">' . gettext('Regular expression reference') . '</a> ' . gettext('Precede with exclamation (!) to exclude match.'));
-$section->add($group);
-$form->add($section);
-if ($logfile != "vpn") {	# Needs to be tested with a vpn.log file before enabling.
-	print $form;
-}
 // Now the forms are complete we can draw the log table and its controls
 if (!$rawfilter) {
 	if ($logfile != "vpn") {	# Needs to be tested with a vpn.log file before enabling.
@@ -590,161 +275,7 @@ if (!$rawfilter) {
 
 <?php
 # Manage Log - Section/Form
-
-if ($input_errors) {
-	print_input_errors($input_errors);
-	$manage_log_active = true;
-}
-
-if ($manage_log_active) {
-	$manage_log_state = SEC_OPEN;
-} else {
-	$manage_log_state = SEC_CLOSED;
-}
-
-$form = new Form(false);
-
-$section = new Form_Section(gettext('Manage') . ' ' . gettext($allowed_logs[$logfile]["name"]) . ' ' . gettext('Log'), 'log-manager-panel', COLLAPSIBLE|$manage_log_state);
-
-$section->addInput(new Form_StaticText(
-	'',
-	'These settings override the "General Logging Options" settings.'
-));
-
-
-# All
-$group = new Form_Group('Forward/Reverse Display');
-
-$group->add(new Form_Checkbox(
-	'cronorder',
-	null,
-	'Forward',
-	($pconfig['cronorder'] == 'forward') ? true : false,
-	'forward'
-))->displayAsRadio()->setHelp('(newest at bottom)');
-
-$group->add(new Form_Checkbox(
-	'cronorder',
-	null,
-	'Reverse',
-	($pconfig['cronorder'] == 'reverse') ? true : false,
-	'reverse'
-))->displayAsRadio()->setHelp('(newest at top)');
-
-$group->add(new Form_Checkbox(
-	'cronorder',
-	null,
-	'General Logging Options Setting',
-	($pconfig['cronorder'] == '') ? true : false,
-	''
-))->displayAsRadio();
-
-$group->setHelp('Show log entries in forward or reverse order.');
-$section->add($group);
-
-$group = new Form_Group('GUI Log Entries');
-
-# Use the general logging options setting (global) as placeholder.
-$group->add(new Form_Input(
-	'nentries',
-	'GUI Log Entries',
-	'number',
-	$pconfig['nentries'],
-	['min' => 5, 'max' => 2000, 'placeholder' => $config['syslog']['nentries']]
-))->setWidth(2);
-
-$group->setHelp('This is the number of log entries displayed in the GUI. It does not affect how many entries are contained in the log.');
-$section->add($group);
-
-$group = new Form_Group('Log file size (Bytes)');
-
-# Use the general logging options setting (global) as placeholder.
-$group->add(new Form_Input(
-	'logfilesize',
-	'Log file size (Bytes)',
-	'number',
-	$pconfig['logfilesize'],
-	['min' => 100000, 'placeholder' => $config['syslog']['logfilesize'] ? $config['syslog']['logfilesize'] : "511488"]
-))->setWidth(2);
-$group->setHelp("The log is held in a constant-size circular log file. This field controls how large the log file is, and thus how many entries may exist inside the log. The default is approximately 500KB." .
-					'<br /><br />' .
-			"NOTE: The log size is changed the next time it is cleared. To immediately change the log size, first save the options to set the size, then clear the log using the \"Clear Log\" action below. ");
-$section->add($group);
-
-$group = new Form_Group('Formatted/Raw Display');
-
-$group->add(new Form_Checkbox(
-	'format',
-	null,
-	'Formatted',
-	($pconfig['format'] == 'formatted') ? true : false,
-	'formatted'
-))->displayAsRadio();
-
-$group->add(new Form_Checkbox(
-	'format',
-	null,
-	'Raw',
-	($pconfig['format'] == 'raw') ? true : false,
-	'raw'
-))->displayAsRadio();
-
-$group->add(new Form_Checkbox(
-	'format',
-	null,
-	'General Logging Options Setting',
-	($pconfig['format'] == '') ? true : false,
-	''
-))->displayAsRadio();
-
-$group->setHelp('Show the log entries as formatted or raw output as generated by the service. The raw output will reveal more detailed information, but it is more difficult to read.');
-$section->add($group);
-
-
-# System General (main) Specific
-if ($logfile == 'system') {
-	$section->addInput(new Form_Checkbox(
-		'loglighttpd',
-		'Web Server Log',
-		'Log errors from the web server process',
-		$pconfig['loglighttpd']
-	))->setHelp('If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the system log.');
-}
-
-
-$group = new Form_Group('Action');
-
-$btnsavesettings = new Form_Button(
-	'save_settings',
-	gettext('Save'),
-	null
-);
-
-$btnsavesettings->addClass('btn-sm');
-
-$group->add(new Form_StaticText(
-	'',
-	$btnsavesettings
-))->setHelp('Saves changed settings.');
-
-
-$btnclear = new Form_Button(
-	'clear',
-	' ' . gettext('Clear log'),
-	null,
-	'fa-trash'
-);
-
-$btnclear->removeClass('btn-primary')->addClass('btn-danger')->addClass('btn-sm');
-
-$group->add(new Form_StaticText(
-	'',
-	$btnclear
-))->setHelp('Clears local log file and reinitializes it as an empty log. Save any settings changes first.');
-
-$section->add($group);
-$form->add($section);
-print $form;
+manage_log_section();
 ?>
 
 <?php
@@ -786,4 +317,194 @@ function dump_clog_vpn($logfile, $tail) {
 }
 ?>
 
-<?php include("foot.inc");
+<?php
+// Log Filter Submit - VPN
+function log_filter_form_vpn_submit() {
+
+	global $filtersubmit, $interfacefilter, $filtertext;
+	global $filterlogentries_submit, $filterfieldsarray, $actpass, $actblock;
+	global $filter_active, $filterlogentries_qty;
+
+	$filtersubmit = getGETPOSTsettingvalue('filtersubmit', null);
+
+	if ($filtersubmit) {
+		$filter_active = true;
+		$filtertext = getGETPOSTsettingvalue('filtertext', "");
+		$filterlogentries_qty = getGETPOSTsettingvalue('filterlogentries_qty', null);
+	}
+
+	$filterlogentries_submit = getGETPOSTsettingvalue('filterlogentries_submit', null);
+
+	if ($filterlogentries_submit) {
+		$filter_active = true;
+		$filterfieldsarray = array();
+
+		$filterfieldsarray['time'] = getGETPOSTsettingvalue('filterlogentries_time', null);
+		$filterfieldsarray['type'] = getGETPOSTsettingvalue('filterlogentries_type', null);
+		$filterfieldsarray['pid'] = getGETPOSTsettingvalue('filterlogentries_pid', null);
+		$filterfieldsarray['message'] = getGETPOSTsettingvalue('filterlogentries_message', null);
+		$filterfieldsarray['action'] = getGETPOSTsettingvalue('filterlogentries_action', null);
+		$filterfieldsarray['user'] = getGETPOSTsettingvalue('filterlogentries_user', null);
+		$filterfieldsarray['ip_address'] = getGETPOSTsettingvalue('filterlogentries_ip_address', null);
+		$filterlogentries_qty = getGETPOSTsettingvalue('filterlogentries_qty', null);
+	}
+}
+?>
+
+<?php
+// Filter Section/Form - VPN
+function filter_form_vpn() {
+
+	global $filter_active, $rawfilter, $filterfieldsarray, $filtertext, $filterlogentries_qty, $nentries, $Include_Act, $interfacefilter;
+	global $logfile;
+
+	if ($filter_active) {
+		$filter_state = SEC_OPEN;
+	} else {
+		$filter_state = SEC_CLOSED;
+	}
+
+	if (!$rawfilter) { // Advanced log filter form
+		$form = new Form(false);
+
+		$section = new Form_Section('Advanced Log Filter', 'adv-filter-panel', COLLAPSIBLE|$filter_state);
+
+		if ($logfile == "vpn") {
+			$group = new Form_Group('');
+
+			$group->add(new Form_Input(
+				'filterlogentries_time',
+				null,
+				'text',
+				$filterfieldsarray['time']
+			))->setWidth(3)->setHelp('Time');
+
+			$group->add(new Form_Input(
+				'filterlogentries_action',
+				null,
+				'text',
+				$filterfieldsarray['action']
+			))->setWidth(3)->setHelp('Action');
+
+			$group->add(new Form_Input(
+				'filterlogentries_qty',
+				null,
+				'number',
+				$filterlogentries_qty,
+				['placeholder' => $nentries]
+			))->setWidth(2)->setHelp('Quantity');
+
+			$section->add($group);
+
+			$group = new Form_Group('');
+
+			$group->add(new Form_Input(
+				'filterlogentries_user',
+				null,
+				'text',
+				$filterfieldsarray['user']
+			))->setWidth(3)->setHelp('User');
+
+			$group->add(new Form_Input(
+				'filterlogentries_ip_address',
+				null,
+				'text',
+				$filterfieldsarray['ip_address']
+			))->setWidth(4)->setHelp('IP Address');
+		} else {
+			$group = new Form_Group('');
+
+			$group->add(new Form_Input(
+				'filterlogentries_time',
+				null,
+				'text',
+				$filterfieldsarray['time']
+			))->setWidth(3)->setHelp('Time');
+
+			$group->add(new Form_Input(
+				'filterlogentries_type',
+				null,
+				'text',
+				$filterfieldsarray['type']
+			))->setWidth(2)->setHelp('Type');
+
+			$group->add(new Form_Input(
+				'filterlogentries_pid',
+				null,
+				'text',
+				$filterfieldsarray['pid']
+			))->setWidth(2)->setHelp('PID');
+
+			$group->add(new Form_Input(
+				'filterlogentries_qty',
+				null,
+				'number',
+				$filterlogentries_qty,
+				['placeholder' => $nentries]
+			))->setWidth(2)->setHelp('Quantity');
+
+			$section->add($group);
+
+			$group = new Form_Group('');
+
+			$group->add(new Form_Input(
+				'filterlogentries_message',
+				null,
+				'text',
+				$filterfieldsarray['message']
+			))->setWidth(7)->setHelp('Log Message');
+
+		}
+		$btnsubmit = new Form_Button(
+			'filterlogentries_submit',
+			' ' . gettext('Apply Filter'),
+			null,
+			'fa-filter'
+		);
+	} else { // Simple log filter form
+		$form = new Form(false);
+
+		$section = new Form_Section('Log Filter', 'basic-filter-panel', COLLAPSIBLE|$filter_state);
+
+		$group = new Form_Group('');
+
+		$group->add(new Form_Input(
+			'filtertext',
+			null,
+			'text',
+			$filtertext
+		))->setWidth(6)->setHelp('Filter Expression');
+
+		$group->add(new Form_Input(
+			'filterlogentries_qty',
+			null,
+			'number',
+			$filterlogentries_qty,
+			['placeholder' => $nentries]
+		))->setWidth(2)->setHelp('Quantity');
+
+		$btnsubmit = new Form_Button(
+			'filtersubmit',
+			' ' . gettext('Apply Filter'),
+			null,
+			'fa-filter'
+		);
+	}
+
+	$btnsubmit->removeClass('btn-primary')->addClass('btn-success')->addClass('btn-sm');
+
+	$group->add(new Form_StaticText(
+		'',
+		$btnsubmit
+	));
+
+	$group->setHelp('<a target="_blank" href="http://www.php.net/manual/en/book.pcre.php">' . gettext('Regular expression reference') . '</a> ' . gettext('Precede with exclamation (!) to exclude match.'));
+	$section->add($group);
+	$form->add($section);
+	if ($logfile != "vpn") {	# Needs to be tested with a vpn.log file before enabling.
+		print $form;
+	}
+}
+?>
+
+<?php include("foot.inc"); ?>