tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added alias when creating and modifying agent

Browse Source
This commit is contained in:
Daniel Maya 2017-03-07 15:36:04 +01:00
parent 70c6a111fc
commit d1302731b6
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pandora_console/include/functions_api.php
View File

@ -1170,7 +1170,7 @@ function api_set_update_agent($id_agent, $thrash2, $other, $thrash3) {
return; return;
} }
$name = $other['data'][0]; $alias = $other['data'][0];
$ip = $other['data'][1]; $ip = $other['data'][1];
$idParent = $other['data'][2]; $idParent = $other['data'][2];
$idGroup = $other['data'][3]; $idGroup = $other['data'][3];
@ -1197,7 +1197,7 @@ function api_set_update_agent($id_agent, $thrash2, $other, $thrash3) {
} }
$return = db_process_sql_update('tagente', $return = db_process_sql_update('tagente',
array('nombre' => $name, array('alias' => $alias,
'direccion' => $ip, 'direccion' => $ip,
'id_grupo' => $idGroup, 'id_grupo' => $idGroup,
'intervalo' => $intervalSeconds, 'intervalo' => $intervalSeconds,
@ -1242,7 +1242,7 @@ function api_set_new_agent($thrash1, $thrash2, $other, $thrash3) {
return; return;
} }
$name = $other['data'][0]; $alias = $other['data'][0];
$ip = $other['data'][1]; $ip = $other['data'][1];
$idParent = $other['data'][2]; $idParent = $other['data'][2];
$idGroup = $other['data'][3]; $idGroup = $other['data'][3];
@ -1256,6 +1256,16 @@ function api_set_new_agent($thrash1, $thrash2, $other, $thrash3) {
$learningMode = $other['data'][10]; $learningMode = $other['data'][10];
$disabled = $other['data'][11]; $disabled = $other['data'][11];
$description = $other['data'][12]; $description = $other['data'][12];
$alias_as_name = $other['data'][13];
if($alias_as_name && !empty($alias)){
$name = $alias;
} else {
$name = hash("sha256",$alias . "|" .$direccion_agente ."|". time() ."|". sprintf("%04d", rand(0,10000)));
if(empty($alias)){
$alias = $name;
}
}
if ($cascadeProtection == 1) { if ($cascadeProtection == 1) {
if (($idParent != 0) && (db_get_value_sql('SELECT id_agente_modulo if (($idParent != 0) && (db_get_value_sql('SELECT id_agente_modulo
@ -1311,6 +1321,7 @@ function api_set_new_agent($thrash1, $thrash2, $other, $thrash3) {
else { else {
$idAgente = db_process_sql_insert ('tagente', $idAgente = db_process_sql_insert ('tagente',
array ('nombre' => $name, array ('nombre' => $name,
'alias' => $alias,
'direccion' => $ip, 'direccion' => $ip,
'id_grupo' => $idGroup, 'id_grupo' => $idGroup,
'intervalo' => $intervalSeconds, 'intervalo' => $intervalSeconds,
@ -2086,13 +2097,14 @@ function api_get_group_agent_by_alias($thrash1, $thrash2, $other, $thrash3) {
foreach($servers as $server) { foreach($servers as $server) {
if (metaconsole_connect($server) == NOERR) { if (metaconsole_connect($server) == NOERR) {
$agent_id = agents_get_agent_id($other['data'][0],true); $sql = sprintf("SELECT tagente.id_agente FROM tagente WHERE alias LIKE '%s' ",$other['data'][0]);
$agent_id = db_get_all_rows_sql($sql);
if ($agent_id) { foreach ($agent_id as &$id) {
$sql = sprintf("SELECT groups.nombre nombre $sql = sprintf("SELECT groups.nombre nombre
FROM tagente agents, tgrupo groups FROM tagente agents, tgrupo groups
WHERE id_agente = %d WHERE id_agente = %d
AND agents.id_grupo = groups.id_grupo",$agent_id); AND agents.id_grupo = groups.id_grupo",$id['id_agente']);
$group_server_names = db_get_all_rows_sql($sql); $group_server_names = db_get_all_rows_sql($sql);
if ($group_server_names) { if ($group_server_names) {