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

2014-07-10 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_api.php: fixed the call "set_update_agent"
	because before the call get the id_server but this data never
	was translated to name_server. And added id_server into the call
	"get_pandora_servers" in the last position.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10333 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-07-10 09:32:14 +00:00
parent 700f0a8055
commit 091ed258dd
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2014-07-10 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the call "set_update_agent"
because before the call get the id_server but this data never
was translated to name_server. And added id_server into the call
"get_pandora_servers" in the last position.
2014-07-10 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: restored the parameter name server in

17
pandora_console/include/functions_api.php
View File

@ -757,7 +757,7 @@ function api_set_update_agent($id_agent, $thrash2, $other, $thrash3) {
$cascadeProtection = $other['data'][4];
$intervalSeconds = $other['data'][5];
$idOS = $other['data'][6];
$idServer = $other['data'][7];
$nameServer = $other['data'][7];
$customId = $other['data'][8];
$learningMode = $other['data'][9];
$disabled = $other['data'][10];
@ -4857,7 +4857,7 @@ function api_set_delete_module($id, $id2, $other, $trash1) {
else {
$return = true;
}
$data['type'] = 'string';
if ($return === false) {
$data['data'] = 0;
@ -4866,7 +4866,7 @@ function api_set_delete_module($id, $id2, $other, $trash1) {
$data['data'] = $return;
}
returnData('string', $data);
return;
return;
}
else {
returnError('error_parameter', 'Error in the parameters.');
@ -4901,20 +4901,20 @@ function api_set_module_data($id, $thrash2, $other, $trash1) {
<data><![CDATA[%s]]></data>
</module>
</agent_data>";
$xml = sprintf($xmlTemplate, io_safe_output(get_os_name($agent['id_os'])),
io_safe_output($agent['os_version']), $agent['intervalo'],
io_safe_output($agent['agent_version']), date('Y/m/d H:i:s', $time),
io_safe_output($agent['nombre']), $agent['timezone_offset'],
io_safe_output($agentModule['nombre']), io_safe_output($agentModule['descripcion']), modules_get_type_name($agentModule['id_tipo_modulo']), $data);
if (false === @file_put_contents($config['remote_config'] . '/' . io_safe_output($agent['nombre']) . '.' . $time . '.data', $xml)) {
returnError('error_file', 'Can save agent data xml.');
}
else {
returnData('string', array('type' => 'string', 'data' => $xml));
return;
return;
}
}
}
@ -6666,7 +6666,8 @@ function api_get_pandora_servers($trash1, $trash2, $other, $returnType) {
'module_lag' => $server["module_lag"],
'threads' => $server["threads"],
'queued_modules' => $server["queued_modules"],
'keepalive' => $server['keepalive']
'keepalive' => $server['keepalive'],
'id_server' => $server['id_server']
);
// servers_get_info() returns "<a http:....>servername</a>" for recon server's name.