From 82b21020f2e5bf17add45472155ec9ee88dbba84 Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Thu, 8 Sep 2016 14:40:01 +0200
Subject: [PATCH] Fixed problems with acl's. Ticket: #3912
---
pandora_console/godmode/events/event_filter.php | 2 +-
.../godmode/reporting/graph_builder.graph_editor.php | 2 +-
pandora_console/operation/agentes/alerts_status.php | 2 +-
pandora_console/operation/agentes/group_view.php | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pandora_console/godmode/events/event_filter.php b/pandora_console/godmode/events/event_filter.php
index e3d68c5240..d2018c459a 100644
--- a/pandora_console/godmode/events/event_filter.php
+++ b/pandora_console/godmode/events/event_filter.php
@@ -20,7 +20,7 @@ check_login ();
$event_w = check_acl ($config['id_user'], 0, "EW");
$event_m = check_acl ($config['id_user'], 0, "EM");
-$access = ($event_w == true) ? 'EW' : ($event_m == true) ? 'EM' : 'EW';
+$access = ($event_w == true) ? 'EW' : (($event_m == true) ? 'EM' : 'EW');
if (!$event_w && !$event_m) {
db_pandora_audit("ACL Violation",
diff --git a/pandora_console/godmode/reporting/graph_builder.graph_editor.php b/pandora_console/godmode/reporting/graph_builder.graph_editor.php
index de2649bfd2..745b91ed15 100644
--- a/pandora_console/godmode/reporting/graph_builder.graph_editor.php
+++ b/pandora_console/godmode/reporting/graph_builder.graph_editor.php
@@ -139,7 +139,7 @@ echo "<table width='100%' cellpadding='4' cellpadding='4' class='databox filters
echo "<tr>";
echo "<td colspan='3'>".__('Filter group')."</td>";
echo "</tr><tr>";
-echo "<td colspan='3'>".html_print_select_groups($config['id_user'], ($report_w == true) ? 'RW' : ($report_m == true) ? 'RM' : 'RW',
+echo "<td colspan='3'>".html_print_select_groups($config['id_user'], ($report_w == true) ? 'RW' : (($report_m == true) ? 'RM' : 'RW'),
true, 'group', '', 'filterByGroup($(\'#group\').val());',
'', 0, true)."</td>";
echo "</tr><tr>";
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 9085191788..2172bd555b 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -111,7 +111,7 @@ if ($idAgent != 0) {
else {
$agent_a = check_acl ($config['id_user'], 0, "AR");
$agent_w = check_acl ($config['id_user'], 0, "AW");
- $access = ($agent_a == true) ? 'AR' : ($agent_w == true) ? 'AW' : 'AR';
+ $access = ($agent_a == true) ? 'AR' : (($agent_w == true) ? 'AW' : 'AR');
if (!$agent_a && !$agent_w) {
db_pandora_audit("ACL Violation","Trying to access alert view");
diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index db4c7f07c4..28bb50a508 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -70,7 +70,7 @@ ui_print_page_header (__("Group view"), "images/group.png", false, "", false, $u
$strict_user = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']);
-$all_data = groupview_status_modules_agents ($config['id_user'], $strict_user, ($agent_a == true) ? 'AR' : ($agent_w == true) ? 'AW' : 'AR', $strict_user);
+$all_data = groupview_status_modules_agents ($config['id_user'], $strict_user, ($agent_a == true) ? 'AR' : (($agent_w == true) ? 'AW' : 'AR'), $strict_user);
$total_agentes = 0;
$monitor_ok = 0;