tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in event list.

Browse Source
This commit is contained in:
Vanessa Gil 2014-11-18 15:24:20 +01:00
parent 049daed117
commit 8d3af40d7e
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/operation/events/events.build_query.php
View File

@ -17,7 +17,7 @@ $groups = users_get_groups($id_user, 'ER');
$propagate = db_get_value('propagate','tgrupo','id_grupo',$id_group); $propagate = db_get_value('propagate','tgrupo','id_grupo',$id_group);
if ($group > 0) { if ($id_group > 0) {
if ($propagate) { if ($propagate) {
$childrens_ids = array($id_group); $childrens_ids = array($id_group);
@ -45,15 +45,9 @@ if ($id_group > 0 && in_array ($id_group, array_keys ($groups))) {
$sql_post = " AND id_grupo = $id_group"; $sql_post = " AND id_grupo = $id_group";
} }
} }
else {
if (is_user_admin ($id_user)) {
//Do nothing if you're admin, you get full access
$sql_post = "";
}
else { else {
$sql_post = " AND id_grupo IN (" . implode (",", array_keys ($groups)) . ")"; $sql_post = " AND id_grupo IN (" . implode (",", array_keys ($groups)) . ")";
} }
}
// Skip system messages if user is not PM // Skip system messages if user is not PM
if (!check_acl ($id_user, 0, "PM")) { if (!check_acl ($id_user, 0, "PM")) {
@ -186,7 +180,7 @@ if (!empty($tag_without)) {
if ($first) $first = false; if ($first) $first = false;
else $sql_post .= " AND "; else $sql_post .= " AND ";
$sql_post .= "tags NOT LIKE '" . tags_get_name($id_tag) . "'"; $sql_post .= "tags <> '" . tags_get_name($id_tag) . "'";
} }
$sql_post .= ' ) '; $sql_post .= ' ) ';
} }