From 2c3c041af3882a3921b29a8c5fd3a5c8369cb43b Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 21 Jun 2011 14:28:08 +0000 Subject: [PATCH] 2011-06-21 Sergio Martin * lib/PandoraFMS/NetworkServer.pm: Added blank space in a couple of queries to avoid errors when the enterprise is not installed git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4476 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 5 +++++ pandora_server/lib/PandoraFMS/NetworkServer.pm | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index a5381c3d31..2881e0d8fc 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,8 @@ +2011-06-21 Sergio Martin + + * lib/PandoraFMS/NetworkServer.pm: Added blank space in a couple of + queries to avoid errors when the enterprise is not installed + 2011-06-20 Ramon Novoa * lib/PandoraFMS/Config.pm,, diff --git a/pandora_server/lib/PandoraFMS/NetworkServer.pm b/pandora_server/lib/PandoraFMS/NetworkServer.pm index 2567b58eeb..a4a485e0d2 100644 --- a/pandora_server/lib/PandoraFMS/NetworkServer.pm +++ b/pandora_server/lib/PandoraFMS/NetworkServer.pm @@ -95,7 +95,7 @@ sub data_producer ($) { AND tagente_modulo.id_agente = tagente.id_agente AND tagente.disabled = 0 AND tagente_modulo.id_tipo_modulo > 4 - AND tagente_modulo.id_tipo_modulo < 19' + AND tagente_modulo.id_tipo_modulo < 19 ' . enterprise_hook ('get_network_filter', []) . 'AND tagente_modulo.disabled = 0 AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo @@ -109,7 +109,7 @@ sub data_producer ($) { AND tagente.disabled = 0 AND tagente_modulo.disabled = 0 AND tagente_modulo.id_tipo_modulo > 4 - AND tagente_modulo.id_tipo_modulo < 19' + AND tagente_modulo.id_tipo_modulo < 19 ' . enterprise_hook ('get_network_filter', []) . 'AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND (tagente_modulo.flag = 1 OR ((tagente_estado.last_execution_try + tagente_estado.current_interval) < UNIX_TIMESTAMP()))