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

fixes

This commit is contained in:
fbsanchez 2020-09-18 11:47:50 +02:00
parent f8152d5ee5
commit 696b58544c
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/functions_events.php
View File

@ -929,9 +929,9 @@ function events_get_all(
}
if (!$user_is_admin) {
$ER_groups = users_get_groups($config['id_user'], 'ER', false);
$EM_groups = users_get_groups($config['id_user'], 'EM', false, true);
$EW_groups = users_get_groups($config['id_user'], 'EW', false, true);
$ER_groups = users_get_groups($config['id_user'], 'ER', true);
$EM_groups = users_get_groups($config['id_user'], 'EM', true, true);
$EW_groups = users_get_groups($config['id_user'], 'EW', true, true);
}
if (!$user_is_admin && !users_can_manage_group_all('ER')) {
@ -1412,6 +1412,8 @@ function events_get_all(
);
}
error_log(obhd($can_manage));
$can_write = '0 as user_can_write';
if (!empty($EW_groups)) {
$can_write = sprintf(

13
pandora_console/operation/events/events.php
View File

@ -470,8 +470,17 @@ $tags_select_with = [];
$tags_select_without = [];
$tag_with_temp = [];
$tag_without_temp = [];
$tag_with = json_decode(base64_decode($tag_with), true);
$tag_without = json_decode(base64_decode($tag_without), true);
$tags_select_without = [];
$tag_with_temp = [];
$tag_without_temp = [];
if (is_array($tag_with) === false) {
$tag_with = json_decode(base64_decode($tag_with), true);
}
if (is_array($tag_without) === false) {
$tag_without = json_decode(base64_decode($tag_without), true);
}
foreach ($tags as $id_tag => $tag) {