tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-05-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/graphs/fgraph.php	
	include/config_process.php
	operation/events/events.php: Added flash graph dependencies.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4362 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-05-17 14:03:00 +00:00
parent 8959e4e6b6
commit 8116e4b51e
4 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2011-05-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/graphs/fgraph.php
include/config_process.php
operation/events/events.php: Added flash graph dependencies.
2011-05-17 Sergio Martin <sergio.martin@artica.es>
* images/policies_error.png

16
pandora_console/include/config_process.php
View File

@ -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();
?>

4
pandora_console/include/graphs/fgraph.php
View File

@ -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')) {

2
pandora_console/operation/events/events.php
View File

@ -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")) {