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

add condition to avoid trying to retrieve a non existing event filter when synchronizing meta and node 

Former-commit-id: 83a1f9ad1c99de0e29a880de4ed6c518884bda31
This commit is contained in:
alejandro-campos 2019-05-06 15:06:26 +02:00
parent bcbcd763a1
commit a622dcc9d4
1 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
pandora_console/operation/events/events_list.php
View File

@ -232,68 +232,70 @@ if ($user_filter != 0 && empty($id_name) && !$update_from_filter_table) {
);
$user_default_filter = $user_default_filter[0];
// FORM.
$id_name = $user_default_filter['id_name'];
$id_group = $user_default_filter['id_group'];
if ($user_default_filter['event_type'] != '') {
$event_type = $user_default_filter['event_type'];
}
if (!empty($user_default_filter)) {
// FORM.
$id_name = $user_default_filter['id_name'];
$id_group = $user_default_filter['id_group'];
if ($user_default_filter['event_type'] != '') {
$event_type = $user_default_filter['event_type'];
}
$severity = $user_default_filter['severity'];
$status = $user_default_filter['status'];
$event_view_hr = $user_default_filter['event_view_hr'];
$group_rep = $user_default_filter['group_rep'];
$id_extra = $user_default_filter['id_extra'];
$user_comment = $user_default_filter['user_comment'];
$source = $user_default_filter['source'];
$severity = $user_default_filter['severity'];
$status = $user_default_filter['status'];
$event_view_hr = $user_default_filter['event_view_hr'];
$group_rep = $user_default_filter['group_rep'];
$id_extra = $user_default_filter['id_extra'];
$user_comment = $user_default_filter['user_comment'];
$source = $user_default_filter['source'];
if ($user_default_filter['search'] != '') {
$search = $user_default_filter['search'];
}
if ($user_default_filter['search'] != '') {
$search = $user_default_filter['search'];
}
if ($user_default_filter['id_user_ack'] != 0) {
$id_user_ack = $user_default_filter['id_user_ack'];
}
if ($user_default_filter['id_user_ack'] != 0) {
$id_user_ack = $user_default_filter['id_user_ack'];
}
if ($user_default_filter['id_agent_module'] != 0) {
$id_agent_module = $user_default_filter['id_agent_module'];
}
if ($user_default_filter['id_agent_module'] != 0) {
$id_agent_module = $user_default_filter['id_agent_module'];
}
if ($user_default_filter['id_agent'] != 0) {
$id_agent = $user_default_filter['id_agent'];
$text_agent = agents_get_alias($id_agent);
}
if ($user_default_filter['id_agent'] != 0) {
$id_agent = $user_default_filter['id_agent'];
$text_agent = agents_get_alias($id_agent);
}
if ($user_default_filter['filter_only_alert'] != -1) {
$filter_only_alert = $user_default_filter['filter_only_alert'];
}
if ($user_default_filter['filter_only_alert'] != -1) {
$filter_only_alert = $user_default_filter['filter_only_alert'];
}
if ($user_default_filter['pagination'] != 20) {
$pagination = $user_default_filter['pagination'];
}
if ($user_default_filter['pagination'] != 20) {
$pagination = $user_default_filter['pagination'];
}
if ($user_default_filter['date_from'] != '0000-00-00') {
$date_from = $user_default_filter['date_from'];
}
if ($user_default_filter['date_from'] != '0000-00-00') {
$date_from = $user_default_filter['date_from'];
}
if ($user_default_filter['date_to'] != '0000-00-00') {
$date_to = $user_default_filter['date_to'];
}
if ($user_default_filter['date_to'] != '0000-00-00') {
$date_to = $user_default_filter['date_to'];
}
if (io_safe_output($user_default_filter['tag_with']) != '[]'
&& io_safe_output($user_default_filter['tag_with']) != '["0"]'
) {
$tag_with = $user_default_filter['tag_with'];
$tag_with_clean = io_safe_output($tag_with);
$tag_with = json_decode($tag_with_clean, true);
}
if (io_safe_output($user_default_filter['tag_with']) != '[]'
&& io_safe_output($user_default_filter['tag_with']) != '["0"]'
) {
$tag_with = $user_default_filter['tag_with'];
$tag_with_clean = io_safe_output($tag_with);
$tag_with = json_decode($tag_with_clean, true);
}
if (io_safe_output($user_default_filter['tag_without']) != '[]'
&& io_safe_output($user_default_filter['tag_without']) != '["0"]'
) {
$tag_without = $user_default_filter['tag_without'];
$tag_without_clear = io_safe_output($tag_without);
$tag_without = json_decode($tag_without_clear, true);
if (io_safe_output($user_default_filter['tag_without']) != '[]'
&& io_safe_output($user_default_filter['tag_without']) != '["0"]'
) {
$tag_without = $user_default_filter['tag_without'];
$tag_without_clear = io_safe_output($tag_without);
$tag_without = json_decode($tag_without_clear, true);
}
}
}
@ -1043,7 +1045,7 @@ $events_filter .= $botom_update;
$events_filter .= '</form>';
// This is the filter div.
$user_filter = db_get_value(
'id_filter',
'default_event_filter',
'tusuario',
'id_user',
$config['id_user']