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

2013-01-09 Dario Rodriguez <dario.rodriguez@artica.es> 

* lib/PandoraFMS/DataServer.pm: Fixed a bug which creates modules
        with names which have \n\r and later create problems when editing
        the module information.

	MARGED FROM 4.0.3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7394 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2013-01-09 12:59:11 +00:00
parent 28048fb528
commit 3db0805df0
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/ChangeLog
View File

@ -1,3 +1,11 @@
2013-01-09 Dario Rodriguez <dario.rodriguez@artica.es>
* lib/PandoraFMS/DataServer.pm: Fixed a bug which creates modules
with names which have \n\r and later create problems when editing
the module information.
MARGED FROM 4.0.3
2013-01-09 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/NetworkServer.pm: Fixed bug #3555223 about

7
pandora_server/lib/PandoraFMS/DataServer.pm
View File

@ -462,6 +462,13 @@ sub process_xml_data ($$$$$) {
my $module_name = get_tag_value ($module_data, 'name', '');
# Clean module_name because sometimes due to errors or problems
# creating XMLs it could contain carriage returns and later they
# are a pain when you update module configuration because the name won't
# save the carriage return.
$module_name =~ s/\r//g;
$module_name =~ s/\n//g;
# Unnamed module
next if ($module_name eq '');