From 9b1a57a89d95394307a08e684045fa334541b760 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Tue, 24 Mar 2015 19:08:43 +0100 Subject: [PATCH] Fixed an error on the check acl functions --- pandora_console/include/functions_tags.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/functions_tags.php b/pandora_console/include/functions_tags.php index 24e1b973ca..450f616cfe 100644 --- a/pandora_console/include/functions_tags.php +++ b/pandora_console/include/functions_tags.php @@ -1029,8 +1029,8 @@ function tags_check_acl($id_user, $id_group, $access, $tags = array(), $flag_id_ return false; } - // If there are not tags restrictions or tags passed, return true - if (empty($acls) || empty($tags)) { + // If there are not tags restrictions or tags passed, check the group access + if ((empty($acls) || empty($tags)) && check_acl($id_user, $id_group, $access)) { return true; } @@ -1127,8 +1127,8 @@ function tags_check_acl_event($id_user, $id_group, $access, $tags = array(),$p = return false; } - // If there are not tags restrictions or tags passed, return true - if(empty($acls) || empty($tags)) { + // If there are not tags restrictions or tags passed, check the group access + if ((empty($acls) || empty($tags)) && check_acl($id_user, $id_group, $access)) { return true; } @@ -2195,7 +2195,7 @@ function tags_get_user_module_and_tags ($id_user = false, $access = 'AR', $stric } $acl_column = get_acl_column($access); - + $sql = sprintf("SELECT tags, id_grupo FROM tusuario_perfil, tperfil WHERE tperfil.id_perfil = tusuario_perfil.id_perfil AND