diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 25bb08dbc2..5ab5115bfc 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2013-04-17 Miguel de Dios + + * pandoradb.postgreSQL.sql: improved the code source style. + + * pandoradb.oracle.sql: fixed duplicated fields + "critical_instructions", "warning_instructions" and + "unknown_instructions" in the table "tagente_modulo". + + * godmode/agentes/module_manager_editor.php, + godmode/agentes/configurar_agente.php: fixed PHP warnings. + 2013-04-17 Miguel de Dios * operation/visual_console/render_view.php, diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index a726ed899e..e3051f869c 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -754,7 +754,7 @@ if ($update_module || $create_module) { } $macros_for_data = enterprise_hook('config_agents_get_macros_data_conf', array($_POST)); - + if($macros_for_data !== ENTERPRISE_NOT_HOOK && $macros_for_data != '') { // Add macros to configuration file $new_configuration_data = str_replace('module_end', $macros_for_data."module_end", $new_configuration_data); diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php index cddec6def9..2f30b62c40 100644 --- a/pandora_console/godmode/agentes/module_manager_editor.php +++ b/pandora_console/godmode/agentes/module_manager_editor.php @@ -201,7 +201,7 @@ if ($id_agent_module) { $critical_instructions = $module['critical_instructions']; $warning_instructions = $module['warning_instructions']; $unknown_instructions = $module['unknown_instructions']; - + $critical_inverse = $module['critical_inverse']; $warning_inverse = $module['warning_inverse']; @@ -292,6 +292,8 @@ else { $mday = '*'; $month = '*'; $wday = '*'; + + $ff_interval = 0; } } diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index 779a31c31c..891f0e41e0 100644 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -242,9 +242,6 @@ CREATE TABLE tagente_modulo ( warning_instructions CLOB default '', unknown_instructions CLOB default '', quiet NUMBER(5, 0) default 0 NOT NULL, - critical_instructions VARCHAR2(255) default '', - warning_instructions VARCHAR2(255) default '', - unknown_instructions VARCHAR2(255) default '', critical_inverse NUMBER(1, 0) default 0 NOT NULL, warning_inverse NUMBER(1, 0) default 0 NOT NULL, id_category NUMBER(10, 0) default 0 NOT NULL, diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index ed2f99a720..0dfdc8b95e 100644 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -231,9 +231,9 @@ CREATE TABLE "tagente_modulo" ( "wizard_level" type_tagente_modulo_wizard_level default 'nowizard', "macros" TEXT default '', "critical_instructions" TEXT default '', - "warning_instructions" TEXT default '', - "unknown_instructions" TEXT default '', - "quiet" SMALLINT NOT NULL default 0, + "warning_instructions" TEXT default '', + "unknown_instructions" TEXT default '', + "quiet" SMALLINT NOT NULL default 0, "critical_inverse" SMALLINT NOT NULL default 0, "warning_inverse" SMALLINT NOT NULL default 0, "id_category" INTEGER NOT NULL default 0