Merge branch 'beta' into devel

src/classes/logstreamconfigdisk.class.php

@@ -39,10 +39,11 @@ if ( !defined('IN_PHPLOGCON') )
 // --- 
 
 class LogStreamConfigDisk extends LogStreamConfig {
+	// Public properties
 	public $FileName = '';
 	public $LineParserType = "syslog"; // Default = Syslog!
 	public $_lineParser = null;
-
+	
 	public function LogStreamFactory($o) 
 	{
 		// An instance is created, then include the logstreamdisk class as well!
@@ -79,5 +80,50 @@ class LogStreamConfigDisk extends LogStreamConfig {
 			DieWithErrorMsg("Couldn't locate LineParser include file '" . $strIncludeFile . "'");
 	}
 
+	/*
+	* Helper function to Set the FileName property
+	*/
+	public function SetFileName( $szNewVal )
+	{
+		// Replace dynamic variables if necessary
+		if ( strpos($szNewVal, "%") !== false )
+		{
+			OutputDebugMessage("LogStreamConfigDisk|SetFileName: Filename before replacing: " . $szNewVal, DEBUG_DEBUG);
+			
+			// Create search and replace array
+			$search = array ( 
+						"%y", /* Year with two digits (e.g. 2002 becomes "02") */
+						"%Y", /* Year with 4 digits */
+						"%m", /* Month with two digits (e.g. March becomes "03") */
+						"%M", /* Minute with two digits */
+						"%d", /* Day of month with two digits (e.g. March, 1st becomes "01") */
+						"%h", /* Hour as two digits */
+						"%S", /* Seconds as two digits. It is hardly believed that this ever be used in reality.    */
+						"%w", /* Weekday as one digit. 0 means Sunday, 1 Monday and so on. */
+						"%W", /* Weekday as three-character string. Possible values are "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat". */
+						);
+			$replace = array (
+						date("y"),
+						date("Y"), 
+						date("m"), 
+						date("i"), 
+						date("d"), 
+						date("H"), 
+						date("s"), 
+						date("w"), 
+						date("D"), 
+						);
+			
+			// Do the replacing
+			$szNewVal = str_replace( $search, $replace, $szNewVal );
+
+			OutputDebugMessage("LogStreamConfigDisk|SetFileName: Filename after replacing: " . $szNewVal, DEBUG_DEBUG);
+		}
+
+		// Set Filename Property!
+		$this->FileName = $szNewVal;
+	}
+
+
 }
-?>
+?>

src/classes/logstreamdb.class.php

@@ -1058,8 +1058,9 @@ class LogStreamDB extends LogStream {
 			// Check if result was successfull!
 			if ( $myRow === FALSE || !$myRow  )
 				break;
-
-			$this->bufferedRecords[$iBegin] = $myRow;
+			
+			// Keys will be converted into lowercase!
+			$this->bufferedRecords[$iBegin] = array_change_key_case($myRow, CASE_LOWER);
 			$iBegin++;
 		}
 

src/classes/logstreampdo.class.php

@@ -1057,7 +1057,8 @@ class LogStreamPDO extends LogStream {
 			if ( $myRow === FALSE || !$myRow  )
 				break;
 
-			$this->bufferedRecords[$iBegin] = $myRow;
+			// Keys will be converted into lowercase!
+			$this->bufferedRecords[$iBegin] = array_change_key_case($myRow);
 			$iBegin++;
 
 			// Increment counter

src/include/db_template.txt

@@ -11,8 +11,8 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 DROP TABLE IF EXISTS `logcon_config`;
 CREATE TABLE `logcon_config` (
   `propname` varchar(32) NOT NULL,
-  `propvalue` varchar(255) NOT NULL,
-  `propvalue_text` text NOT NULL,
+  `propvalue` varchar(255) NULL,
+  `propvalue_text` text NULL,
   `is_global` tinyint(1) NOT NULL,
   `userid` int(11) default NULL,
   `groupid` int(11) default NULL

src/include/functions_config.php

@@ -129,7 +129,7 @@ function InitSource(&$mysource)
 			// Perform necessary include
 			require_once($gl_root_path . 'classes/logstreamconfigdisk.class.php');
 			$mysource['ObjRef'] = new LogStreamConfigDisk();
-			$mysource['ObjRef']->FileName = $mysource['DiskFile'];
+			$mysource['ObjRef']->SetFileName( $mysource['DiskFile'] );
 			$mysource['ObjRef']->LineParserType = $mysource['LogLineType'];
 		}
 		else if ( $mysource['SourceType'] == SOURCE_DB )

src/include/functions_frontendhelpers.php

@@ -239,6 +239,8 @@ function OutputDebugMessage($szDbg, $szDbgLevel = DEBUG_INFO)
 	// Check if we should print the Error!
 	if ( GetConfigSetting("MiscShowDebugMsg", 0, CFGLEVEL_USER) == 1 )
 	{
+		// Set Debugshow true
+		$content['SHOWDEBUGMSG'] = true;
 		$content['DEBUGMSG'][] = array( 
 			"DBGLEVEL" => $szDbgLevel, 
 			"DBGLEVELTXT" => GetDebugModeString($szDbgLevel), 

src/templates/include_footer.html

@@ -36,20 +36,23 @@
 </table>
 
 
-<!-- BEGIN DEBUGMSG -->
+
+<!-- IF SHOWDEBUGMSG="true" -->
 <table width="100%" border="0" cellspacing="1" cellpadding="2" align="center" class="with_border">
 <tr> 
 	<td nowrap align="left" nowrap valign="top" class="cellmenu1_naked">{LN_DEBUGLEVEL}</td>
 	<td align="center" nowrap valign="top" class="cellmenu1_naked" width="100%">{LN_DEBUGMESSAGE}</td>
 </tr>
-<tr>
-	<td nowrap align="center" nowrap valign="top" class="lineColouredWhite" bgcolor="{DBGLEVELBG}"><B>{DBGLEVELTXT}</B></td>
-	<td align="left" nowrap valign="middle" class="line1">
-	<div id="SearchCode">{DBGMSG}</div>
-	</td>
-</tr>
+	<!-- BEGIN DEBUGMSG -->
+	<tr>
+		<td nowrap align="center" nowrap valign="top" class="lineColouredWhite" bgcolor="{DBGLEVELBG}"><B>{DBGLEVELTXT}</B></td>
+		<td align="left" nowrap valign="middle" class="line1">
+		<div id="SearchCode">{DBGMSG}</div>
+		</td>
+	</tr>
+	<!-- END DEBUGMSG -->
 </table>
-<!-- END DEBUGMSG -->
+<!-- ENDIF SHOWDEBUGMSG="true" -->
 
 {EXTRA_FOOTER}
 </body>