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

2013-10-21 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_api.php: applied the path from
	"http://sourceforge.net/p/pandora/bugs/2395/", thanks Jorge Loza.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8939 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-10-21 07:37:03 +00:00
parent 4a10eea9f0
commit 3462a1717e
2 changed files with 8 additions and 1 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 @@
2013-10-21 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: applied the path from
"http://sourceforge.net/p/pandora/bugs/2395/", thanks Jorge Loza.
MERGED FROM THE BRANCH PANDORA_4.0
2013-10-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/configurar_agente.php: fixed the string of

2
pandora_console/include/functions_api.php
View File

@ -4732,7 +4732,7 @@ function api_set_module_data($id, $thrash2, $other, $trash1) {
$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['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);