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

Fixed minor bug reading the correct default view for sources from DB

Browse Source
This commit is contained in:
Andre Lorbach 2008-07-25 13:34:24 +02:00
parent bdf77d5208
commit 0ad4650993
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/include/functions_config.php
View File

@ -75,20 +75,30 @@ function InitSourceConfigs()
}
// ---
// Set different view if necessary
// Set default view id to source
$szDefaultViewID = isset($CFG['DefaultViewsID']) && strlen($CFG['DefaultViewsID']) > 0 ? $CFG['DefaultViewsID'] : "SYSLOG";
if ( isset($_SESSION[$iSourceID . "-View"]) )
{
// Overwrite configured view!
$content['Sources'][$iSourceID]['ViewID'] = $_SESSION[$iSourceID . "-View"];
// check if view is valid
$UserSessionViewID = $_SESSION[$iSourceID . "-View"];
if ( isset($content['Views'][$UserSessionViewID]) )
{
// Overwrite configured view!
$content['Sources'][$iSourceID]['ViewID'] = $_SESSION[$iSourceID . "-View"];
}
else
$content['Sources'][$iSourceID]['ViewID'] = $szDefaultViewID;
}
else
{
if ( isset($mysource['ViewID']) && strlen($mysource['ViewID']) > 0 )
if ( isset($mysource['ViewID']) && strlen($mysource['ViewID']) > 0 && isset($content['Views'][ $mysource['ViewID'] ]) )
// Set to configured Source ViewID
$content['Sources'][$iSourceID]['ViewID'] = $mysource['ViewID'];
else
// Not configured, maybe old legacy cfg. Set default view.
$content['Sources'][$iSourceID]['ViewID'] = strlen($CFG['DefaultViewsID']) > 0 ? $CFG['DefaultViewsID'] : "SYSLOG";
$content['Sources'][$iSourceID]['ViewID'] = $szDefaultViewID;
}
// Only for the display box