diff --git a/ChangeLog b/ChangeLog index 5dff729..e5383e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,8 @@ Bug: This change addresses the issue 43 at http://code.google.com/p/waf-fle/issues/. It reflects problem with parsing of the modsec index file line where is empty or malformed Host header. Patch from Juraj Sakala +Bug: fixed issue #43, when processing filter with "not tag" generate an + error. Bug: Issue #45, unescaped output on TopRules chart, make chart unusable with special character in rule description. Thanks to Ibere Tizio, by report and propose a fix. diff --git a/functions.php b/functions.php index 7960bf8..7f958f5 100644 --- a/functions.php +++ b/functions.php @@ -1028,6 +1028,8 @@ function superFilter($selector, $trailer, $filterType, $count = FALSE, $extraFie if (isset($_SESSION[$filterType]['tag']) AND !isset($_SESSION[$filterType]['ruleid'])) { if (!isset($_SESSION[$filterType]['Not_tag'])) { $sql = $sql . ' JOIN events_messages ON events.event_id = events_messages.event_id JOIN events_messages_tag ON events_messages_tag.msg_id = events_messages.msg_id '; + }else { + $sql = $sql . ' JOIN events_messages ON events.event_id = events_messages.event_id '; } } @@ -1366,8 +1368,6 @@ function superFilter($selector, $trailer, $filterType, $count = FALSE, $extraFie // Concatenate selector and trailer $sql = $sql . $trailer; - //print "$sql
"; - if ($DEBUG) { $debugInfo[__FUNCTION__][$debugCount]['query'] = $sql; }