tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the agents retrieving on the metaconsole

Browse Source
This commit is contained in:
Alejandro Gallardo Escobar 2015-01-19 14:47:00 +01:00
parent 2ecff85928
commit 6074001552
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/include/class/Tree.class.php
View File

@ -297,7 +297,7 @@ class Tree {
} }
} }
protected function getAgents ($parent = 0, $parentType = '') { protected function getAgents ($parent = 0, $parentType = '', $server_id = false) {
// Agent name filter // Agent name filter
$agent_search = ""; $agent_search = "";
if (!empty($this->filter['searchAgent'])) { if (!empty($this->filter['searchAgent'])) {
@ -340,7 +340,6 @@ class Tree {
AND ta.disabled = 0 AND ta.disabled = 0
$agent_search $agent_search
ORDER BY ta.nombre ASC, ta.id_agente ASC, tam.nombre ASC, tam.id_agente_modulo ASC"; ORDER BY ta.nombre ASC, ta.id_agente ASC, tam.nombre ASC, tam.id_agente_modulo ASC";
$data = db_process_sql($sql);
break; break;
case 'tag': case 'tag':
$groups_clause = ""; $groups_clause = "";
@ -381,12 +380,21 @@ class Tree {
$groups_clause $groups_clause
$agent_search $agent_search
ORDER BY ta.nombre ASC, ta.id_agente ASC, tam.nombre ASC, tam.id_agente_modulo ASC"; ORDER BY ta.nombre ASC, ta.id_agente ASC, tam.nombre ASC, tam.id_agente_modulo ASC";
$data = db_process_sql($sql);
break; break;
default: default:
return array(); return array();
break; break;
} }
if (! defined ('METACONSOLE')) {
$data = db_process_sql($sql);
}
else if ($server_id) {
$server = metaconsole_get_servers($server_id);
if (metaconsole_connect($server) != NOERR) {
$data = db_process_sql($sql);
metaconsole_restore_db();
}
}
if (empty($data)) if (empty($data))
return array(); return array();
@ -825,7 +833,7 @@ class Tree {
if (metaconsole_connect($server) != NOERR) if (metaconsole_connect($server) != NOERR)
continue; continue;
$agents += $this->tree = $this->getAgents($group_id, $this->type); $agents += $this->tree = $this->getAgents($group_id, $this->type, $server_id);
metaconsole_restore_db(); metaconsole_restore_db();
} }