From 66ad4324dea21eaf7b8a9a3fed3078f4799e9d47 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 6 May 2011 07:12:58 +0000 Subject: [PATCH] 2011-05-05 Miguel de Dios * include/functions_visual_map.php, include/ajax/visual_console_builder.ajax.php: fixed the include the new graph engine in the ajax calls. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4309 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- .../include/ajax/visual_console_builder.ajax.php | 3 +++ pandora_console/include/functions_visual_map.php | 9 +++++++-- pandora_server/ChangeLog | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php index 0934c2701b..1b06f0a90f 100644 --- a/pandora_console/include/ajax/visual_console_builder.ajax.php +++ b/pandora_console/include/ajax/visual_console_builder.ajax.php @@ -24,6 +24,9 @@ if (! check_acl ($config['id_user'], 0, "IW")) { exit; } +$ajax = true; + + require_once('godmode/reporting/visual_console_builder.constans.php'); require_once('include/functions_visual_map.php'); require_once($config['homedir'] . "/include/functions_agents.php"); diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 3e631d084b..5988eb9580 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -20,8 +20,13 @@ */ global $config; - -require_once ('functions_graph.php'); + +//Fix ajax include this file. +global $ajax; + +if (!isset($ajax)) { + require_once ('functions_graph.php'); +} require_once ($config['homedir'].'/include/functions_agents.php'); require_once ($config['homedir'].'/include/functions_modules.php'); require_once ($config['homedir'].'/include/functions_users.php'); diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 5e699d32a6..dab9360019 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2011-05-05 Miguel de Dios + + * include/functions_visual_map.php, + include/ajax/visual_console_builder.ajax.php: fixed the include the new + graph engine in the ajax calls. + 2011-05-04 Miguel de Dios * util/pandora_xml_stress.pl: changed the source code to generate local conf