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

Fixed an ACL error on the 'tags_check_acl' and 'tags_check_acl_events' functions

This commit is contained in:
Alejandro Gallardo Escobar 2015-03-25 19:19:20 +01:00
parent 75d9d58c48
commit 3b06988082
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pandora_console/include/functions_tags.php
View File

@ -1030,8 +1030,14 @@ function tags_check_acl($id_user, $id_group, $access, $tags = array(), $flag_id_
}
// 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;
if (empty($acls) || empty($tags)) {
if (!is_array($id_group))
$group_id_array = array($id_group);
foreach ($id_group as $group) {
if (check_acl($id_user, $group, $access))
return true;
}
}
# Fix: If user profile has more than one group, due to ACL propagation then id_group can be an array
@ -1128,8 +1134,14 @@ function tags_check_acl_event($id_user, $id_group, $access, $tags = array(),$p =
}
// 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;
if (empty($acls) || empty($tags)) {
if (!is_array($id_group))
$group_id_array = array($id_group);
foreach ($id_group as $group) {
if (check_acl($id_user, $group, $access))
return true;
}
}
# Fix: If user profile has more than one group, due to ACL propagation then id_group can be an array