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

2011-11-28 Sergio Martin <sergio.martin@artica.es> 

* operation/integria_incidents/incident.php: Fixed check of 
	empty xml



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5180 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-11-28 09:20:55 +00:00
parent 1a8aa62487
commit 0463fd0238
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-11-28 Sergio Martin <sergio.martin@artica.es>
* operation/integria_incidents/incident.php: Fixed check of
empty xml
2011-11-28 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-11-28 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php: Changed parameter in * include/functions_agents.php: Changed parameter in

9
pandora_console/operation/integria_incidents/incident.php
View File

@ -232,7 +232,14 @@ else {
// If is a valid XML, parse it // If is a valid XML, parse it
if(xml_parse(xml_parser_create(), $xml)) { if(xml_parse(xml_parser_create(), $xml)) {
$result = incidents_xml_to_array($xml); // Check if xml is empty
if($xml == "<xml>\n</xml>\n") {
$result = false;
}
else {
$result = incidents_xml_to_array($xml);
}
if($result == false) { if($result == false) {
$result = array(); $result = array();
} }