tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Into the function 'tags_check_acl' fixed check for profile all with some tag. And added function 'tags_check_acl_by_module'

Browse Source
This commit is contained in:
mdtrooper 2014-10-20 16:40:20 +02:00
parent 7aa78eff25
commit 2471ca6375
1 changed files with 87 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
pandora_console/include/functions_tags.php
View File

@ -507,7 +507,8 @@ function tags_get_module_tags ($id_agent_module) {
if (empty($id_agent_module)) if (empty($id_agent_module))
return false; return false;
$tags = db_get_all_rows_filter('ttag_module', array('id_agente_modulo' => $id_agent_module), false); $tags = db_get_all_rows_filter('ttag_module',
array('id_agente_modulo' => $id_agent_module), false);
if ($tags === false) if ($tags === false)
return array(); return array();
@ -575,8 +576,8 @@ function tags_get_tags ($ids) {
$all_tags = tags_get_all_tags(true); $all_tags = tags_get_all_tags(true);
$tags = array(); $tags = array();
foreach($ids as $id) { foreach ($ids as $id) {
if(isset($all_tags[$id])) { if (isset($all_tags[$id])) {
$tags[$id] = $all_tags[$id]; $tags[$id] = $all_tags[$id];
} }
} }
@ -635,7 +636,10 @@ function tags_get_tags_formatted ($tags_array, $get_url = true) {
* @return mixed/string Tag ids * @return mixed/string Tag ids
*/ */
function tags_get_acl_tags($id_user, $id_group, $access = 'AR', $return_mode = 'module_condition', $query_prefix = '', $query_table = '') { function tags_get_acl_tags($id_user, $id_group, $access = 'AR',
$return_mode = 'module_condition', $query_prefix = '',
$query_table = '') {
global $config; global $config;
if ($id_user == false) { if ($id_user == false) {
@ -643,7 +647,7 @@ function tags_get_acl_tags($id_user, $id_group, $access = 'AR', $return_mode = '
} }
if (is_user_admin ($id_user)) { if (is_user_admin ($id_user)) {
switch($return_mode) { switch ($return_mode) {
case 'data': case 'data':
return array(); return array();
break; break;
@ -667,12 +671,12 @@ function tags_get_acl_tags($id_user, $id_group, $access = 'AR', $return_mode = '
elseif (!is_array($id_group)) { elseif (!is_array($id_group)) {
$id_group = (array) $id_group; $id_group = (array) $id_group;
} }
$id_group_aux = array(); $id_group_aux = array();
foreach ($id_group as $key=>$id) { foreach ($id_group as $key=>$id) {
array_push($id_group_aux, $id); array_push($id_group_aux, $id);
$parent = db_get_value('parent','tgrupo','id_grupo',$id); $parent = db_get_value('parent','tgrupo','id_grupo',$id);
if ($parent !== 0) { if ($parent !== 0) {
$propagate = db_get_value('propagate','tgrupo','id_grupo',$parent); $propagate = db_get_value('propagate','tgrupo','id_grupo',$parent);
if ($propagate == 1) { if ($propagate == 1) {
@ -933,7 +937,7 @@ function tags_has_user_acl_tags($id_user = false) {
function tags_get_user_tags($id_user = false, $access = 'AR') { function tags_get_user_tags($id_user = false, $access = 'AR') {
global $config; global $config;
if($id_user === false) { if ($id_user === false) {
$id_user = $config['id_user']; $id_user = $config['id_user'];
} }
@ -966,8 +970,8 @@ function tags_get_user_tags($id_user = false, $access = 'AR') {
// Merge the tags to get an array with all of them // Merge the tags to get an array with all of them
$user_tags_id = array(); $user_tags_id = array();
foreach($tags as $t) { foreach ($tags as $t) {
if(empty($user_tags_id)) { if(empty($user_tags_id)) {
$user_tags_id = $t; $user_tags_id = $t;
} }
@ -975,11 +979,11 @@ function tags_get_user_tags($id_user = false, $access = 'AR') {
$user_tags_id = array_unique(array_merge($t,$user_tags_id)); $user_tags_id = array_unique(array_merge($t,$user_tags_id));
} }
} }
// Set the format id=>name to tags // Set the format id=>name to tags
$user_tags = array(); $user_tags = array();
foreach($user_tags_id as $id) { foreach ($user_tags_id as $id) {
if(!isset($all_tags[$id])) { if (!isset($all_tags[$id])) {
continue; continue;
} }
$user_tags[$id] = $all_tags[$id]; $user_tags[$id] = $all_tags[$id];
@ -989,6 +993,25 @@ function tags_get_user_tags($id_user = false, $access = 'AR') {
return $user_tags; return $user_tags;
} }
function tags_check_acl_by_module($id_module = 0, $id_user = false,
$access = 'AW') {
$return = false;
if (!empty($id_module)) {
$tags = tags_get_module_tags($id_module);
$group = modules_get_agent_group($id_module);
if ($id_user === false) {
$id_user = $config["id_user"];
}
$return = tags_check_acl($id_user, $group, $access, $tags);
}
return $return;
}
/** /**
* Check the ACLs with tags * Check the ACLs with tags
* *
@ -1002,43 +1025,56 @@ function tags_get_user_tags($id_user = false, $access = 'AR') {
function tags_check_acl($id_user, $id_group, $access, $tags = array()) { function tags_check_acl($id_user, $id_group, $access, $tags = array()) {
global $config; global $config;
if($id_user === false) { if ($id_user === false) {
$id_user = $config['id_user']; $id_user = $config['id_user'];
} }
// Get parents to check in propagate ACL cases // Get parents to check in propagate ACL cases
if (!is_array($id_group) && $id_group != 0) { if (!is_array($id_group) && $id_group != 0) {
$id_group = array($id_group); $id_group = array($id_group);
$group = db_get_row_filter('tgrupo', array('id_grupo' => $id_group)); $group = db_get_row_filter('tgrupo',
$parents = groups_get_parents($group['parent'], true); array('id_grupo' => $id_group));
$parents = groups_get_parents($group['parent'], true);
foreach ($parents as $parent) {
$id_group[] = $parent['id_grupo']; foreach ($parents as $parent) {
} $id_group[] = $parent['id_grupo'];
}
} }
$acls = tags_get_acl_tags($id_user, $id_group, $access, 'data'); $acls = tags_get_acl_tags($id_user, $id_group, $access, 'data');
// If there are wrong parameters or fail ACL check, return false // If there are wrong parameters or fail ACL check, return false
if($acls === ERR_WRONG_PARAMETERS || $acls === ERR_ACL) { if ($acls === ERR_WRONG_PARAMETERS || $acls === ERR_ACL) {
return false; return false;
} }
// If there are not tags restrictions or tags passed, return true // If there are not tags restrictions or tags passed, return true
if(empty($acls) || empty($tags)) { if (empty($acls) || empty($tags)) {
return true; return true;
} }
# Fix: If user profile has more than one group, due to ACL propagation then id_group can be an array # Fix: If user profile has more than one group, due to ACL propagation then id_group can be an array
if (is_array($id_group)) { if (is_array($id_group)) {
foreach ($id_group as $group) { foreach ($id_group as $group) {
if($group > 0) { if ($group > 0) {
if(isset($acls[$group])) { if (array_key_exists(0, $acls)) {
foreach($tags as $tag) { //There is a All group
foreach ($tags as $tag) {
if (in_array($tag, $acls[0])) {
return true;
}
else {
return false;
}
}
}
else if (isset($acls[$group])) {
foreach ($tags as $tag) {
$tag = tags_get_id($tag); $tag = tags_get_id($tag);
if(in_array($tag, $acls[$group])) { if (in_array($tag, $acls[$group])) {
return true; return true;
} }
} }
@ -1046,24 +1082,26 @@ function tags_check_acl($id_user, $id_group, $access, $tags = array()) {
else { else {
return false; return false;
} }
} else { }
foreach($acls as $acl_tags) { else {
foreach($tags as $tag) { foreach ($acls as $acl_tags) {
$tag = tags_get_id($tag); foreach ($tags as $tag) {
if(in_array($tag, $acl_tags)) { $tag = tags_get_id($tag);
return true; if (in_array($tag, $acl_tags)) {
} return true;
}
} }
} }
} }
} }
} else { }
if($id_group > 0) { else {
if(isset($acls[$id_group])) { if ($id_group > 0) {
foreach($tags as $tag) { if (isset($acls[$id_group])) {
foreach ($tags as $tag) {
$tag = tags_get_id($tag); $tag = tags_get_id($tag);
if(in_array($tag, $acls[$id_group])) { if (in_array($tag, $acls[$id_group])) {
return true; return true;
} }
} }
@ -1073,23 +1111,23 @@ function tags_check_acl($id_user, $id_group, $access, $tags = array()) {
} }
} }
else { else {
foreach($acls as $acl_tags) { foreach ($acls as $acl_tags) {
foreach($tags as $tag) { foreach ($tags as $tag) {
$tag = tags_get_id($tag); $tag = tags_get_id($tag);
if(in_array($tag, $acl_tags)) { if (in_array($tag, $acl_tags)) {
return true; return true;
} }
} }
} }
} }
} }
return false; return false;
} }
function tags_check_acl_event($id_user, $id_group, $access, $tags = array(),$p = false) { function tags_check_acl_event($id_user, $id_group, $access, $tags = array(),$p = false) {
global $config; global $config;
if($id_user === false) { if($id_user === false) {
$id_user = $config['id_user']; $id_user = $config['id_user'];
} }