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

Removed FieldCaptions from language files, and merged them into constants $fields array

Browse Source 
This change is necessary for future changes
This commit is contained in:
Andre Lorbach 2008-10-07 16:30:11 +02:00
parent bb44939d7c
commit 01d1874b9d
16 changed files with 85 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/admin/views.php
View File

@ -223,8 +223,8 @@ if ( isset($content['ISEDITORNEWVIEW']) && $content['ISEDITORNEWVIEW'] )
foreach ($content['SUBCOLUMNS'] as $key => &$myColumn ) foreach ($content['SUBCOLUMNS'] as $key => &$myColumn )
{ {
// Set Fieldcaption // Set Fieldcaption
if ( isset($fields[$key]) && isset($content[ $fields[$key]['FieldCaptionID'] ]) ) if ( isset($fields[$key]) && isset($fields[$key]['FieldCaption']) )
$myColumn['ColCaption'] = $content[ $fields[$key]['FieldCaptionID'] ]; $myColumn['ColCaption'] = $fields[$key]['FieldCaption'];
else else
$myColumn['ColCaption'] = $key; $myColumn['ColCaption'] = $key;
@ -256,8 +256,8 @@ if ( isset($content['ISEDITORNEWVIEW']) && $content['ISEDITORNEWVIEW'] )
foreach ($content['FIELDS'] as $key => &$myField ) foreach ($content['FIELDS'] as $key => &$myField )
{ {
// Set Fieldcaption // Set Fieldcaption
if ( isset($content[ $myField['FieldCaptionID'] ]) ) if ( isset($myField['FieldCaption']) )
$myField['FieldCaption'] = $content[ $myField['FieldCaptionID'] ]; $myField['FieldCaption'] = $myField['FieldCaption'];
else else
$myField['FieldCaption'] = $key; $myField['FieldCaption'] = $key;
} }
@ -311,8 +311,8 @@ if ( isset($_POST['op']) )
$content['SUBCOLUMNS'][$szColId]['ColFieldID'] = $szColId; $content['SUBCOLUMNS'][$szColId]['ColFieldID'] = $szColId;
// Set Fieldcaption // Set Fieldcaption
if ( isset($content[ $fields[$szColId]['FieldCaptionID'] ]) ) if ( isset($fields[$szColId]['FieldCaption']) )
$content['SUBCOLUMNS'][$szColId]['ColCaption'] = $content[ $fields[$szColId]['FieldCaptionID'] ]; $content['SUBCOLUMNS'][$szColId]['ColCaption'] = $fields[$szColId]['FieldCaption'];
else else
$content['SUBCOLUMNS'][$szColId]['ColCaption'] = $szColId; $content['SUBCOLUMNS'][$szColId]['ColCaption'] = $szColId;
@ -338,8 +338,8 @@ if ( isset($_POST['op']) )
$content['FIELDS'][$szColId] = $szColId; $content['FIELDS'][$szColId] = $szColId;
// Set Fieldcaption // Set Fieldcaption
if ( isset($fields[$szColId]) && isset($content[ $fields[$szColId]['FieldCaptionID'] ]) ) if ( isset($fields[$szColId]) && isset($fields[$szColId]['FieldCaption']) )
$content['FIELDS'][$szColId]['FieldCaption'] = $content[ $fields[$szColId]['FieldCaptionID'] ]; $content['FIELDS'][$szColId]['FieldCaption'] = $fields[$szColId]['FieldCaption'];
else else
$content['FIELDS'][$szColId]['FieldCaption'] = $szColId; $content['FIELDS'][$szColId]['FieldCaption'] = $szColId;
} }
@ -543,8 +543,8 @@ if ( !isset($_POST['op']) && !isset($_GET['op']) )
foreach ($myView['Columns'] as $myCol ) foreach ($myView['Columns'] as $myCol )
{ {
// Get Fieldcaption // Get Fieldcaption
if ( isset($fields[$myCol]) && isset($content[ $fields[$myCol]['FieldCaptionID'] ]) ) if ( isset($fields[$myCol]) && isset($fields[$myCol]['FieldCaption']) )
$myView['COLUMNS'][$myCol]['FieldCaption'] = $content[ $fields[$myCol]['FieldCaptionID'] ]; $myView['COLUMNS'][$myCol]['FieldCaption'] = $fields[$myCol]['FieldCaption'];
else else
$myView['COLUMNS'][$myCol]['FieldCaption'] = $myCol; $myView['COLUMNS'][$myCol]['FieldCaption'] = $myCol;

28
src/asktheoracle.php
View File

@ -131,34 +131,6 @@ foreach( $content['Sources'] as $mySource )
// Add to help Link array! // Add to help Link array!
$content['HelpLinks'][] = $myHelpLink; $content['HelpLinks'][] = $myHelpLink;
} }
/*
if ( isset($content['Sources'][$currentSourceID]) ) // && $content['uid_current'] != UID_UNKNOWN ) // && $content['Sources'][$currentSourceID]['SourceType'] == SOURCE_DISK )
{
// Obtain and get the Config Object
$stream_config = $content['Sources'][$currentSourceID]['ObjRef'];
// Create LogStream Object
$stream = $stream_config->LogStreamFactory($stream_config);
// $stream->SetFilter($content['searchstr']);
// --- Init the fields we need
foreach($fields as $mycolkey => $myfield)
{
$content['fields'][$mycolkey]['FieldID'] = $mycolkey;
$content['fields'][$mycolkey]['FieldCaption'] = $content[ $myfield['FieldCaptionID'] ];
$content['fields'][$mycolkey]['FieldType'] = $myfield['FieldType'];
$content['fields'][$mycolkey]['DefaultWidth'] = $myfield['DefaultWidth'];
// Append to columns array
$content['AllColumns'][] = $mycolkey;
}
// ---
// Close file!
$stream->Close();
}
*/
// --- // ---
// --- BEGIN CREATE TITLE // --- BEGIN CREATE TITLE

10
src/chartgenerator.php
View File

@ -156,7 +156,7 @@ if ( !$content['error_occured'] )
else else
$chartImageMapLinks[] = ""; $chartImageMapLinks[] = "";
$chartImageMapAlts[] = $content[ $fields[$content['chart_field']]['FieldCaptionID'] ] . ": " . $myKey; $chartImageMapAlts[] = $fields[$content['chart_field']]['FieldCaption'] . ": " . $myKey;
$chartImageMapTargets[] ="_top"; $chartImageMapTargets[] ="_top";
} }
@ -174,12 +174,12 @@ if ( !$content['error_occured'] )
$graph->SetBox(); // Box around plotarea $graph->SetBox(); // Box around plotarea
// Set up the title for the graph // Set up the title for the graph
// $graph->title->Set('Messagecount sorted by "' . $content[ $fields[$content['chart_field']]['FieldCaptionID'] ] . '"'); // $graph->title->Set('Messagecount sorted by "' . $content[ $fields[$content['chart_field']]['FieldCaption'] ] . '"');
// $graph->title->SetFont(FF_VERDANA,FS_NORMAL,12); // $graph->title->SetFont(FF_VERDANA,FS_NORMAL,12);
// $graph->title->SetColor("darkred"); // $graph->title->SetColor("darkred");
// Setup the tab title // Setup the tab title
$graph->tabtitle->Set( GetAndReplaceLangStr($content['LN_STATS_CHARTTITLE'], $content['maxrecords'], $content[ $fields[$content['chart_field']]['FieldCaptionID'] ]) ); $graph->tabtitle->Set( GetAndReplaceLangStr($content['LN_STATS_CHARTTITLE'], $content['maxrecords'], $fields[$content['chart_field']]['FieldCaption']) );
$graph->tabtitle->SetFont(FF_VERA,FS_BOLD,9); $graph->tabtitle->SetFont(FF_VERA,FS_BOLD,9);
$graph->tabtitle->SetPos('left'); $graph->tabtitle->SetPos('left');
@ -273,7 +273,7 @@ if ( !$content['error_occured'] )
$graph->yaxis->SetFont(FF_VERA,FS_NORMAL,8); $graph->yaxis->SetFont(FF_VERA,FS_NORMAL,8);
// Setup the tab title // Setup the tab title
$graph->tabtitle->Set( GetAndReplaceLangStr($content['LN_STATS_CHARTTITLE'], $content['maxrecords'], $content[ $fields[$content['chart_field']]['FieldCaptionID'] ]) ); $graph->tabtitle->Set( GetAndReplaceLangStr($content['LN_STATS_CHARTTITLE'], $content['maxrecords'], $fields[$content['chart_field']]['FieldCaption']) );
$graph->tabtitle->SetFont(FF_VERA,FS_BOLD,9); $graph->tabtitle->SetFont(FF_VERA,FS_BOLD,9);
$graph->tabtitle->SetPos('left'); $graph->tabtitle->SetPos('left');
@ -363,7 +363,7 @@ if ( !$content['error_occured'] )
$graph->yaxis->SetFont(FF_VERA,FS_NORMAL,8); $graph->yaxis->SetFont(FF_VERA,FS_NORMAL,8);
// Setup the tab title // Setup the tab title
$graph->tabtitle->Set( GetAndReplaceLangStr($content['LN_STATS_CHARTTITLE'], $content['maxrecords'], $content[ $fields[$content['chart_field']]['FieldCaptionID'] ]) ); $graph->tabtitle->Set( GetAndReplaceLangStr($content['LN_STATS_CHARTTITLE'], $content['maxrecords'], $fields[$content['chart_field']]['FieldCaption']) );
$graph->tabtitle->SetFont(FF_VERA,FS_BOLD,9); $graph->tabtitle->SetFont(FF_VERA,FS_BOLD,9);
$graph->tabtitle->SetPos('right'); $graph->tabtitle->SetPos('right');
$graph->tabtitle->SetTabAlign('right'); $graph->tabtitle->SetTabAlign('right');

6
src/classes/msgparsers/msgparser.apache2.class.php
View File

@ -121,10 +121,10 @@ class MsgParser_apache2 extends MsgParser {
foreach ( $myFields as $myField ) foreach ( $myFields as $myField )
{ {
// Set Field Caption // Set Field Caption
if ( isset($content[ $fields[$myField]['FieldCaptionID'] ]) ) if ( isset($fields[$myField]['FieldCaption']) )
$szFieldName = $content[ $fields[$myField]['FieldCaptionID'] ]; $szFieldName = $fields[$myField]['FieldCaption'];
else else
$szFieldName = $fields[$myField]['FieldCaptionID']; $szFieldName = $myField;
// Append Field into msg // Append Field into msg
$szTmpMsg = $szFieldName . ": '" . $arrArguments[$myField] . "'\n" . $szTmpMsg; $szTmpMsg = $szFieldName . ": '" . $arrArguments[$myField] . "'\n" . $szTmpMsg;

6
src/classes/msgparsers/msgparser.apache2common.class.php
View File

@ -119,10 +119,10 @@ class MsgParser_apache2common extends MsgParser {
foreach ( $myFields as $myField ) foreach ( $myFields as $myField )
{ {
// Set Field Caption // Set Field Caption
if ( isset($content[ $fields[$myField]['FieldCaptionID'] ]) ) if ( isset($fields[$myField]['FieldCaption']) )
$szFieldName = $content[ $fields[$myField]['FieldCaptionID'] ]; $szFieldName = $fields[$myField]['FieldCaption'];
else else
$szFieldName = $fields[$myField]['FieldCaptionID']; $szFieldName = $myField;
// Append Field into msg // Append Field into msg
$szTmpMsg = $szFieldName . ": '" . $arrArguments[$myField] . "'\n" . $szTmpMsg; $szTmpMsg = $szFieldName . ": '" . $arrArguments[$myField] . "'\n" . $szTmpMsg;

6
src/classes/msgparsers/msgparser.eventlog.class.php
View File

@ -90,10 +90,10 @@ class MsgParser_eventlog extends MsgParser {
foreach ( $myFields as $myField ) foreach ( $myFields as $myField )
{ {
// Set Field Caption // Set Field Caption
if ( isset($content[ $fields[$myField]['FieldCaptionID'] ]) ) if ( isset($fields[$myField]['FieldCaption']) )
$szFieldName = $content[ $fields[$myField]['FieldCaptionID'] ]; $szFieldName = $fields[$myField]['FieldCaption'];
else else
$szFieldName = $fields[$myField]['FieldCaptionID']; $szFieldName = $myField;
// Append Field into msg // Append Field into msg
$szTmpMsg = $szFieldName . ": '" . $arrArguments[$myField] . "'\n" . $szTmpMsg; $szTmpMsg = $szFieldName . ": '" . $arrArguments[$myField] . "'\n" . $szTmpMsg;

6
src/classes/msgparsers/msgparser.iis.class.php
View File

@ -128,10 +128,10 @@ class MsgParser_iis extends MsgParser {
foreach ( $myFields as $myField ) foreach ( $myFields as $myField )
{ {
// Set Field Caption // Set Field Caption
if ( isset($content[ $fields[$myField]['FieldCaptionID'] ]) ) if ( isset($fields[$myField]['FieldCaption']) )
$szFieldName = $content[ $fields[$myField]['FieldCaptionID'] ]; $szFieldName = $fields[$myField]['FieldCaption'];
else else
$szFieldName = $fields[$myField]['FieldCaptionID']; $szFieldName = $myField;
// Append Field into msg // Append Field into msg
$szTmpMsg = $szFieldName . ": '" . $arrArguments[$myField] . "'\n" . $szTmpMsg; $szTmpMsg = $szFieldName . ": '" . $arrArguments[$myField] . "'\n" . $szTmpMsg;

2
src/details.php
View File

@ -110,7 +110,7 @@ if ( isset($content['Sources'][$currentSourceID]) ) // && $content['uid_current'
foreach($fields as $mycolkey => $myfield) foreach($fields as $mycolkey => $myfield)
{ {
$content['fields'][$mycolkey]['FieldID'] = $mycolkey; $content['fields'][$mycolkey]['FieldID'] = $mycolkey;
$content['fields'][$mycolkey]['FieldCaption'] = $content[ $myfield['FieldCaptionID'] ]; $content['fields'][$mycolkey]['FieldCaption'] = $myfield['FieldCaption'];
$content['fields'][$mycolkey]['FieldType'] = $myfield['FieldType']; $content['fields'][$mycolkey]['FieldType'] = $myfield['FieldType'];
$content['fields'][$mycolkey]['DefaultWidth'] = $myfield['DefaultWidth']; $content['fields'][$mycolkey]['DefaultWidth'] = $myfield['DefaultWidth'];

9
src/export.php
View File

@ -146,7 +146,7 @@ if ( !$content['error_occured'] )
if ( isset($fields[$mycolkey]) ) if ( isset($fields[$mycolkey]) )
{ {
$content['fields'][$mycolkey]['FieldID'] = $mycolkey; $content['fields'][$mycolkey]['FieldID'] = $mycolkey;
$content['fields'][$mycolkey]['FieldCaption'] = $content[ $fields[$mycolkey]['FieldCaptionID'] ]; $content['fields'][$mycolkey]['FieldCaption'] = $fields[$mycolkey]['FieldCaption'];
$content['fields'][$mycolkey]['FieldType'] = $fields[$mycolkey]['FieldType']; $content['fields'][$mycolkey]['FieldType'] = $fields[$mycolkey]['FieldType'];
$content['fields'][$mycolkey]['DefaultWidth'] = $fields[$mycolkey]['DefaultWidth']; $content['fields'][$mycolkey]['DefaultWidth'] = $fields[$mycolkey]['DefaultWidth'];
} }
@ -344,7 +344,7 @@ else
$szOutputContent .= ","; $szOutputContent .= ",";
// Append column name // Append column name
$szOutputContent .= $content[ $fields[$mycolkey]['FieldCaptionID'] ]; $szOutputContent .= $fields[$mycolkey]['FieldCaption'];
} }
} }
@ -392,11 +392,6 @@ else
// --- Process columns // --- Process columns
foreach($mySyslogMessage as $myColkey => $mySyslogField) foreach($mySyslogMessage as $myColkey => $mySyslogField)
{ {
// if ( isset($content[ $fields[$mycolkey]['FieldCaptionID'] ]) )
// $szNodeTitle = $content[ $fields[$mycolkey]['FieldCaptionID'] ];
// else
// Append field content | first run htmlentities,tnen utf8 encoding!! // Append field content | first run htmlentities,tnen utf8 encoding!!
$szXmlLine .= "\t\t<" . $myColkey . ">" . utf8_encode( htmlentities($mySyslogField['fieldvalue']) ) . "</" . $myColkey . ">\n"; $szXmlLine .= "\t\t<" . $myColkey . ">" . utf8_encode( htmlentities($mySyslogField['fieldvalue']) ) . "</" . $myColkey . ">\n";
} }

46
src/include/constants_logstream.php
View File

@ -79,26 +79,26 @@ define('FILTER_TYPE_UNKNOWN', 99);
// --- Predefine fields array! // --- Predefine fields array!
$fields[SYSLOG_UID]['FieldID'] = SYSLOG_UID; $fields[SYSLOG_UID]['FieldID'] = SYSLOG_UID;
$fields[SYSLOG_UID]['FieldCaptionID'] = 'LN_FIELDS_UID'; $fields[SYSLOG_UID]['FieldCaption'] = 'uID';
$fields[SYSLOG_UID]['FieldType'] = FILTER_TYPE_NUMBER; $fields[SYSLOG_UID]['FieldType'] = FILTER_TYPE_NUMBER;
$fields[SYSLOG_UID]['Sortable'] = false; $fields[SYSLOG_UID]['Sortable'] = false;
$fields[SYSLOG_UID]['DefaultWidth'] = "50"; $fields[SYSLOG_UID]['DefaultWidth'] = "50";
$fields[SYSLOG_UID]['FieldAlign'] = "center"; $fields[SYSLOG_UID]['FieldAlign'] = "center";
$fields[SYSLOG_DATE]['FieldID'] = SYSLOG_DATE; $fields[SYSLOG_DATE]['FieldID'] = SYSLOG_DATE;
$fields[SYSLOG_DATE]['FieldCaptionID'] = 'LN_FIELDS_DATE'; $fields[SYSLOG_DATE]['FieldCaption'] = 'Date';
$fields[SYSLOG_DATE]['FieldType'] = FILTER_TYPE_DATE; $fields[SYSLOG_DATE]['FieldType'] = FILTER_TYPE_DATE;
$fields[SYSLOG_DATE]['Sortable'] = true; $fields[SYSLOG_DATE]['Sortable'] = true;
$fields[SYSLOG_DATE]['DefaultWidth'] = "115"; $fields[SYSLOG_DATE]['DefaultWidth'] = "115";
$fields[SYSLOG_DATE]['FieldAlign'] = "center"; $fields[SYSLOG_DATE]['FieldAlign'] = "center";
$fields[SYSLOG_HOST]['FieldID'] = SYSLOG_HOST; $fields[SYSLOG_HOST]['FieldID'] = SYSLOG_HOST;
$fields[SYSLOG_HOST]['FieldCaptionID'] = 'LN_FIELDS_HOST'; $fields[SYSLOG_HOST]['FieldCaption'] = 'Host';
$fields[SYSLOG_HOST]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_HOST]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_HOST]['Sortable'] = true; $fields[SYSLOG_HOST]['Sortable'] = true;
$fields[SYSLOG_HOST]['DefaultWidth'] = "80"; $fields[SYSLOG_HOST]['DefaultWidth'] = "80";
$fields[SYSLOG_HOST]['FieldAlign'] = "left"; $fields[SYSLOG_HOST]['FieldAlign'] = "left";
$fields[SYSLOG_HOST]['SearchField'] = "source"; $fields[SYSLOG_HOST]['SearchField'] = "source";
$fields[SYSLOG_MESSAGETYPE]['FieldID'] = SYSLOG_MESSAGETYPE; $fields[SYSLOG_MESSAGETYPE]['FieldID'] = SYSLOG_MESSAGETYPE;
$fields[SYSLOG_MESSAGETYPE]['FieldCaptionID'] = 'LN_FIELDS_MESSAGETYPE'; $fields[SYSLOG_MESSAGETYPE]['FieldCaption'] = 'Messagetype';
$fields[SYSLOG_MESSAGETYPE]['FieldType'] = FILTER_TYPE_NUMBER; $fields[SYSLOG_MESSAGETYPE]['FieldType'] = FILTER_TYPE_NUMBER;
$fields[SYSLOG_MESSAGETYPE]['Sortable'] = true; $fields[SYSLOG_MESSAGETYPE]['Sortable'] = true;
$fields[SYSLOG_MESSAGETYPE]['DefaultWidth'] = "90"; $fields[SYSLOG_MESSAGETYPE]['DefaultWidth'] = "90";
@ -107,28 +107,28 @@ $fields[SYSLOG_MESSAGETYPE]['SearchField'] = "messagetype";
// Syslog specific // Syslog specific
$fields[SYSLOG_FACILITY]['FieldID'] = SYSLOG_FACILITY; $fields[SYSLOG_FACILITY]['FieldID'] = SYSLOG_FACILITY;
$fields[SYSLOG_FACILITY]['FieldCaptionID'] = 'LN_FIELDS_FACILITY'; $fields[SYSLOG_FACILITY]['FieldCaption'] = 'Facility';
$fields[SYSLOG_FACILITY]['FieldType'] = FILTER_TYPE_NUMBER; $fields[SYSLOG_FACILITY]['FieldType'] = FILTER_TYPE_NUMBER;
$fields[SYSLOG_FACILITY]['Sortable'] = true; $fields[SYSLOG_FACILITY]['Sortable'] = true;
$fields[SYSLOG_FACILITY]['DefaultWidth'] = "50"; $fields[SYSLOG_FACILITY]['DefaultWidth'] = "50";
$fields[SYSLOG_FACILITY]['FieldAlign'] = "center"; $fields[SYSLOG_FACILITY]['FieldAlign'] = "center";
$fields[SYSLOG_FACILITY]['SearchField'] = "facility"; $fields[SYSLOG_FACILITY]['SearchField'] = "facility";
$fields[SYSLOG_SEVERITY]['FieldID'] = SYSLOG_SEVERITY; $fields[SYSLOG_SEVERITY]['FieldID'] = SYSLOG_SEVERITY;
$fields[SYSLOG_SEVERITY]['FieldCaptionID'] = 'LN_FIELDS_SEVERITY'; $fields[SYSLOG_SEVERITY]['FieldCaption'] = 'Severity';
$fields[SYSLOG_SEVERITY]['FieldType'] = FILTER_TYPE_NUMBER; $fields[SYSLOG_SEVERITY]['FieldType'] = FILTER_TYPE_NUMBER;
$fields[SYSLOG_SEVERITY]['Sortable'] = true; $fields[SYSLOG_SEVERITY]['Sortable'] = true;
$fields[SYSLOG_SEVERITY]['DefaultWidth'] = "50"; $fields[SYSLOG_SEVERITY]['DefaultWidth'] = "50";
$fields[SYSLOG_SEVERITY]['FieldAlign'] = "center"; $fields[SYSLOG_SEVERITY]['FieldAlign'] = "center";
$fields[SYSLOG_SEVERITY]['SearchField'] = "severity"; $fields[SYSLOG_SEVERITY]['SearchField'] = "severity";
$fields[SYSLOG_SYSLOGTAG]['FieldID'] = SYSLOG_SYSLOGTAG; $fields[SYSLOG_SYSLOGTAG]['FieldID'] = SYSLOG_SYSLOGTAG;
$fields[SYSLOG_SYSLOGTAG]['FieldCaptionID'] = 'LN_FIELDS_SYSLOGTAG'; $fields[SYSLOG_SYSLOGTAG]['FieldCaption'] = 'Syslogtag';
$fields[SYSLOG_SYSLOGTAG]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_SYSLOGTAG]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_SYSLOGTAG]['Sortable'] = true; $fields[SYSLOG_SYSLOGTAG]['Sortable'] = true;
$fields[SYSLOG_SYSLOGTAG]['DefaultWidth'] = "85"; $fields[SYSLOG_SYSLOGTAG]['DefaultWidth'] = "85";
$fields[SYSLOG_SYSLOGTAG]['FieldAlign'] = "left"; $fields[SYSLOG_SYSLOGTAG]['FieldAlign'] = "left";
$fields[SYSLOG_SYSLOGTAG]['SearchField'] = "syslogtag"; $fields[SYSLOG_SYSLOGTAG]['SearchField'] = "syslogtag";
$fields[SYSLOG_PROCESSID]['FieldID'] = SYSLOG_PROCESSID; $fields[SYSLOG_PROCESSID]['FieldID'] = SYSLOG_PROCESSID;
$fields[SYSLOG_PROCESSID]['FieldCaptionID'] = 'LN_FIELDS_PROCESSID'; $fields[SYSLOG_PROCESSID]['FieldCaption'] = 'ProcessID';
$fields[SYSLOG_PROCESSID]['FieldType'] = FILTER_TYPE_NUMBER; $fields[SYSLOG_PROCESSID]['FieldType'] = FILTER_TYPE_NUMBER;
$fields[SYSLOG_PROCESSID]['Sortable'] = true; $fields[SYSLOG_PROCESSID]['Sortable'] = true;
$fields[SYSLOG_PROCESSID]['DefaultWidth'] = "65"; $fields[SYSLOG_PROCESSID]['DefaultWidth'] = "65";
@ -137,35 +137,35 @@ $fields[SYSLOG_PROCESSID]['SearchField'] = "processid";
// EventLog specific // EventLog specific
$fields[SYSLOG_EVENT_ID]['FieldID'] = SYSLOG_EVENT_ID; $fields[SYSLOG_EVENT_ID]['FieldID'] = SYSLOG_EVENT_ID;
$fields[SYSLOG_EVENT_ID]['FieldCaptionID'] = 'LN_FIELDS_EVENTID'; $fields[SYSLOG_EVENT_ID]['FieldCaption'] = 'Event ID';
$fields[SYSLOG_EVENT_ID]['FieldType'] = FILTER_TYPE_NUMBER; $fields[SYSLOG_EVENT_ID]['FieldType'] = FILTER_TYPE_NUMBER;
$fields[SYSLOG_EVENT_ID]['Sortable'] = true; $fields[SYSLOG_EVENT_ID]['Sortable'] = true;
$fields[SYSLOG_EVENT_ID]['DefaultWidth'] = "65"; $fields[SYSLOG_EVENT_ID]['DefaultWidth'] = "65";
$fields[SYSLOG_EVENT_ID]['FieldAlign'] = "center"; $fields[SYSLOG_EVENT_ID]['FieldAlign'] = "center";
$fields[SYSLOG_EVENT_ID]['SearchField'] = "eventid"; $fields[SYSLOG_EVENT_ID]['SearchField'] = "eventid";
$fields[SYSLOG_EVENT_LOGTYPE]['FieldID'] = SYSLOG_EVENT_LOGTYPE; $fields[SYSLOG_EVENT_LOGTYPE]['FieldID'] = SYSLOG_EVENT_LOGTYPE;
$fields[SYSLOG_EVENT_LOGTYPE]['FieldCaptionID'] = 'LN_FIELDS_EVENTLOGTYPE'; $fields[SYSLOG_EVENT_LOGTYPE]['FieldCaption'] = 'Eventlog Type';
$fields[SYSLOG_EVENT_LOGTYPE]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_EVENT_LOGTYPE]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_EVENT_LOGTYPE]['Sortable'] = true; $fields[SYSLOG_EVENT_LOGTYPE]['Sortable'] = true;
$fields[SYSLOG_EVENT_LOGTYPE]['DefaultWidth'] = "100"; $fields[SYSLOG_EVENT_LOGTYPE]['DefaultWidth'] = "100";
$fields[SYSLOG_EVENT_LOGTYPE]['FieldAlign'] = "left"; $fields[SYSLOG_EVENT_LOGTYPE]['FieldAlign'] = "left";
$fields[SYSLOG_EVENT_LOGTYPE]['SearchField'] = "eventlogtype"; $fields[SYSLOG_EVENT_LOGTYPE]['SearchField'] = "eventlogtype";
$fields[SYSLOG_EVENT_SOURCE]['FieldID'] = SYSLOG_EVENT_SOURCE; $fields[SYSLOG_EVENT_SOURCE]['FieldID'] = SYSLOG_EVENT_SOURCE;
$fields[SYSLOG_EVENT_SOURCE]['FieldCaptionID'] = 'LN_FIELDS_EVENTSOURCE'; $fields[SYSLOG_EVENT_SOURCE]['FieldCaption'] = 'Event Source';
$fields[SYSLOG_EVENT_SOURCE]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_EVENT_SOURCE]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_EVENT_SOURCE]['Sortable'] = true; $fields[SYSLOG_EVENT_SOURCE]['Sortable'] = true;
$fields[SYSLOG_EVENT_SOURCE]['DefaultWidth'] = "100"; $fields[SYSLOG_EVENT_SOURCE]['DefaultWidth'] = "100";
$fields[SYSLOG_EVENT_SOURCE]['FieldAlign'] = "left"; $fields[SYSLOG_EVENT_SOURCE]['FieldAlign'] = "left";
$fields[SYSLOG_EVENT_SOURCE]['SearchField'] = "eventlogsource"; $fields[SYSLOG_EVENT_SOURCE]['SearchField'] = "eventlogsource";
$fields[SYSLOG_EVENT_CATEGORY]['FieldID'] = SYSLOG_EVENT_CATEGORY; $fields[SYSLOG_EVENT_CATEGORY]['FieldID'] = SYSLOG_EVENT_CATEGORY;
$fields[SYSLOG_EVENT_CATEGORY]['FieldCaptionID'] = 'LN_FIELDS_EVENTCATEGORY'; $fields[SYSLOG_EVENT_CATEGORY]['FieldCaption'] = 'Event Category';
$fields[SYSLOG_EVENT_CATEGORY]['FieldType'] = FILTER_TYPE_NUMBER; $fields[SYSLOG_EVENT_CATEGORY]['FieldType'] = FILTER_TYPE_NUMBER;
$fields[SYSLOG_EVENT_CATEGORY]['Sortable'] = true; $fields[SYSLOG_EVENT_CATEGORY]['Sortable'] = true;
$fields[SYSLOG_EVENT_CATEGORY]['DefaultWidth'] = "50"; $fields[SYSLOG_EVENT_CATEGORY]['DefaultWidth'] = "50";
$fields[SYSLOG_EVENT_CATEGORY]['FieldAlign'] = "center"; $fields[SYSLOG_EVENT_CATEGORY]['FieldAlign'] = "center";
$fields[SYSLOG_EVENT_CATEGORY]['SearchField'] = "eventcategory"; $fields[SYSLOG_EVENT_CATEGORY]['SearchField'] = "eventcategory";
$fields[SYSLOG_EVENT_USER]['FieldID'] = SYSLOG_EVENT_USER; $fields[SYSLOG_EVENT_USER]['FieldID'] = SYSLOG_EVENT_USER;
$fields[SYSLOG_EVENT_USER]['FieldCaptionID'] = 'LN_FIELDS_EVENTUSER'; $fields[SYSLOG_EVENT_USER]['FieldCaption'] = 'Event User';
$fields[SYSLOG_EVENT_USER]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_EVENT_USER]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_EVENT_USER]['Sortable'] = true; $fields[SYSLOG_EVENT_USER]['Sortable'] = true;
$fields[SYSLOG_EVENT_USER]['DefaultWidth'] = "85"; $fields[SYSLOG_EVENT_USER]['DefaultWidth'] = "85";
@ -174,63 +174,63 @@ $fields[SYSLOG_EVENT_USER]['SearchField'] = "eventuser";
// Weblogfile specific // Weblogfile specific
$fields[SYSLOG_WEBLOG_USER]['FieldID'] = SYSLOG_WEBLOG_USER; $fields[SYSLOG_WEBLOG_USER]['FieldID'] = SYSLOG_WEBLOG_USER;
$fields[SYSLOG_WEBLOG_USER]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_USER'; $fields[SYSLOG_WEBLOG_USER]['FieldCaption'] = 'HTTP User';
$fields[SYSLOG_WEBLOG_USER]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_WEBLOG_USER]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_WEBLOG_USER]['Sortable'] = false; $fields[SYSLOG_WEBLOG_USER]['Sortable'] = false;
$fields[SYSLOG_WEBLOG_USER]['DefaultWidth'] = "75"; $fields[SYSLOG_WEBLOG_USER]['DefaultWidth'] = "75";
$fields[SYSLOG_WEBLOG_USER]['FieldAlign'] = "left"; $fields[SYSLOG_WEBLOG_USER]['FieldAlign'] = "left";
$fields[SYSLOG_WEBLOG_USER]['SearchField'] = SYSLOG_WEBLOG_USER; $fields[SYSLOG_WEBLOG_USER]['SearchField'] = SYSLOG_WEBLOG_USER;
$fields[SYSLOG_WEBLOG_METHOD]['FieldID'] = SYSLOG_WEBLOG_METHOD; $fields[SYSLOG_WEBLOG_METHOD]['FieldID'] = SYSLOG_WEBLOG_METHOD;
$fields[SYSLOG_WEBLOG_METHOD]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_METHOD'; $fields[SYSLOG_WEBLOG_METHOD]['FieldCaption'] = 'Method';
$fields[SYSLOG_WEBLOG_METHOD]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_WEBLOG_METHOD]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_WEBLOG_METHOD]['Sortable'] = false; $fields[SYSLOG_WEBLOG_METHOD]['Sortable'] = false;
$fields[SYSLOG_WEBLOG_METHOD]['DefaultWidth'] = "50"; $fields[SYSLOG_WEBLOG_METHOD]['DefaultWidth'] = "50";
$fields[SYSLOG_WEBLOG_METHOD]['FieldAlign'] = "center"; $fields[SYSLOG_WEBLOG_METHOD]['FieldAlign'] = "center";
$fields[SYSLOG_WEBLOG_METHOD]['SearchField'] = SYSLOG_WEBLOG_METHOD; $fields[SYSLOG_WEBLOG_METHOD]['SearchField'] = SYSLOG_WEBLOG_METHOD;
$fields[SYSLOG_WEBLOG_URL]['FieldID'] = SYSLOG_WEBLOG_URL; $fields[SYSLOG_WEBLOG_URL]['FieldID'] = SYSLOG_WEBLOG_URL;
$fields[SYSLOG_WEBLOG_URL]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_URL'; $fields[SYSLOG_WEBLOG_URL]['FieldCaption'] = 'URL';
$fields[SYSLOG_WEBLOG_URL]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_WEBLOG_URL]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_WEBLOG_URL]['Sortable'] = false; $fields[SYSLOG_WEBLOG_URL]['Sortable'] = false;
$fields[SYSLOG_WEBLOG_URL]['DefaultWidth'] = "200"; $fields[SYSLOG_WEBLOG_URL]['DefaultWidth'] = "200";
$fields[SYSLOG_WEBLOG_URL]['FieldAlign'] = "left"; $fields[SYSLOG_WEBLOG_URL]['FieldAlign'] = "left";
$fields[SYSLOG_WEBLOG_URL]['SearchField'] = SYSLOG_WEBLOG_URL; $fields[SYSLOG_WEBLOG_URL]['SearchField'] = SYSLOG_WEBLOG_URL;
$fields[SYSLOG_WEBLOG_QUERYSTRING]['FieldID'] = SYSLOG_WEBLOG_QUERYSTRING; $fields[SYSLOG_WEBLOG_QUERYSTRING]['FieldID'] = SYSLOG_WEBLOG_QUERYSTRING;
$fields[SYSLOG_WEBLOG_QUERYSTRING]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_QUERYSTRING'; $fields[SYSLOG_WEBLOG_QUERYSTRING]['FieldCaption'] = 'Querystring';
$fields[SYSLOG_WEBLOG_QUERYSTRING]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_WEBLOG_QUERYSTRING]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_WEBLOG_QUERYSTRING]['Sortable'] = false; $fields[SYSLOG_WEBLOG_QUERYSTRING]['Sortable'] = false;
$fields[SYSLOG_WEBLOG_QUERYSTRING]['DefaultWidth'] = "200"; $fields[SYSLOG_WEBLOG_QUERYSTRING]['DefaultWidth'] = "200";
$fields[SYSLOG_WEBLOG_QUERYSTRING]['FieldAlign'] = "left"; $fields[SYSLOG_WEBLOG_QUERYSTRING]['FieldAlign'] = "left";
$fields[SYSLOG_WEBLOG_QUERYSTRING]['SearchField'] = SYSLOG_WEBLOG_QUERYSTRING; $fields[SYSLOG_WEBLOG_QUERYSTRING]['SearchField'] = SYSLOG_WEBLOG_QUERYSTRING;
$fields[SYSLOG_WEBLOG_PVER]['FieldID'] = SYSLOG_WEBLOG_PVER; $fields[SYSLOG_WEBLOG_PVER]['FieldID'] = SYSLOG_WEBLOG_PVER;
$fields[SYSLOG_WEBLOG_PVER]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_PVER'; $fields[SYSLOG_WEBLOG_PVER]['FieldCaption'] = 'Version';
$fields[SYSLOG_WEBLOG_PVER]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_WEBLOG_PVER]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_WEBLOG_PVER]['Sortable'] = false; $fields[SYSLOG_WEBLOG_PVER]['Sortable'] = false;
$fields[SYSLOG_WEBLOG_PVER]['DefaultWidth'] = "50"; $fields[SYSLOG_WEBLOG_PVER]['DefaultWidth'] = "50";
$fields[SYSLOG_WEBLOG_PVER]['FieldAlign'] = "center"; $fields[SYSLOG_WEBLOG_PVER]['FieldAlign'] = "center";
$fields[SYSLOG_WEBLOG_PVER]['SearchField'] = SYSLOG_WEBLOG_PVER; $fields[SYSLOG_WEBLOG_PVER]['SearchField'] = SYSLOG_WEBLOG_PVER;
$fields[SYSLOG_WEBLOG_STATUS]['FieldID'] = SYSLOG_WEBLOG_STATUS; $fields[SYSLOG_WEBLOG_STATUS]['FieldID'] = SYSLOG_WEBLOG_STATUS;
$fields[SYSLOG_WEBLOG_STATUS]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_STATUS'; $fields[SYSLOG_WEBLOG_STATUS]['FieldCaption'] = 'Status';
$fields[SYSLOG_WEBLOG_STATUS]['FieldType'] = FILTER_TYPE_NUMBER; $fields[SYSLOG_WEBLOG_STATUS]['FieldType'] = FILTER_TYPE_NUMBER;
$fields[SYSLOG_WEBLOG_STATUS]['Sortable'] = false; $fields[SYSLOG_WEBLOG_STATUS]['Sortable'] = false;
$fields[SYSLOG_WEBLOG_STATUS]['DefaultWidth'] = "50"; $fields[SYSLOG_WEBLOG_STATUS]['DefaultWidth'] = "50";
$fields[SYSLOG_WEBLOG_STATUS]['FieldAlign'] = "center"; $fields[SYSLOG_WEBLOG_STATUS]['FieldAlign'] = "center";
$fields[SYSLOG_WEBLOG_STATUS]['SearchField'] = SYSLOG_WEBLOG_STATUS; $fields[SYSLOG_WEBLOG_STATUS]['SearchField'] = SYSLOG_WEBLOG_STATUS;
$fields[SYSLOG_WEBLOG_BYTESSEND]['FieldID'] = SYSLOG_WEBLOG_BYTESSEND; $fields[SYSLOG_WEBLOG_BYTESSEND]['FieldID'] = SYSLOG_WEBLOG_BYTESSEND;
$fields[SYSLOG_WEBLOG_BYTESSEND]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_BYTESSEND'; $fields[SYSLOG_WEBLOG_BYTESSEND]['FieldCaption'] = 'Bytes Send';
$fields[SYSLOG_WEBLOG_BYTESSEND]['FieldType'] = FILTER_TYPE_NUMBER; $fields[SYSLOG_WEBLOG_BYTESSEND]['FieldType'] = FILTER_TYPE_NUMBER;
$fields[SYSLOG_WEBLOG_BYTESSEND]['Sortable'] = false; $fields[SYSLOG_WEBLOG_BYTESSEND]['Sortable'] = false;
$fields[SYSLOG_WEBLOG_BYTESSEND]['DefaultWidth'] = "75"; $fields[SYSLOG_WEBLOG_BYTESSEND]['DefaultWidth'] = "75";
$fields[SYSLOG_WEBLOG_BYTESSEND]['FieldAlign'] = "left"; $fields[SYSLOG_WEBLOG_BYTESSEND]['FieldAlign'] = "left";
$fields[SYSLOG_WEBLOG_BYTESSEND]['SearchField'] = SYSLOG_WEBLOG_BYTESSEND; $fields[SYSLOG_WEBLOG_BYTESSEND]['SearchField'] = SYSLOG_WEBLOG_BYTESSEND;
$fields[SYSLOG_WEBLOG_REFERER]['FieldID'] = SYSLOG_WEBLOG_REFERER; $fields[SYSLOG_WEBLOG_REFERER]['FieldID'] = SYSLOG_WEBLOG_REFERER;
$fields[SYSLOG_WEBLOG_REFERER]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_REFERER'; $fields[SYSLOG_WEBLOG_REFERER]['FieldCaption'] = 'Referer';
$fields[SYSLOG_WEBLOG_REFERER]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_WEBLOG_REFERER]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_WEBLOG_REFERER]['Sortable'] = false; $fields[SYSLOG_WEBLOG_REFERER]['Sortable'] = false;
$fields[SYSLOG_WEBLOG_REFERER]['DefaultWidth'] = "200"; $fields[SYSLOG_WEBLOG_REFERER]['DefaultWidth'] = "200";
$fields[SYSLOG_WEBLOG_REFERER]['FieldAlign'] = "left"; $fields[SYSLOG_WEBLOG_REFERER]['FieldAlign'] = "left";
$fields[SYSLOG_WEBLOG_REFERER]['SearchField'] = SYSLOG_WEBLOG_REFERER; $fields[SYSLOG_WEBLOG_REFERER]['SearchField'] = SYSLOG_WEBLOG_REFERER;
$fields[SYSLOG_WEBLOG_USERAGENT]['FieldID'] = SYSLOG_WEBLOG_USERAGENT; $fields[SYSLOG_WEBLOG_USERAGENT]['FieldID'] = SYSLOG_WEBLOG_USERAGENT;
$fields[SYSLOG_WEBLOG_USERAGENT]['FieldCaptionID'] = 'LN_FIELDS_WEBLOG_USERAGENT'; $fields[SYSLOG_WEBLOG_USERAGENT]['FieldCaption'] = 'User Agent';
$fields[SYSLOG_WEBLOG_USERAGENT]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_WEBLOG_USERAGENT]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_WEBLOG_USERAGENT]['Sortable'] = false; $fields[SYSLOG_WEBLOG_USERAGENT]['Sortable'] = false;
$fields[SYSLOG_WEBLOG_USERAGENT]['DefaultWidth'] = "100"; $fields[SYSLOG_WEBLOG_USERAGENT]['DefaultWidth'] = "100";
@ -239,7 +239,7 @@ $fields[SYSLOG_WEBLOG_USERAGENT]['SearchField'] = SYSLOG_WEBLOG_USERAGENT;
// Message is the last element, this order is important for the Detail page for now! // Message is the last element, this order is important for the Detail page for now!
$fields[SYSLOG_MESSAGE]['FieldID'] = SYSLOG_MESSAGE; $fields[SYSLOG_MESSAGE]['FieldID'] = SYSLOG_MESSAGE;
$fields[SYSLOG_MESSAGE]['FieldCaptionID'] = 'LN_FIELDS_MESSAGE'; $fields[SYSLOG_MESSAGE]['FieldCaption'] = 'Message';
$fields[SYSLOG_MESSAGE]['FieldType'] = FILTER_TYPE_STRING; $fields[SYSLOG_MESSAGE]['FieldType'] = FILTER_TYPE_STRING;
$fields[SYSLOG_MESSAGE]['Sortable'] = false; $fields[SYSLOG_MESSAGE]['Sortable'] = false;
$fields[SYSLOG_MESSAGE]['DefaultWidth'] = "100%"; $fields[SYSLOG_MESSAGE]['DefaultWidth'] = "100%";

4
src/include/functions_common.php
View File

@ -266,8 +266,8 @@ function CreateChartFields( $selectedChartField)
// Add new entry to array // Add new entry to array
$content['CHARTFIELDS'][$myFieldID]['ID'] = $myFieldID; $content['CHARTFIELDS'][$myFieldID]['ID'] = $myFieldID;
if ( isset($content[ $myField['FieldCaptionID'] ]) ) if ( isset($myField['FieldCaption']) )
$content['CHARTFIELDS'][$myFieldID]['DisplayName'] = $content[ $myField['FieldCaptionID'] ]; $content['CHARTFIELDS'][$myFieldID]['DisplayName'] = $myField['FieldCaption'];
else else
$content['CHARTFIELDS'][$myFieldID]['DisplayName'] = $myFieldID; $content['CHARTFIELDS'][$myFieldID]['DisplayName'] = $myFieldID;

50
src/index.php
View File

@ -219,7 +219,7 @@ if ( isset($content['Sources'][$currentSourceID]) )
if ( isset($fields[$mycolkey]) ) if ( isset($fields[$mycolkey]) )
{ {
$content['fields'][$mycolkey]['FieldID'] = $mycolkey; $content['fields'][$mycolkey]['FieldID'] = $mycolkey;
$content['fields'][$mycolkey]['FieldCaption'] = $content[ $fields[$mycolkey]['FieldCaptionID'] ]; $content['fields'][$mycolkey]['FieldCaption'] = $fields[$mycolkey]['FieldCaption'];
$content['fields'][$mycolkey]['FieldType'] = $fields[$mycolkey]['FieldType']; $content['fields'][$mycolkey]['FieldType'] = $fields[$mycolkey]['FieldType'];
$content['fields'][$mycolkey]['FieldSortable'] = $stream->IsPropertySortable($mycolkey); // $fields[$mycolkey]['Sortable']; $content['fields'][$mycolkey]['FieldSortable'] = $stream->IsPropertySortable($mycolkey); // $fields[$mycolkey]['Sortable'];
$content['fields'][$mycolkey]['DefaultWidth'] = $fields[$mycolkey]['DefaultWidth']; $content['fields'][$mycolkey]['DefaultWidth'] = $fields[$mycolkey]['DefaultWidth'];
@ -384,7 +384,7 @@ if ( isset($content['Sources'][$currentSourceID]) )
} }
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_FACILITY, 'LN_FIELDS_FACILITY', true); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_FACILITY, true);
} }
else if ( $mycolkey == SYSLOG_SEVERITY ) else if ( $mycolkey == SYSLOG_SEVERITY )
{ {
@ -403,7 +403,7 @@ if ( isset($content['Sources'][$currentSourceID]) )
} }
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_SEVERITY, 'LN_FIELDS_SEVERITY', true); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_SEVERITY, true);
} }
else if ( $mycolkey == SYSLOG_MESSAGETYPE ) else if ( $mycolkey == SYSLOG_MESSAGETYPE )
{ {
@ -422,29 +422,29 @@ if ( isset($content['Sources'][$currentSourceID]) )
} }
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_MESSAGETYPE, 'LN_FIELDS_MESSAGETYPE', false); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_MESSAGETYPE, false);
} }
else if ( $mycolkey == SYSLOG_PROCESSID ) else if ( $mycolkey == SYSLOG_PROCESSID )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_PROCESSID, 'LN_FIELDS_PROCESSID', false); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_PROCESSID, false);
} }
/* Eventlog based fields */ /* Eventlog based fields */
else if ( $mycolkey == SYSLOG_EVENT_ID ) else if ( $mycolkey == SYSLOG_EVENT_ID )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_EVENT_ID, 'LN_FIELDS_EVENTID', true); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_EVENT_ID, true);
} }
else if ( $mycolkey == SYSLOG_EVENT_CATEGORY ) else if ( $mycolkey == SYSLOG_EVENT_CATEGORY )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_EVENT_CATEGORY, 'LN_FIELDS_EVENTCATEGORY', false); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_EVENT_CATEGORY, false);
} }
// WebServer Type fields // WebServer Type fields
else if ( $mycolkey == SYSLOG_WEBLOG_STATUS ) else if ( $mycolkey == SYSLOG_WEBLOG_STATUS )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_WEBLOG_STATUS, 'LN_FIELDS_WEBLOG_STATUS', false); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_WEBLOG_STATUS, false);
} }
} }
else if ( $content['fields'][$mycolkey]['FieldType'] == FILTER_TYPE_STRING ) else if ( $content['fields'][$mycolkey]['FieldType'] == FILTER_TYPE_STRING )
@ -549,64 +549,64 @@ if ( isset($content['Sources'][$currentSourceID]) )
else if ( $mycolkey == SYSLOG_SYSLOGTAG ) else if ( $mycolkey == SYSLOG_SYSLOGTAG )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_SYSLOGTAG, 'LN_FIELDS_SYSLOGTAG', true); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_SYSLOGTAG, true);
} }
else if ( $mycolkey == SYSLOG_HOST ) else if ( $mycolkey == SYSLOG_HOST )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_HOST, 'LN_FIELDS_HOST', false); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_HOST, false);
} }
/* Eventlog based fields */ /* Eventlog based fields */
else if ( $mycolkey == SYSLOG_EVENT_LOGTYPE ) else if ( $mycolkey == SYSLOG_EVENT_LOGTYPE )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_EVENT_LOGTYPE, 'LN_FIELDS_EVENTLOGTYPE', true); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_EVENT_LOGTYPE, true);
} }
else if ( $mycolkey == SYSLOG_EVENT_SOURCE ) else if ( $mycolkey == SYSLOG_EVENT_SOURCE )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_EVENT_SOURCE, 'LN_FIELDS_EVENTSOURCE', true); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_EVENT_SOURCE, true);
} }
else if ( $mycolkey == SYSLOG_EVENT_USER ) else if ( $mycolkey == SYSLOG_EVENT_USER )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_EVENT_USER, 'LN_FIELDS_EVENTUSER', false); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_EVENT_USER, false);
} }
// WebServer Type fields // WebServer Type fields
else if ( $mycolkey == SYSLOG_WEBLOG_USER ) else if ( $mycolkey == SYSLOG_WEBLOG_USER )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_USER, 'LN_FIELDS_WEBLOG_USER', false); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_USER, false);
} }
else if ( $mycolkey == SYSLOG_WEBLOG_METHOD ) else if ( $mycolkey == SYSLOG_WEBLOG_METHOD )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_METHOD, 'LN_FIELDS_WEBLOG_USERAGENT', false); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_METHOD, false);
} }
else if ( $mycolkey == SYSLOG_WEBLOG_URL ) else if ( $mycolkey == SYSLOG_WEBLOG_URL )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_URL, 'LN_FIELDS_WEBLOG_URL', false); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_URL, false);
} }
else if ( $mycolkey == SYSLOG_WEBLOG_QUERYSTRING ) else if ( $mycolkey == SYSLOG_WEBLOG_QUERYSTRING )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_QUERYSTRING, 'LN_FIELDS_WEBLOG_QUERYSTRING', false); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_QUERYSTRING, false);
} }
else if ( $mycolkey == SYSLOG_WEBLOG_PVER ) else if ( $mycolkey == SYSLOG_WEBLOG_PVER )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_PVER, 'LN_FIELDS_WEBLOG_PVER', false); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_PVER, false);
} }
else if ( $mycolkey == SYSLOG_WEBLOG_REFERER ) else if ( $mycolkey == SYSLOG_WEBLOG_REFERER )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_REFERER, 'LN_FIELDS_WEBLOG_REFERER', true); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_REFERER, true);
} }
else if ( $mycolkey == SYSLOG_WEBLOG_USERAGENT ) else if ( $mycolkey == SYSLOG_WEBLOG_USERAGENT )
{ {
// Add context menu // Add context menu
AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_USERAGENT, 'LN_FIELDS_WEBLOG_USERAGENT', true); AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_WEBLOG_USERAGENT, true);
} }
} }
@ -777,13 +777,19 @@ function PrepareStringForSearch($myString)
return str_replace($searchArray, $replaceArray, $myString); return str_replace($searchArray, $replaceArray, $myString);
} }
function AddOnClickMenu(&$fieldGridItem, $fieldType, $FieldID, $szFieldDisplayNameID, $searchOnline = false) function AddOnClickMenu(&$fieldGridItem, $fieldType, $FieldID, $searchOnline = false)
{ {
global $content, $fields, $myStrCharLimit; global $content, $fields, $myStrCharLimit;
// Set OnClick Menu for SYSLOG_SYSLOGTAG // Set OnClick Menu for SYSLOG_SYSLOGTAG
$fieldGridItem['hasbuttons'] = true; $fieldGridItem['hasbuttons'] = true;
// Set Field Caption
if ( isset($content['fields'][$FieldID]['FieldCaption']) && strlen( $content['fields'][$FieldID]['FieldCaption']) > 0 )
$szFieldDisplayName = $content['fields'][$FieldID]['FieldCaption'];
else
$szFieldDisplayName = $FieldID;
// Set FieldSearch Value // Set FieldSearch Value
if ( $fieldType == FILTER_TYPE_STRING) if ( $fieldType == FILTER_TYPE_STRING)
$szEncodedFieldValue = urlencode($fieldGridItem['encodedfieldvalue']); $szEncodedFieldValue = urlencode($fieldGridItem['encodedfieldvalue']);
@ -838,7 +844,7 @@ function AddOnClickMenu(&$fieldGridItem, $fieldType, $FieldID, $szFieldDisplayN
'ButtonUrl' => 'http://kb.monitorware.com/kbsearch.php?sa=Search&origin=phplogcon&oid=' . $FieldID . '&q=' . $szEncodedFieldValue, 'ButtonUrl' => 'http://kb.monitorware.com/kbsearch.php?sa=Search&origin=phplogcon&oid=' . $FieldID . '&q=' . $szEncodedFieldValue,
'ButtonTarget' => '_top', 'ButtonTarget' => '_top',
'ButtonAppendUrl' => true, 'ButtonAppendUrl' => true,
'DisplayName' => $content['LN_VIEW_SEARCHFOR'] . " " . $content[$szFieldDisplayNameID] . " '" . $fieldGridItem['fieldvalue'] . "'", 'DisplayName' => $content['LN_VIEW_SEARCHFOR'] . " " . $szFieldDisplayName . " '" . $fieldGridItem['fieldvalue'] . "'",
'IconSource' => $content['MENU_NETWORK'] 'IconSource' => $content['MENU_NETWORK']
); );
} }

25
src/lang/de/main.php
View File

@ -169,31 +169,6 @@ $content['LN_FILTER_SYSLOGTAG'] = "Syslogtag";
$content['LN_FILTER_SOURCE'] = "Quelle (Hostname)"; $content['LN_FILTER_SOURCE'] = "Quelle (Hostname)";
$content['LN_FILTER_MESSAGETYPE'] = "Message Type"; $content['LN_FILTER_MESSAGETYPE'] = "Message Type";
// Field Captions
$content['LN_FIELDS_DATE'] = "Datum";
$content['LN_FIELDS_FACILITY'] = "Kategorie/Facility";
$content['LN_FIELDS_SEVERITY'] = "Dringlichkeit/Severity";
$content['LN_FIELDS_HOST'] = "Host";
$content['LN_FIELDS_SYSLOGTAG'] = "Syslogtag";
$content['LN_FIELDS_PROCESSID'] = "Prozess ID";
$content['LN_FIELDS_MESSAGETYPE'] = "Meldungstyp";
$content['LN_FIELDS_UID'] = "uID";
$content['LN_FIELDS_MESSAGE'] = "Meldung";
$content['LN_FIELDS_EVENTID'] = "Event ID";
$content['LN_FIELDS_EVENTLOGTYPE'] = "Eventlogtype";
$content['LN_FIELDS_EVENTSOURCE'] = "Event Source";
$content['LN_FIELDS_EVENTCATEGORY'] = "Event Category";
$content['LN_FIELDS_EVENTUSER'] = "Event User";
$content['LN_FIELDS_WEBLOG_USER'] = "HTTP User";
$content['LN_FIELDS_WEBLOG_METHOD'] = "Method";
$content['LN_FIELDS_WEBLOG_URL'] = "URL";
$content['LN_FIELDS_WEBLOG_QUERYSTRING'] = "Querystring";
$content['LN_FIELDS_WEBLOG_PVER'] = "Version";
$content['LN_FIELDS_WEBLOG_STATUS'] = "Status";
$content['LN_FIELDS_WEBLOG_BYTESSEND'] = "Bytes Send";
$content['LN_FIELDS_WEBLOG_REFERER'] = "Referer";
$content['LN_FIELDS_WEBLOG_USERAGENT'] = "User Agent";
// Install Page // Install Page
$content['LN_CFG_DBSERVER'] = "Datenbank Host"; $content['LN_CFG_DBSERVER'] = "Datenbank Host";
$content['LN_CFG_DBPORT'] = "Datenbank Port"; $content['LN_CFG_DBPORT'] = "Datenbank Port";

25
src/lang/en/main.php
View File

@ -170,31 +170,6 @@ $content['LN_FILTER_SYSLOGTAG'] = "Syslogtag";
$content['LN_FILTER_SOURCE'] = "Source (Hostname)"; $content['LN_FILTER_SOURCE'] = "Source (Hostname)";
$content['LN_FILTER_MESSAGETYPE'] = "Message Type"; $content['LN_FILTER_MESSAGETYPE'] = "Message Type";
// Field Captions
$content['LN_FIELDS_DATE'] = "Date";
$content['LN_FIELDS_FACILITY'] = "Facility";
$content['LN_FIELDS_SEVERITY'] = "Severity";
$content['LN_FIELDS_HOST'] = "Host";
$content['LN_FIELDS_SYSLOGTAG'] = "Syslogtag";
$content['LN_FIELDS_PROCESSID'] = "ProcessID";
$content['LN_FIELDS_MESSAGETYPE'] = "Messagetype";
$content['LN_FIELDS_UID'] = "uID";
$content['LN_FIELDS_MESSAGE'] = "Message";
$content['LN_FIELDS_EVENTID'] = "Event ID";
$content['LN_FIELDS_EVENTLOGTYPE'] = "Eventlog Type";
$content['LN_FIELDS_EVENTSOURCE'] = "Event Source";
$content['LN_FIELDS_EVENTCATEGORY'] = "Event Category";
$content['LN_FIELDS_EVENTUSER'] = "Event User";
$content['LN_FIELDS_WEBLOG_USER'] = "HTTP User";
$content['LN_FIELDS_WEBLOG_METHOD'] = "Method";
$content['LN_FIELDS_WEBLOG_URL'] = "URL";
$content['LN_FIELDS_WEBLOG_QUERYSTRING'] = "Querystring";
$content['LN_FIELDS_WEBLOG_PVER'] = "Version";
$content['LN_FIELDS_WEBLOG_STATUS'] = "Status";
$content['LN_FIELDS_WEBLOG_BYTESSEND'] = "Bytes Send";
$content['LN_FIELDS_WEBLOG_REFERER'] = "Referer";
$content['LN_FIELDS_WEBLOG_USERAGENT'] = "User Agent";
// Install Page // Install Page
$content['LN_CFG_DBSERVER'] = "Database Host"; $content['LN_CFG_DBSERVER'] = "Database Host";
$content['LN_CFG_DBPORT'] = "Database Port"; $content['LN_CFG_DBPORT'] = "Database Port";

25
src/lang/pt_BR/main.php
View File

@ -172,31 +172,6 @@ $content['LN_FILTER_SYSLOGTAG'] = "Syslogtag";
$content['LN_FILTER_SOURCE'] = "Origem (Hostname)"; $content['LN_FILTER_SOURCE'] = "Origem (Hostname)";
$content['LN_FILTER_MESSAGETYPE'] = "Tipo de mensagem"; $content['LN_FILTER_MESSAGETYPE'] = "Tipo de mensagem";
// Field Captions
$content['LN_FIELDS_DATE'] = "Data";
$content['LN_FIELDS_FACILITY'] = "Facility";
$content['LN_FIELDS_SEVERITY'] = "Severidade";
$content['LN_FIELDS_HOST'] = "Host";
$content['LN_FIELDS_SYSLOGTAG'] = "Syslogtag";
$content['LN_FIELDS_PROCESSID'] = "PID";
$content['LN_FIELDS_MESSAGETYPE'] = "Tipo";
$content['LN_FIELDS_UID'] = "uID";
$content['LN_FIELDS_MESSAGE'] = "Mensagem";
$content['LN_FIELDS_EVENTID'] = "ID do Evento";
$content['LN_FIELDS_EVENTLOGTYPE'] = "Tipo do Evento";
$content['LN_FIELDS_EVENTSOURCE'] = "Origem do Evento";
$content['LN_FIELDS_EVENTCATEGORY'] = "Categoria do Evento";
$content['LN_FIELDS_EVENTUSER'] = "Evento de Usu&acute;rio";
$content['LN_FIELDS_WEBLOG_USER'] = "HTTP User";
$content['LN_FIELDS_WEBLOG_METHOD'] = "Method";
$content['LN_FIELDS_WEBLOG_URL'] = "URL";
$content['LN_FIELDS_WEBLOG_QUERYSTRING'] = "Querystring";
$content['LN_FIELDS_WEBLOG_PVER'] = "Version";
$content['LN_FIELDS_WEBLOG_STATUS'] = "Status";
$content['LN_FIELDS_WEBLOG_BYTESSEND'] = "Bytes Send";
$content['LN_FIELDS_WEBLOG_REFERER'] = "Referer";
$content['LN_FIELDS_WEBLOG_USERAGENT'] = "User Agent";
// Install Page // Install Page
$content['LN_CFG_DBSERVER'] = "Servidor BD"; $content['LN_CFG_DBSERVER'] = "Servidor BD";
$content['LN_CFG_DBPORT'] = "Porta BD"; $content['LN_CFG_DBPORT'] = "Porta BD";

4
src/statistics.php
View File

@ -88,8 +88,8 @@ if ( isset($content['Charts']) )
// --- // ---
// --- Set display name for chart field // --- Set display name for chart field
if ( isset($myChart['chart_field']) && isset($fields[$myChart['chart_field']]) && isset($content[ $fields[$myChart['chart_field']]['FieldCaptionID'] ]) ) if ( isset($myChart['chart_field']) && isset($fields[$myChart['chart_field']]) && isset($fields[$myChart['chart_field']]['FieldCaption']) )
$myChart['CHART_FIELD_DISPLAYNAME'] = $content[ $fields[$myChart['chart_field']]['FieldCaptionID'] ]; $myChart['CHART_FIELD_DISPLAYNAME'] = $fields[$myChart['chart_field']]['FieldCaption'];
else else
$myChart['CHART_FIELD_DISPLAYNAME'] = $myChart['chart_field']; $myChart['CHART_FIELD_DISPLAYNAME'] = $myChart['chart_field'];
// --- // ---