diff --git a/src/classes/logstreamdb.class.php b/src/classes/logstreamdb.class.php index a2bfa2c..359a0af 100644 --- a/src/classes/logstreamdb.class.php +++ b/src/classes/logstreamdb.class.php @@ -775,7 +775,7 @@ class LogStreamDB extends LogStream { } } -echo $this->_SQLwhereClause; +//echo $this->_SQLwhereClause; //$dbmapping[$szTableType][SYSLOG_UID] } else // No filters means nothing to do! diff --git a/src/classes/logstreampdo.class.php b/src/classes/logstreampdo.class.php index 4ca162d..e017340 100644 --- a/src/classes/logstreampdo.class.php +++ b/src/classes/logstreampdo.class.php @@ -805,7 +805,7 @@ class LogStreamPDO extends LogStream { } } -echo $this->_SQLwhereClause; +//echo $this->_SQLwhereClause; //$dbmapping[$szTableType][SYSLOG_UID] } else // No filters means nothing to do! diff --git a/src/index.php b/src/index.php index 70a0701..853045e 100644 --- a/src/index.php +++ b/src/index.php @@ -375,30 +375,8 @@ if ( isset($content['Sources'][$currentSourceID]) ) $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $facility_colors[SYSLOG_LOCAL0] . '" '; } - // Set OnClick Menu for SYSLOG_FACILITY - $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; - - // Menu Option to append filter - if ( strlen($content['searchstr']) > 0 ) - { - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=' . urlencode($content['searchstr']) . '+facility%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_ADDTOFILTER'], GetFacilityDisplayName($logArray[$mycolkey]) ), - 'IconSource' => $content['MENU_BULLET_GREEN'] - ); - } - - // More Menu entries - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=facility%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_FILTERFORONLY'], GetFacilityDisplayName($logArray[$mycolkey]) ), - 'IconSource' => $content['MENU_BULLET_BLUE'] - ); - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => 'http://kb.monitorware.com/kbsearch.php?sa=Search&origin=phplogcon&oid=' . SYSLOG_FACILITY . '&q=' . GetFacilityDisplayName($logArray[$mycolkey]), - 'DisplayName' => $content['LN_VIEW_SEARCHFOR'] . " " . $content['LN_FIELDS_FACILITY'] . " '" . GetFacilityDisplayName($logArray[$mycolkey]) . "'", - 'IconSource' => $content['MENU_NETWORK'] - ); + // Add context menu + AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_FACILITY, 'LN_FIELDS_FACILITY', true); } else if ( $mycolkey == SYSLOG_SEVERITY ) { @@ -416,30 +394,8 @@ if ( isset($content['Sources'][$currentSourceID]) ) $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $severity_colors[SYSLOG_INFO] . '" '; } - // Set OnClick Menu for SYSLOG_SEVERITY - $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; - - // Menu Option to append filter - if ( strlen($content['searchstr']) > 0 ) - { - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=' . urlencode($content['searchstr']) . '+severity%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_ADDTOFILTER'], GetSeverityDisplayName($logArray[$mycolkey]) ), - 'IconSource' => $content['MENU_BULLET_GREEN'] - ); - } - - // More Menu entries - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=severity%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_FILTERFORONLY'], GetSeverityDisplayName($logArray[$mycolkey]) ), - 'IconSource' => $content['MENU_BULLET_BLUE'] - ); - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => 'http://kb.monitorware.com/kbsearch.php?sa=Search&origin=phplogcon&oid=' . SYSLOG_SEVERITY . '&q=' . GetSeverityDisplayName($logArray[$mycolkey]), - 'DisplayName' => $content['LN_VIEW_SEARCHFOR'] . " " . $content['LN_FIELDS_SEVERITY'] . " '" . GetSeverityDisplayName($logArray[$mycolkey]) . "'", - 'IconSource' => $content['MENU_NETWORK'] - ); + // Add context menu + AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_SEVERITY, 'LN_FIELDS_SEVERITY', true); } else if ( $mycolkey == SYSLOG_MESSAGETYPE ) { @@ -457,97 +413,24 @@ if ( isset($content['Sources'][$currentSourceID]) ) $content['syslogmessages'][$counter]['values'][$mycolkey]['fieldbgcolor'] = 'bgcolor="' . $msgtype_colors[IUT_Unknown] . '" '; } - // Set OnClick Menu for SYSLOG_MESSAGETYPE - $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; - - // Menu Option to append filter - if ( strlen($content['searchstr']) > 0 ) - { - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=' . urlencode($content['searchstr']) . '+messagetype%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_ADDTOFILTER'], GetMessageTypeDisplayName($logArray[$mycolkey]) ), - 'IconSource' => $content['MENU_BULLET_GREEN'] - ); - } - - // More Menu entries - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=messagetype%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_FILTERFORONLY'], GetMessageTypeDisplayName($logArray[$mycolkey]) ), - 'IconSource' => $content['MENU_BULLET_BLUE'] - ); + // Add context menu + AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_MESSAGETYPE, 'LN_FIELDS_MESSAGETYPE', false); } else if ( $mycolkey == SYSLOG_PROCESSID ) { - // Set OnClick Menu for SYSLOG_EVENT_ID - $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; - - // Menu Option to append filter - if ( strlen($content['searchstr']) > 0 ) - { - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=' . urlencode($content['searchstr']) . '+processid%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_ADDTOFILTER'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_GREEN'] - ); - } - - // More Menu entries - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=processid%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_FILTERFORONLY'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_BLUE'] - ); + // Add context menu + AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_PROCESSID, 'LN_FIELDS_PROCESSID', false); } /* Eventlog based fields */ else if ( $mycolkey == SYSLOG_EVENT_ID ) { - // Set OnClick Menu for SYSLOG_EVENT_ID - $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; - - // Menu Option to append filter - if ( strlen($content['searchstr']) > 0 ) - { - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=' . urlencode($content['searchstr']) . '+eventid%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_ADDTOFILTER'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_GREEN'] - ); - } - - // More Menu entries - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=eventid%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_FILTERFORONLY'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_BLUE'] - ); - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => 'http://kb.monitorware.com/kbsearch.php?sa=Search&origin=phplogcon&oid=' . SYSLOG_EVENT_ID . '&q=' . $logArray[$mycolkey], - 'DisplayName' => $content['LN_VIEW_SEARCHFOR'] . " " . $content['LN_FIELDS_EVENTID'] . " '" . $logArray[$mycolkey] . "'", - 'IconSource' => $content['MENU_NETWORK'] - ); + // Add context menu + AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_EVENT_ID, 'LN_FIELDS_EVENTID', true); } else if ( $mycolkey == SYSLOG_EVENT_CATEGORY ) { - // Set OnClick Menu for SYSLOG_EVENT_ID - $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; - - // Menu Option to append filter - if ( strlen($content['searchstr']) > 0 ) - { - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=' . urlencode($content['searchstr']) . '+eventcategory%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_ADDTOFILTER'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_GREEN'] - ); - } - - // More Menu entries - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=eventcategory%3A' . $logArray[$mycolkey] . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_FILTERFORONLY'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_BLUE'] - ); + // Add context menu + AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_NUMBER, SYSLOG_EVENT_CATEGORY, 'LN_FIELDS_EVENTCATEGORY', false); } // WebServer Type fields else if ( $mycolkey == SYSLOG_WEBLOG_STATUS ) @@ -657,116 +540,29 @@ if ( isset($content['Sources'][$currentSourceID]) ) } else if ( $mycolkey == SYSLOG_SYSLOGTAG ) { - // Set OnClick Menu for SYSLOG_SYSLOGTAG - $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; - - // Menu Option to append filter - if ( strlen($content['searchstr']) > 0 ) - { - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=' . urlencode($content['searchstr']) . '+syslogtag%3A%3D' . urlencode($content['syslogmessages'][$counter]['values'][$mycolkey]['encodedfieldvalue']) . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_ADDTOFILTER'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_GREEN'] - ); - } - - // More Menu entries - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=syslogtag%3A%3D' . urlencode($content['syslogmessages'][$counter]['values'][$mycolkey]['encodedfieldvalue']) . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_FILTERFORONLY'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_BLUE'] - ); - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => 'http://kb.monitorware.com/kbsearch.php?sa=Search&origin=phplogcon&oid=' . SYSLOG_SYSLOGTAG . '&q=' . $logArray[$mycolkey], - 'DisplayName' => $content['LN_VIEW_SEARCHFOR'] . " " . $content['LN_FIELDS_SYSLOGTAG'] . " '" . $logArray[$mycolkey] . "'", - 'IconSource' => $content['MENU_NETWORK'] - ); + // Add context menu + AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_SYSLOGTAG, 'LN_FIELDS_SYSLOGTAG', true); } else if ( $mycolkey == SYSLOG_HOST ) { - // Set OnClick Menu for SYSLOG_HOST - $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; - - // Menu Option to append filter - if ( strlen($content['searchstr']) > 0 ) - { - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=' . urlencode($content['searchstr']) . '+source%3A%3D' . urlencode($content['syslogmessages'][$counter]['values'][$mycolkey]['encodedfieldvalue']) . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_ADDTOFILTER'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_GREEN'] - ); - } - - // More Menu entries - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=source%3A%3D' . urlencode($content['syslogmessages'][$counter]['values'][$mycolkey]['encodedfieldvalue']) . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_FILTERFORONLY'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_BLUE'] - ); + // Add context menu + AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_HOST, 'LN_FIELDS_HOST', false); } /* Eventlog based fields */ else if ( $mycolkey == SYSLOG_EVENT_LOGTYPE ) { - // Set OnClick Menu for SYSLOG_EVENT_LOGTYPE - $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; - - // Menu Option to append filter - if ( strlen($content['searchstr']) > 0 ) - { - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=' . urlencode($content['searchstr']) . '+eventlogtype%3A%3D' . urlencode($content['syslogmessages'][$counter]['values'][$mycolkey]['encodedfieldvalue']) . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_ADDTOFILTER'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_GREEN'] - ); - } - - // More Menu entries - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=eventlogtype%3A%3D' . urlencode($content['syslogmessages'][$counter]['values'][$mycolkey]['encodedfieldvalue']) . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_FILTERFORONLY'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_BLUE'] - ); - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => 'http://kb.monitorware.com/kbsearch.php?sa=Search&origin=phplogcon&oid=' . SYSLOG_EVENT_LOGTYPE . '&q=' . $logArray[$mycolkey], - 'DisplayName' => $content['LN_VIEW_SEARCHFOR'] . " " . $content['LN_FIELDS_EVENTLOGTYPE'] . " '" . $logArray[$mycolkey] . "'", - 'IconSource' => $content['MENU_NETWORK'] - ); + // Add context menu + AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_EVENT_LOGTYPE, 'LN_FIELDS_EVENTLOGTYPE', true); } else if ( $mycolkey == SYSLOG_EVENT_SOURCE ) { // Add context menu - AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_EVENT_SOURCE, 'LN_FIELDS_EVENT_SOURCE', false); -/* - // Set OnClick Menu for SYSLOG_EVENT_SOURCE - $content['syslogmessages'][$counter]['values'][$mycolkey]['hasbuttons'] = true; - - // Menu Option to append filter - if ( strlen($content['searchstr']) > 0 ) - { - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=' . urlencode($content['searchstr']) . '+eventlogsource%3A%3D' . urlencode($content['syslogmessages'][$counter]['values'][$mycolkey]['encodedfieldvalue']) . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_ADDTOFILTER'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_GREEN'] - ); - } - - // More Menu entries - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => '?filter=eventlogsource%3A%3D' . urlencode($content['syslogmessages'][$counter]['values'][$mycolkey]['encodedfieldvalue']) . '&search=Search' . $content['additional_url_sourceonly'], - 'DisplayName' => GetAndReplaceLangStr($content['LN_VIEW_FILTERFORONLY'], $logArray[$mycolkey]), - 'IconSource' => $content['MENU_BULLET_BLUE'] - ); - $content['syslogmessages'][$counter]['values'][$mycolkey]['buttons'][] = array( - 'ButtonUrl' => 'http://kb.monitorware.com/kbsearch.php?sa=Search&origin=phplogcon&oid=' . SYSLOG_EVENT_SOURCE . '&q=' . $logArray[$mycolkey], - 'DisplayName' => $content['LN_VIEW_SEARCHFOR'] . " " . $content['LN_FIELDS_EVENTSOURCE'] . " '" . $logArray[$mycolkey] . "'", - 'IconSource' => $content['MENU_NETWORK'] - ); -*/ + AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_EVENT_SOURCE, 'LN_FIELDS_EVENTSOURCE', true); } else if ( $mycolkey == SYSLOG_EVENT_USER ) { // Add context menu - AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_EVENT_USER, 'LN_FIELDS_EVENT_USER', false); + AddOnClickMenu( $content['syslogmessages'][$counter]['values'][$mycolkey], FILTER_TYPE_STRING, SYSLOG_EVENT_USER, 'LN_FIELDS_EVENTUSER', false); } // WebServer Type fields else if ( $mycolkey == SYSLOG_WEBLOG_USER ) diff --git a/src/lang/de/main.php b/src/lang/de/main.php index 7b5b51f..4d69344 100644 --- a/src/lang/de/main.php +++ b/src/lang/de/main.php @@ -129,7 +129,9 @@ $content['LN_SEARCH_PERFORMADVANCED'] = "Erweiterte Suche starten"; $content['LN_VIEW_SEARCHFORGOOGLE'] = "Search Google for "; $content['LN_GEN_MESSAGEDETAILS'] = "Message Details"; $content['LN_VIEW_ADDTOFILTER'] = "Add '%1' to filterset"; + $content['LN_VIEW_EXCLUDEFILTER'] = "Exclude '%1' from filterset"; $content['LN_VIEW_FILTERFORONLY'] = "Filter for '%1' only"; + $content['LN_VIEW_SHOWALLBUT'] = "Show all except '%1'"; $content['LN_HIGHLIGHT'] = "Hightlight >>"; $content['LN_HIGHLIGHT_OFF'] = "Hightlight <<"; diff --git a/src/lang/pt_BR/main.php b/src/lang/pt_BR/main.php index 3d385fb..8ae181e 100644 --- a/src/lang/pt_BR/main.php +++ b/src/lang/pt_BR/main.php @@ -132,7 +132,9 @@ $content['LN_VIEW_SEARCHFOR'] = "Busca online por "; $content['LN_VIEW_SEARCHFORGOOGLE'] = "Busca no Google por "; $content['LN_GEN_MESSAGEDETAILS'] = "Detalhes da Mensagem"; $content['LN_VIEW_ADDTOFILTER'] = "Add '%1' to filterset"; + $content['LN_VIEW_EXCLUDEFILTER'] = "Exclude '%1' from filterset"; $content['LN_VIEW_FILTERFORONLY'] = "Filter for '%1' only"; + $content['LN_VIEW_SHOWALLBUT'] = "Show all except '%1'"; $content['LN_HIGHLIGHT'] = "Destacar >>"; $content['LN_HIGHLIGHT_OFF'] = "Destacar <<";