From 7b997a5a7ed85380da93f12036438dccefc52e95 Mon Sep 17 00:00:00 2001 From: slerena Date: Wed, 26 Nov 2008 16:52:09 +0000 Subject: [PATCH] 2008-11-26 Sancho Lerena * godmode/agentes/configurar_agente.php: Fixed problem with agent module groups. * include/config_process.php: Fixed typo on prominent_time config token. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1265 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/godmode/agentes/configurar_agente.php | 3 ++- pandora_console/godmode/agentes/manage_config.php | 7 ++----- pandora_console/include/config_process.php | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index c21a6c0c1b..9f0ef8e328 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2008-11-26 Sancho Lerena + + * godmode/agentes/configurar_agente.php: Fixed problem with agent module + groups. + + * include/config_process.php: Fixed typo on prominent_time config token. + + 2008-11-26 Jorge Gonzalez * pandoradb_data.sql: Added korean translation. diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 4d864278e9..46d16ad90d 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -721,6 +721,7 @@ if ((isset ($_POST["update_module"])) && (!isset ($_POST["oid"]))) { // if modif } $sql = sprintf ("UPDATE tagente_modulo SET descripcion = '%s', + id_module_group = %d, nombre = '%s', max = %d, min = %d, @@ -742,7 +743,7 @@ if ((isset ($_POST["update_module"])) && (!isset ($_POST["oid"]))) { // if modif post_process = %f, prediction_module = %d, max_timeout = %d - WHERE id_agente_modulo = %d", $form_description, $form_name, $form_maxvalue, $form_minvalue, $form_interval, $form_tcp_port, $form_tcp_send, $form_tcp_rcv, + WHERE id_agente_modulo = %d", $form_description, $form_id_module_group, $form_name, $form_maxvalue, $form_minvalue, $form_interval, $form_tcp_port, $form_tcp_send, $form_tcp_rcv, $form_snmp_community, $form_snmp_oid, $form_ip_target, $form_flag, $form_id_modulo, $form_disabled, $form_id_export, $form_plugin_user, $form_plugin_pass, $form_plugin_parameter, $form_id_plugin, $form_post_process, $form_prediction_module, $form_max_timeout, $id_agente_modulo); $result = process_sql ($sql); diff --git a/pandora_console/godmode/agentes/manage_config.php b/pandora_console/godmode/agentes/manage_config.php index f0e0e24e75..62d7eb750e 100644 --- a/pandora_console/godmode/agentes/manage_config.php +++ b/pandora_console/godmode/agentes/manage_config.php @@ -274,11 +274,8 @@ if (isset ($_POST["delete"])) { temp_sql_delete ("tagente_datos_inc", "id_agente_modulo", $id_module_dest); //String data - temp_sql_delete ("tagente_datos_string", "id_agente_modulo", $id_module_dest); - - //Data image - temp_sql_delete ("tagent_data_image", "id_agent_module", $id_module_dest); - + temp_sql_delete ("tagente_datos_string", "id_agente_modulo", $id_module_dest); + //Events (up/down monitors) temp_sql_delete ("tevento", "id_agentmodule", $id_module_dest); diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 7a73a60015..1c913a25a1 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -138,7 +138,7 @@ if (!isset ($config["sla_period"]) || empty ($config["sla_period"])) { if (!isset ($config["prominent_time"])) { // Prominent time tells us what to show prominently when a timestamp is displayed. The comparation (... days ago) or the timestamp (full date) - $config["prominent_time"] == "comparation"; + $config["prominent_time"] = "comparation"; process_sql ("INSERT INTO tconfig (token,value) VALUES ('prominent_time','comparation')"); }