From 85e40b30dceac6bd0a41c365f3d616daaddf6377 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 9 Jul 2019 17:54:23 +0200
Subject: [PATCH] Fix: user filter load tags

---
 pandora_console/operation/events/events.php | 85 +++++++++++----------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index da7123e728..9561872288 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -334,6 +334,50 @@ if (is_ajax()) {
     exit;
 }
 
+/*
+ * Load user default form.
+ */
+
+$user_filter = db_get_row_sql(
+    sprintf(
+        'SELECT f.id_filter, f.id_name
+         FROM tevent_filter f
+         INNER JOIN tusuario u
+             ON u.default_event_filter=f.id_filter
+         WHERE u.id_user = "%s" ',
+        $config['id_user']
+    )
+);
+if ($user_filter !== false) {
+    $filter = events_get_event_filter($user_filter['id_filter']);
+    if ($filter !== false) {
+        $id_group = $filter['id_group'];
+        $event_type = $filter['event_type'];
+        $severity = $filter['severity'];
+        $status = $filter['status'];
+        $search = $filter['search'];
+        $text_agent = $filter['text_agent'];
+        $id_agent = $filter['id_agent'];
+        $id_agent_module = $filter['id_agent_module'];
+        $pagination = $filter['pagination'];
+        $event_view_hr = $filter['event_view_hr'];
+        $id_user_ack = $filter['id_user_ack'];
+        $group_rep = $filter['group_rep'];
+        $tag_with = json_decode(io_safe_output($filter['tag_with']));
+        $tag_without = json_decode(io_safe_output($filter['tag_without']));
+
+        $tag_with_base64 = base64_encode(json_encode($tag_with));
+        $tag_without_base64 = base64_encode(json_encode($tag_without));
+
+        $filter_only_alert = $filter['filter_only_alert'];
+        $id_group_filter = $filter['id_group_filter'];
+        $date_from = $filter['date_from'];
+        $date_to = $filter['date_to'];
+        $source = $filter['source'];
+        $id_extra = $filter['id_extra'];
+        $user_comment = $filter['user_comment'];
+    }
+}
 
 // TAGS.
 // Get the tags where the user have permissions in Events reading tasks.
@@ -736,47 +780,6 @@ if (is_metaconsole() !== true) {
     }
 }
 
-/*
- * Load user default form.
- */
-
-$user_filter = db_get_row_sql(
-    sprintf(
-        'SELECT f.id_filter, f.id_name
-         FROM tevent_filter f
-         INNER JOIN tusuario u
-             ON u.default_event_filter=f.id_filter
-         WHERE u.id_user = "%s" ',
-        $config['id_user']
-    )
-);
-if ($user_filter !== false) {
-    $filter = events_get_event_filter($user_filter['id_filter']);
-    if ($filter !== false) {
-        $id_group = $filter['id_group'];
-        $event_type = $filter['event_type'];
-        $severity = $filter['severity'];
-        $status = $filter['status'];
-        $search = $filter['search'];
-        $text_agent = $filter['text_agent'];
-        $id_agent = $filter['id_agent'];
-        $id_agent_module = $filter['id_agent_module'];
-        $pagination = $filter['pagination'];
-        $event_view_hr = $filter['event_view_hr'];
-        $id_user_ack = $filter['id_user_ack'];
-        $group_rep = $filter['group_rep'];
-        $tag_with = $filter['tag_with'];
-        $tag_without = $filter['tag_without'];
-        $filter_only_alert = $filter['filter_only_alert'];
-        $id_group_filter = $filter['id_group_filter'];
-        $date_from = $filter['date_from'];
-        $date_to = $filter['date_to'];
-        $source = $filter['source'];
-        $id_extra = $filter['id_extra'];
-        $user_comment = $filter['user_comment'];
-    }
-}
-
 /*
  * Load filter form.
  */