Merge branch 'beta'

ChangeLog

@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------
+Version 2.1.3 (devel), 2008-04-29
+- Fixed a bug in the installer, the table type was not written into the configuration.
+
+
 Version 2.1.2 (devel), 2008-04-28
 - Removed syslog sample logfile from samplelogs, fixed minor issue in the installer
 - Fixed bug in logstreamlineparsersyslog.class which failed to parse some rsyslog loglines.

src/classes/logstreamdb.class.php

@@ -758,7 +758,7 @@ class LogStreamDB extends LogStream {
 	*/
 	private function GetRowCountFromTable()
 	{
-		global $dbmapping;
+		global $dbmapping,$querycount;
 		$szTableType = $this->_logStreamConfigObj->DBTableType;
 		
 		// Create Statement and perform query!
@@ -769,6 +769,9 @@ class LogStreamDB extends LogStream {
 			$myRow = mysql_fetch_row($myQuery);
 			$numRows = $myRow[0];
 
+			// Increment for the Footer Stats 
+			$querycount++;
+
 			// Free query now
 			mysql_free_result ($myQuery); 
 		}