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

Fixed error in group view with father groups without user read permissions. Ticket#3395

This commit is contained in:
Arturo Gonzalez 2016-02-18 15:04:59 +01:00
parent e9eb16a848
commit e5c05c7055
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_groupview.php
View File

@ -585,6 +585,8 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
if ($id_user == false) { if ($id_user == false) {
$id_user = $config['id_user']; $id_user = $config['id_user'];
} }
$groups_with_privileges = users_get_groups($id_user);
$groups_with_privileges = implode('","', $groups_with_privileges);
$user_groups = array(); $user_groups = array();
$user_tags = array(); $user_tags = array();
@ -699,12 +701,16 @@ function groupview_get_data ($id_user = false, $user_strict = false, $acltags, $
} }
//Eliminate the first comma //Eliminate the first comma
$fathers_id = substr($fathers_id, 1); $fathers_id = substr($fathers_id, 1);
while ($fathers_id{0} == ',') {
$fathers_id = substr($fathers_id, 1);
}
//Takes the parents even without agents, complete groups //Takes the parents even without agents, complete groups
if ($fathers_id) { if ($fathers_id) {
$list_father_groups = db_get_all_rows_sql(" $list_father_groups = db_get_all_rows_sql("
SELECT * SELECT *
FROM tgrupo FROM tgrupo
WHERE id_grupo IN (" . $fathers_id . ") WHERE id_grupo IN (" . $fathers_id . ")
AND nombre IN (\"". $groups_with_privileges ."\")
ORDER BY nombre COLLATE utf8_general_ci ASC"); ORDER BY nombre COLLATE utf8_general_ci ASC");
if (!empty($list_father_groups)) { if (!empty($list_father_groups)) {
//Merges the arrays and eliminates the duplicates groups //Merges the arrays and eliminates the duplicates groups