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-5165-error-pdf-report-names-generated-by-template' into 'develop' 

Fixed meta regex agent matching ids

See merge request artica/pandorafms!2976
This commit is contained in:
Daniel Rodriguez 2020-01-13 18:21:17 +01:00
parent b1b6306c30 2d303635ae
commit 33aaca3c4e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/include/functions_agents.php
View File

@ -3512,13 +3512,18 @@ function agents_get_status_animation($up=true)
function agents_get_agent_id_by_alias_regex($alias_regex, $flag='i', $limit=0) function agents_get_agent_id_by_alias_regex($alias_regex, $flag='i', $limit=0)
{ {
$agents_id = []; $agents_id = [];
$all_agents = agents_get_agents(false, ['id_agente', 'alias']); if (is_metaconsole()) {
$all_agents = agents_meta_get_agents('AR', '|');
} else {
$all_agents = agents_get_group_agents(0, true, 'lower', false, false, true, '|');
}
$agent_match = '/'.$alias_regex.'/'.$flag; $agent_match = '/'.$alias_regex.'/'.$flag;
foreach ($all_agents as $agent) { foreach ($all_agents as $agent_id => $agent_alias) {
$result_agent_match = preg_match($agent_match, $agent['alias']); $result_agent_match = preg_match($agent_match, $agent_alias);
if ($result_agent_match) { if ($result_agent_match) {
$agents_id[] = $agent['id_agente']; $agents_id[] = $agent_id;
$i++; $i++;
if ($i === $limit) { if ($i === $limit) {
break; break;