From b92b8d9740836659ffefde193185101c83c03e4b Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Wed, 19 Nov 2008 14:37:10 +0100
Subject: [PATCH 1/4] Added missing changelog comment

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 64255ff..155d8b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Version 2.5.20 (beta), 2008-11-19
 - Fixed a performance issue in the logstream db and pdo drivers when 
   using filters. This bug could cause script timeouts when using complex
   filters. 
+- Added default .htaccess to prevent webserver access on cron folder
 ---------------------------------------------------------------------------
 Version 2.5.19 (beta), 2008-11-18
 - Added a new "cron" folder which contains a maintenance.php script. 

From 89989a59780a746ac7268ced30777afba9952a05 Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Thu, 20 Nov 2008 16:50:38 +0100
Subject: [PATCH 2/4] Fixed an infinite loop bug which occured of Suppress
 Duplicated Messages was enabled

---
 src/index.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/index.php b/src/index.php
index 9be9544..614ddca 100644
--- a/src/index.php
+++ b/src/index.php
@@ -330,6 +330,13 @@ if ( isset($content['Sources'][$currentSourceID]) )
 							// Set last mgr
 							$szLastMessage = $logArray[SYSLOG_MESSAGE];
 
+							// --- Extra Loop to get the next entry!
+							do
+							{
+								$ret = $stream->ReadNext($uID, $logArray);
+							} while ( $ret == ERROR_MSG_SKIPMESSAGE );
+							// --- 
+
 							// Skip entry
 							continue;
 						}

From 46c86bd0542e76edefef082c668fbd503b501061 Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Tue, 25 Nov 2008 15:28:25 +0100
Subject: [PATCH 3/4] Fixed ignoring filter in export function

---
 src/export.php           | 1 +
 src/index.php            | 3 ---
 src/templates/index.html | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/export.php b/src/export.php
index 2c43404..2a13bfa 100644
--- a/src/export.php
+++ b/src/export.php
@@ -87,6 +87,7 @@ if (
 		$content['error_details'] = $content['LN_GEN_ERROR_PDFMISSINGEXTENSION'];
 	}
 */
+
 }
 else
 {
diff --git a/src/index.php b/src/index.php
index 614ddca..e68f8fe 100644
--- a/src/index.php
+++ b/src/index.php
@@ -40,9 +40,6 @@ include($gl_root_path . 'include/functions_common.php');
 include($gl_root_path . 'include/functions_frontendhelpers.php');
 include($gl_root_path . 'include/functions_filters.php');
 
-// Init Langauge first!
-// IncludeLanguageFile( $gl_root_path . '/lang/' . $LANG . '/main.php' );
-
 // Include LogStream facility
 include($gl_root_path . 'classes/logstream.class.php');
 
diff --git a/src/templates/index.html b/src/templates/index.html
index cc9d13a..824e05e 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -108,6 +108,7 @@
 				<td align="right">
 					<input type="hidden" name="op" value="export">
 					<input type="hidden" name="uid" value="{uid_original}">
+					<input type="hidden" name="filter" value="{searchstr}">
 					<!-- IF skipone="true" -->
 					<input type="hidden" name="skipone" value="true">
 					<!-- ENDIF skipone="true" -->

From 673b1863dff131e805548212e3d55706bdb36bfa Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Tue, 25 Nov 2008 15:56:48 +0100
Subject: [PATCH 4/4] Added changelog entry

---
 ChangeLog                        | 6 ++++++
 src/include/functions_common.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 155d8b0..1390bde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 ---------------------------------------------------------------------------
+Version 2.5.21 (beta), 2008-11-24
+- Fixed an infinite search loop which occured of the option 
+  "Suppress Duplicated Messages was enabled". This caused the index page 
+  to timeout once a duplicated message was hit. 
+- Fixed that filters were ignored when exporting results to cvs/xml
+---------------------------------------------------------------------------
 Version 2.5.20 (beta), 2008-11-19
 - Fixed a performance issue in the logstream db and pdo drivers when 
   using filters. This bug could cause script timeouts when using complex
diff --git a/src/include/functions_common.php b/src/include/functions_common.php
index 78ab106..c5b1252 100644
--- a/src/include/functions_common.php
+++ b/src/include/functions_common.php
@@ -66,7 +66,7 @@ $LANG_EN = "en";	// Used for fallback
 $LANG = "en";		// Default language
 
 // Default Template vars
-$content['BUILDNUMBER'] = "2.5.20";
+$content['BUILDNUMBER'] = "2.5.21";
 $content['TITLE'] = "phpLogCon :: Release " . $content['BUILDNUMBER'];	// Default page title 
 $content['BASEPATH'] = $gl_root_path;
 $content['SHOW_DONATEBUTTON'] = true; // Default = true!