Fixup AJAX stuff so dynamic updating works.

Move getGETPOSTsettingvalue function to be more centrally located in guiconfig.inc.

3 files changed, 43 insertions, 21 deletions

diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc
index a30696e..c5372df 100644
--- a/src/usr/local/www/guiconfig.inc
+++ b/src/usr/local/www/guiconfig.inc
@@ -1183,6 +1183,24 @@ function get_flash_message() {
 	}
 }
 
+/* Retrieve GET or POST Value/State
+ * Eample Usage:
+ * $value = getGETPOSTsettingvalue('get/post parameter name', "");
+ * $value = getGETPOSTsettingvalue('get/post parameter name', null);
+ * $state = getGETPOSTsettingvalue('get/post parameter name', null);
+ * $state = getGETPOSTsettingvalue('get/post parameter name', false);
+ */
+function getGETPOSTsettingvalue($settingname, $default) {
+	$settingvalue = $default;
+	if ($_GET[$settingname]) {
+		$settingvalue = $_GET[$settingname];
+	}
+	if ($_POST[$settingname]) {
+		$settingvalue = $_POST[$settingname];
+	}
+	return $settingvalue;
+}
+
 /* set timezone */
 if (isset($config['system']['timezone']) &&
     !empty($config['system']['timezone'])) {
diff --git a/src/usr/local/www/status_logs_common.inc b/src/usr/local/www/status_logs_common.inc
index 681f2ea..b1c349f 100644
--- a/src/usr/local/www/status_logs_common.inc
+++ b/src/usr/local/www/status_logs_common.inc
@@ -60,19 +60,6 @@ require_once("guiconfig.inc");
 require_once("filter_log.inc");
 
 
-// Retrieve GET or POST Value
-function getGETPOSTsettingvalue($settingname, $default) {
-	$settingvalue = $default;
-	if ($_GET[$settingname]) {
-		$settingvalue = $_GET[$settingname];
-	}
-	if ($_POST[$settingname]) {
-		$settingvalue = $_POST[$settingname];
-	}
-	return $settingvalue;
-}
-
-
 // Status Logs Common - Code
 function status_logs_common_code() {
 	global $g, $config, $specific_log, $nentries, $filterlogentries_qty, $logfile_path, $shortcut_section, $allowed_logs, $logfile;
diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php
index 41bd67d..211b5c8 100755
--- a/src/usr/local/www/status_logs_filter_dynamic.php
+++ b/src/usr/local/www/status_logs_filter_dynamic.php
@@ -63,14 +63,14 @@
 ##|*MATCH=status_logs_filter_dynamic.php*
 ##|-PRIV
 
-require_once("status_logs_common.inc");
-
-/* Hardcode this. AJAX doesn't do so well with large numbers */
-$nentries = 50;
 
 /* AJAX related routines */
-handle_ajax($nentries, $nentries + 20);
+require_once("guiconfig.inc");
+require_once("filter_log.inc");
+handle_ajax();
+
 
+require_once("status_logs_common.inc");
 
 /*
 Build a list of allowed log files so we can reject others to prevent the page
@@ -135,7 +135,6 @@ if ($filterlogentries_submit) {
 } else {
 	$filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filtertext, $interfacefilter);
 }
-#$filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100);
 ?>
 
 <script type="text/javascript">
@@ -147,13 +146,31 @@ if ($filterlogentries_submit) {
 	var isBusy = false;
 	var isPaused = false;
 	var nentries = <?=$nentries; ?>;
+
 <?php
-	if (isset($config['syslog']['reverse'])) {
+	# Build query string.
+	if ($filterlogentries_submit) {	# Formatted mode.
+		$filter_query_string = "type=formatted&filter=" . urlencode(json_encode($filterfieldsarray ));
+	}
+	if ($filtersubmit) {	# Raw mode.
+		$filter_query_string = "type=raw&filter=" . urlencode(json_encode($filtertext )) . "&interfacefilter=" . $interfacefilter;
+	}
+
+
+	# First get the "General Logging Options" (global) chronological order setting.  Then apply specific log override if set.
+	$reverse = isset($config['syslog']['reverse']);
+	$specific_log = basename($logfile, '.log') . '_settings';
+	if ($config['syslog'][$specific_log]['cronorder'] == 'forward') $reverse = false;
+	if ($config['syslog'][$specific_log]['cronorder'] == 'reverse') $reverse = true;
+
+	if ($reverse) {
 		echo "var isReverse = true;\n";
 	} else {
 		echo "var isReverse = false;\n";
 	}
 ?>
+	var filter_query_string = "<?=$filter_query_string . '&logfile=' . $logfile_path . '&nentries=' . $nentries?>";
+
 	/* Called by the AJAX updater */
 	function format_log_line(row) {
 		if (row[8] == '6') {
@@ -235,7 +252,7 @@ function fetch_new_rules() {
 		return;
 	}
 	isBusy = true;
-	getURL('status_logs_filter_dynamic.php?lastsawtime=' + lastsawtime, fetch_new_rules_callback);
+	getURL('status_logs_filter_dynamic.php?' + filter_query_string + '&lastsawtime=' + lastsawtime, fetch_new_rules_callback);
 }
 
 function fetch_new_rules_callback(callback_data) {