From 88f98cea4ca131c5224cef992500d927173fc732 Mon Sep 17 00:00:00 2001 From: zarzuelo <noreply@pandorafms.org> Date: Thu, 21 Jul 2011 09:47:02 +0000 Subject: [PATCH] 2011-07-21 Sergio Martin <sergio.martin@artica.es> * operation/agentes/status_monitor.php: Fixed an empty group check and a subquery_enterprise not exist variables for bug 3371206 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4611 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/operation/agentes/status_monitor.php | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 22a1ba5a7b..0c2a486f1a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2011-07-21 Sergio Martin <sergio.martin@artica.es> + + * operation/agentes/status_monitor.php: Fixed an empty group check + and a subquery_enterprise not exist variables for bug 3371206 + 2011-07-21 Ramon Novoa <rnovoa@artica.es> * extras/pandoradb_migrate_v3.2_to_v4.0.sql: Removed already existing diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 9e26e22592..8e00bc669d 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -39,6 +39,10 @@ if (ENTERPRISE_NOT_HOOK !== $isFunctionPolicies) { $subquery_enterprise = subquery_acl_enterprise(); $subquery_enterprise2 = subquery_acl_enterprise('AND', 'tagente.id_agente'); } +else { + $subquery_enterprise = ''; + $subquery_enterprise2 = ''; +} ui_print_page_header ("Monitor detail", "images/brick.png", false); @@ -200,7 +204,7 @@ $sql = " FROM tagente, tagente_modulo, tagente_estado if ($ag_group > 0 && check_acl ($config["id_user"], $ag_group, "AR")) { $sql .= sprintf (" AND tagente.id_grupo = %d", $ag_group); } -else { +elseif($user_groups != '') { // User has explicit permission on group 1 ? $sql .= " AND tagente.id_grupo IN (".$user_groups.")"; }