diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2341ea04f4..9356231e3a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2011-05-16 Juan Manuel Ramon + + * include/config_process.php + include/graphs/fgraph.php: Included new graph dependencies. + 2011-05-16 Sergio Martin * pandoradb_data.sql diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 7cada4da2d..3582caad48 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -152,4 +152,21 @@ 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'); +} +include_graphs_dependencies(); + ?> diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php index 1d4d3cd72b..197953319c 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,8 +26,7 @@ function include_graphs_dependencies($home_url = '', $serialize_ttl = 1) { 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')) {