From e73f3c160164b66d796d67ed6ebddd0853f2900b Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Fri, 25 Feb 2011 13:56:29 +0100
Subject: [PATCH] Fixed filter dialog issue parsing message filters wrong in
 Report Admin Panel.

Added missing mapping for ProcessID field into logstream constants.
---
 src/admin/reports.php               | 26 +++++++++++++++-----------
 src/include/constants_logstream.php |  1 +
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/admin/reports.php b/src/admin/reports.php
index 471e215..732b5c9 100644
--- a/src/admin/reports.php
+++ b/src/admin/reports.php
@@ -688,29 +688,30 @@ if ( isset($content['ISADDSAVEDREPORT']) && $content['ISADDSAVEDREPORT'] )
 						}
 						else if ( $tmpField['FieldType'] == FILTER_TYPE_STRING ) 
 						{
-							// Append Fieldname
-							$szFilterString .= $tmpField['SearchField']; 
+							// Append Fieldname, if set!
+							if (isset($tmpField['SearchField']) && strlen($tmpField['SearchField']) > 0 ) 
+								$szFilterString .= $tmpField['SearchField'] . ":"; 
 
 							// Append comparison
 							switch ( $tmpComparison ) 
 							{
 								case 1:		// FILTER_MODE_INCLUDE
-									$szFilterString .= ":"; 
+									$szFilterString .= ""; 
 									break; 
 								case 2:		// FILTER_MODE_EXCLUDE
-									$szFilterString .= ":-"; 
+									$szFilterString .= "-"; 
 									break; 
 								case 5:		// FILTER_MODE_INCLUDE + FILTER_MODE_SEARCHFULL
-									$szFilterString .= ":="; 
+									$szFilterString .= "="; 
 									break; 
 								case 6:		// FILTER_MODE_EXCLUDE + FILTER_MODE_SEARCHFULL
-									$szFilterString .= ":-="; 
+									$szFilterString .= "-="; 
 									break; 
 								case 9:		// FILTER_MODE_INCLUDE + FILTER_MODE_SEARCHREGEX
-									$szFilterString .= ":~"; 
+									$szFilterString .= "~"; 
 									break; 
 								case 10:	// FILTER_MODE_EXCLUDE + FILTER_MODE_SEARCHREGEX
-									$szFilterString .= ":-~"; 
+									$szFilterString .= "-~"; 
 									break; 
 							}
 
@@ -770,14 +771,17 @@ if ( isset($content['ISADDSAVEDREPORT']) && $content['ISADDSAVEDREPORT'] )
 				}
 				else if ( $myNewField['FieldType'] == FILTER_TYPE_STRING ) 
 				{
-					// Append sample filter
-					$szFilterString .= $myNewField['SearchField']. ":sample"; 
+					// Searchfield filter
+					if (isset($myNewField['SearchField']) && strlen($myNewField['SearchField']) > 0 ) 
+						$szFilterString .= $myNewField['SearchField'] . ":";
+					
+					// Append sample
+					$szFilterString .= "sample"; 
 				}
 			}
 			// Append to Filterstring
 		}
 	}
-
 	// Copy Final Filterstring if necessary
 	if ( strlen($szFilterString) > 0 ) 
 		$content['filterString'] = $szFilterString; 
diff --git a/src/include/constants_logstream.php b/src/include/constants_logstream.php
index 99b63c9..ce25ef4 100644
--- a/src/include/constants_logstream.php
+++ b/src/include/constants_logstream.php
@@ -350,6 +350,7 @@ $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_MESSAGE] = "Message";
 $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_FACILITY] = "Facility";
 $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_SEVERITY] = "Priority";
 $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_SYSLOGTAG] = "SysLogTag";
+$dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_PROCESSID] = "ProcessID";
 $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_EVENT_ID] = "EventID";
 $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_EVENT_LOGTYPE] = "EventLogType";
 $dbmapping['monitorware']['DBMAPPINGS'][SYSLOG_EVENT_SOURCE] = "EventSource";