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

Merge branch '1614-Pete-SQL-en-buscador-consolas-visuales-dev' into 'develop' 

Fixed revert in functions_visual_map.php

See merge request artica/pandorafms!1097
This commit is contained in:
vgilc 2017-11-20 13:10:17 +01:00
parent a8e1a92bf1 faa4d5169a
commit 2502944dea
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pandora_console/include/functions_visual_map.php
View File

@ -3354,13 +3354,32 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
* @return array A list of layouts the user can see.
*/
function visual_map_get_user_layouts ($id_user = 0, $only_names = false, $filter = false, $returnAllGroup = true) {
if (! is_array ($filter))
if (! is_array ($filter)){
$filter = array ();
if ($returnAllGroup)
} else {
if(!empty($filter['name'])){
$where .= "name LIKE '%".io_safe_output($filter['name'])."%'";
unset($filter['name']);
}
}
if ($returnAllGroup) {
$groups = users_get_groups ($id_user, 'VR');
else
$groups = users_get_groups ($id_user, 'VR', false);
} else {
if(!empty($filter['group'])) {
$permissions_group = users_get_groups ($id_user, 'VR', false);
if(empty($permissions_group)){
$permissions_group = users_get_groups ($id_user, 'VM', false);
}
$groups = array_intersect_key($filter['group'], $permissions_group);
} else {
$groups = users_get_groups ($id_user, 'VR', false);
if(empty($groups)) {
$groups = users_get_groups ($id_user, 'VM', false);
}
}
unset($filter['group']);
}
if (!empty($groups)) {
if (empty($where))