tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1069-bad-events-sql-when-are-grouped-by-agent-dev' into 'develop' 

Added good match to tags list

See merge request !627
This commit is contained in:
slerena 2017-06-28 16:26:10 +02:00
parent 1b5d36d89f 9348562ee4
commit 0150e9b555
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_events.php
View File

@ -3394,9 +3394,9 @@ function events_sql_events_grouped_agents($id_agent, $server_id = -1,
$sql_post .= " AND (utimestamp <= " . $udate_to . ")";
}
}
//Search by tag
if (!empty($tag_with)) {
if (!empty($tag_with) && (io_safe_output($tag_with) != "[]") && (io_safe_output($tag_with) != "[\"0\"]")) {
$sql_post .= ' AND ( ';
$first = true;
foreach ($tag_with as $id_tag) {
@ -3406,7 +3406,7 @@ function events_sql_events_grouped_agents($id_agent, $server_id = -1,
}
$sql_post .= ' ) ';
}
if (!empty($tag_without)) {
if (!empty($tag_without) && (io_safe_output($tag_without) != "[]") && (io_safe_output($tag_with) != "[\"0\"]")) {
$sql_post .= ' AND ( ';
$first = true;
foreach ($tag_without as $id_tag) {