diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index ad4643d7e9..4fb9bb77a8 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2011-05-17 Juan Manuel Ramon + + * include/graphs/fgraph.php + include/config_process.php + operation/events/events.php: Added flash graph dependencies. + 2011-05-17 Sergio Martin * images/policies_error.png diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 3582caad48..24de41bc39 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -152,21 +152,7 @@ if (isset($config['history_db_enabled'])) { // Make dbconnection the default connection again (the link identifier of the already opened link will be returned) db_connect(); - -function include_graphs_dependencies($home_url = '', $serialize_ttl = 1) { - global $ttl; - global $homeurl; - - $ttl = $serialize_ttl; - $homeurl = $home_url; - - include_once($homeurl . 'include/functions.php'); - include_once($homeurl . 'include/functions_html.php'); - - include_once($homeurl . 'include/graphs/functions_fsgraph.php'); - include_once($homeurl . 'include/graphs/functions_gd.php'); - include_once($homeurl . 'include/graphs/functions_utils.php'); -} +require_once("include/fgraph.php"); include_graphs_dependencies(); ?> diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php index 197953319c..7aaebc324f 100755 --- a/pandora_console/include/graphs/fgraph.php +++ b/pandora_console/include/graphs/fgraph.php @@ -13,7 +13,7 @@ $ttl = 1; $homeurl = ''; -/*function include_graphs_dependencies($home_url = '', $serialize_ttl = 1) { +function include_graphs_dependencies($home_url = '', $serialize_ttl = 1) { global $ttl; global $homeurl; @@ -26,7 +26,7 @@ $homeurl = ''; include_once($homeurl . 'include/graphs/functions_fsgraph.php'); include_once($homeurl . 'include/graphs/functions_gd.php'); include_once($homeurl . 'include/graphs/functions_utils.php'); -}*/ +} /* // If is called from index if(file_exists('include/functions.php')) { diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 57a69a8eb4..3fa8192ade 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -20,7 +20,7 @@ require_once ("include/functions_events.php"); //Event processing functions require_once ("include/functions_alerts.php"); //Alerts processing functions require_once ($config['homedir'].'/include/functions_agents.php'); //Agents functions require_once ($config['homedir'].'/include/functions_users.php'); //Users functions - +include_flash_chart_script(); check_login (); if (! check_acl ($config["id_user"], 0, "IR")) {