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-10147-login-nodo-tarda' into 'develop' 

Ent 10147 login nodo tarda

See merge request artica/pandorafms!6315
This commit is contained in:
Matias Didier 2023-08-07 08:49:43 +00:00
parent e4aea936e0 0534f59f92
commit 4e926e3076
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pandora_console/include/functions_agents.php
View File

@ -583,12 +583,6 @@ function agents_get_agents(
$status_sql = '( $status_sql = '(
normal_count <> total_count normal_count <> total_count
OR total_count = notinit_count)'; OR total_count = notinit_count)';
// The AGENT_STATUS_NOT_NORMAL filter must show all agents that are not in normal status
/*
"(
normal_count <> total_count
AND
(normal_count + notinit_count) <> total_count)";*/
break; break;
case AGENT_STATUS_NOT_INIT: case AGENT_STATUS_NOT_INIT:
@ -605,32 +599,28 @@ function agents_get_agents(
$filter_nogroup = $filter; $filter_nogroup = $filter;
// Get user groups // Get user groups.
$groups = array_keys(users_get_groups($config['id_user'], $access, false)); $groups = array_keys(users_get_groups($config['id_user'], $access, false));
// If no group specified, get all user groups // If no group specified, get all user groups.
if (empty($filter['id_grupo'])) { if (empty($filter['id_grupo'])) {
$all_groups = true; $all_groups = true;
$filter['id_grupo'] = $groups; $filter['id_grupo'] = $groups;
} else if (! is_array($filter['id_grupo'])) { } else if (! is_array($filter['id_grupo'])) {
$all_groups = false; $all_groups = false;
// If group is specified but not allowed, return false // If group is specified but not allowed, return false.
if (! in_array($filter['id_grupo'], $groups)) { if (! in_array($filter['id_grupo'], $groups)) {
return false; return false;
} }
$filter['id_grupo'] = (array) $filter['id_grupo']; $filter['id_grupo'] = (array) $filter['id_grupo'];
// Make an array // Make an array.
} else { } else {
$all_groups = true; $all_groups = true;
// Check each group specified to the user groups, remove unwanted groups
foreach ($filter['id_grupo'] as $key => $id_group) {
if (! in_array($id_group, $groups)) {
unset($filter['id_grupo'][$key]);
}
}
// If no allowed groups are specified return false $filter['id_grupo'] = array_intersect($groups, $filter['id_grupo']);
// If no allowed groups are specified return false.
if (count($filter['id_grupo']) == 0) { if (count($filter['id_grupo']) == 0) {
return false; return false;
} }