tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-25 18:59:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed BUGID 369, defaultviewID was overwritten with hardcoded default

Browse Source
This commit is contained in:
Andre Lorbach 2012-12-04 14:09:50 +01:00
parent 3f99856430
commit 61d66a8543
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/functions_common.php
View File

@ -152,7 +152,7 @@ function GetFileLength($szFileName)
function InitPhpLogCon() function InitPhpLogCon()
{ {
// Needed to make global // Needed to make global
global $gl_root_path, $content; global $gl_root_path, $content, $CFG;
// Abort if already defined // Abort if already defined
if ( defined('PHPLOGCON_INITIALIZED') ) if ( defined('PHPLOGCON_INITIALIZED') )
@ -885,6 +885,8 @@ function InitConfigurationValues()
// Load Configured Sources // Load Configured Sources
LoadSourcesFromDatabase(); LoadSourcesFromDatabase();
} }
else else
{ {

5
src/include/functions_config.php
View File

@ -546,8 +546,9 @@ function InitViewConfigs()
'groupid' => null, 'groupid' => null,
); );
// Set default of 'DefaultViewsID' // Set default of 'DefaultViewsID' only if not set already!
$CFG['DefaultViewsID'] = "SYSLOG"; if ( !isset($CFG['DefaultViewsID']) )
$CFG['DefaultViewsID'] = "SYSLOG";
// Loop through views now and copy into content array! // Loop through views now and copy into content array!
foreach ( $CFG['Views'] as $key => $view ) foreach ( $CFG['Views'] as $key => $view )