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

Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop

This commit is contained in:
m-lopez-f 2015-03-23 14:48:45 +01:00
parent 581d5e9c5f 118b980f4e
commit a22d3f5434
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/godmode/events/event_filter.php
View File

@ -74,11 +74,23 @@ if ($multiple_delete) {
__('Not deleted. Error deleting data'));
}
$strict_acl = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']);
$own_info = get_user_info ($config['id_user']);
// Get group list that user has access
$groups_user = users_get_groups ($config['id_user'], "EW", users_can_manage_group_all(), true);
if ($strict_acl) {
$groups_user = users_get_strict_mode_groups($config['id_user'],
users_can_manage_group_all());
}
else {
$groups_user = users_get_groups ($config['id_user'], "EW",
users_can_manage_group_all(), true);
}
$sql = "SELECT * FROM tevent_filter WHERE id_group_filter IN (".implode(',', array_keys ($groups_user)).")";
$sql = "
SELECT *
FROM tevent_filter
WHERE id_group_filter IN (".implode(',', array_keys ($groups_user)).")";
$filters = db_get_all_rows_sql($sql);
if ($filters === false)

19
pandora_console/include/functions_events.php
View File

@ -1580,14 +1580,27 @@ function events_get_event_filter ($id_filter, $filter = false, $fields = false)
* @param boolean If event filters are used for manage/view operations (non admin users can see group ALL for manage) # Fix
* @return array A event filter matching id and filter or false.
*/
function events_get_event_filter_select($manage = true){
function events_get_event_filter_select($manage = true) {
global $config;
$user_groups = users_get_groups ($config['id_user'], "EW", $manage, true);
$strict_acl = db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']);
if ($strict_acl) {
$user_groups = users_get_strict_mode_groups($config['id_user'],
users_can_manage_group_all());
}
else {
$user_groups = users_get_groups ($config['id_user'], "EW",
users_can_manage_group_all(), true);
}
if(empty($user_groups)) {
return array();
}
$sql = "SELECT id_filter, id_name FROM tevent_filter WHERE id_group IN (".implode(',', array_keys ($user_groups)).")";
$sql = "
SELECT id_filter, id_name
FROM tevent_filter
WHERE id_group IN (" . implode(',', array_keys ($user_groups)) . ")";
$event_filters = db_get_all_rows_sql($sql);