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

Merge branch 'ent-9384-14062-Problema-con-onclick-en-la-lista-de-eventos' into 'develop' 

fixed 500

See merge request artica/pandorafms!5109
This commit is contained in:
Daniel Rodriguez 2022-09-19 14:47:44 +00:00
parent 9877d59ea6 2852311cf7
commit fcca522b0c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/functions_events.php
View File

@ -1205,7 +1205,12 @@ function events_get_all(
$tags = json_decode($tag_without, true);
if (is_array($tags) === true && in_array('0', $tags) === false) {
if (!$user_is_admin) {
$user_tags = array_flip(tags_get_tags_for_module_search());
$tags_module_search = tags_get_tags_for_module_search();
if ($tags_module_search === false) {
$tags_module_search = [];
}
$user_tags = array_flip($tags_module_search);
if ($user_tags != null) {
foreach ($tags as $key_tag => $id_tag) {
// User cannot filter with those tags.
@ -4948,6 +4953,8 @@ function events_clean_tags($tags)
}
$event_tags = tags_get_tags_formatted($tags, false);
$event_tags = io_safe_input($event_tags);
return explode(',', str_replace(' ', '', $event_tags));
}

3
pandora_console/include/functions_tags.php
View File

@ -1334,7 +1334,7 @@ function tags_checks_event_acl($id_user, $id_group, $access, $tags=[], $children
WHERE ".get_acl_column($access).' = 1)';
if (isset($id_group)) {
$sql .= 'AND id_grupo = '.$id_group;
$sql .= ' AND id_grupo = '.$id_group;
}
$user_has_perm_without_tags = db_get_all_rows_sql($sql);
@ -1343,6 +1343,7 @@ function tags_checks_event_acl($id_user, $id_group, $access, $tags=[], $children
return true;
}
$tags_aux = [];
$tags_str = '';
if (!empty($tags)) {
foreach ($tags as $tag) {