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

2012-12-12 Hirofumi Kosaka <kosaka@rworks.jp> 

* godmode/agentes/module_manager_editor.php: Fixed a bug only
	for the Enterprise version.  When 'Remote Configuration' is
	enabled and you try to create new module, which name includes
	meta characters, you will get the error "The field name and
	name in module_name in data configuration are different."

	Merged from branch 4.x.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7263 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2012-12-12 03:37:54 +00:00
parent cba92b1a08
commit 62ce961cbf
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2012-12-12 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/agentes/module_manager_editor.php: Fixed a bug only
for the Enterprise version. When 'Remote Configuration' is
enabled and you try to create new module, which name includes
meta characters, you will get the error "The field name and
name in module_name in data configuration are different."
Merged from branch 4.x.
2012-12-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/ajax/agent.php

8
pandora_console/godmode/agentes/module_manager_editor.php
View File

@ -470,11 +470,11 @@ $(document).ready (function () {
//Check the name
name = $("#text-name").val();
remote_config = $("#textarea_configuration_data").val();
regexp_name = new RegExp('module_name\\s*' + name+"\n");
regexp_name = new RegExp('module_name\\s*' + name.replace(/([^0-9A-Za-z_])/g, "\\$1") +"\n");
regexp_plugin = new RegExp('^module_plugin\\s*');
if (remote_config == '' || remote_config.match(regexp_name) ||
remote_config.match(regexp_plugin) ||
$("#id_module_type").val()==100 ||