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

2013-07-11 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/agentes/configurar_agente.php: fixed overwrite the fields
	custom_string_* and custom_integer_* of module when update and
	these fields haven't a new value.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8517 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-07-11 13:10:01 +00:00
parent b535f03d22
commit 8db370ba28
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-07-11 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/configurar_agente.php: fixed overwrite the fields
custom_string_* and custom_integer_* of module when update and
these fields haven't a new value.
2013-07-11 Sergio Martin <sergio.martin@artica.es>
* include/graphs/pChart/pPie.class.php: Fix the colors of the

24
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -750,11 +750,25 @@ if ($update_module || $create_module) {
$old_configuration_data = (string) get_parameter ('old_configuration_data');
$new_configuration_data = '';
$custom_string_1 = (string) get_parameter ('custom_string_1');
$custom_string_2 = (string) get_parameter ('custom_string_2');
$custom_string_3 = (string) get_parameter ('custom_string_3');
$custom_integer_1 = (int) get_parameter ('prediction_module');
$custom_integer_2 = (int) get_parameter ('custom_integer_2');
$custom_string_1_default = '';
$custom_string_2_default = '';
$custom_string_3_default = '';
$custom_integer_1_default = 0;
$custom_integer_2_default = 0;
if ($update_module) {
$module = modules_get_agentmodule ($id_agent_module);
$custom_string_1_default = $module['custom_string_1'];
$custom_string_2_default = $module['custom_string_2'];
$custom_string_3_default = $module['custom_string_3'];
$custom_integer_1_default = $module['custom_integer_1'];
$custom_integer_2_default = $module['custom_integer_2'];
}
$custom_string_1 = (string) get_parameter ('custom_string_1', $custom_string_1_default);
$custom_string_2 = (string) get_parameter ('custom_string_2', $custom_string_2_default);
$custom_string_3 = (string) get_parameter ('custom_string_3', $custom_string_3_default);
$custom_integer_1 = (int) get_parameter ('prediction_module', $custom_integer_1_default);
$custom_integer_2 = (int) get_parameter ('custom_integer_2', $custom_integer_2_default);
// Get macros
$macros = (string) get_parameter ('macros');