Merge branch 'beta' into devel

Conflicts:

	src/include/functions_common.php

ChangeLog

@@ -1,8 +1,15 @@
 ---------------------------------------------------------------------------
+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
   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. 

src/export.php

@@ -87,6 +87,7 @@ if (
 		$content['error_details'] = $content['LN_GEN_ERROR_PDFMISSINGEXTENSION'];
 	}
 */
+
 }
 else
 {

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');
 
@@ -330,6 +327,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;
 						}

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" -->