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

2010-12-22 Ramon Novoa <rnovoa@artica.es> 

* operation/agentes/exportdata.php: Fixed data average export.
	  Fixes bug #3141351.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3685 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2010-12-22 16:28:37 +00:00
parent da97830f00
commit 7f171d2df5
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2010-12-22 Ramon Novoa <rnovoa@artica.es>
* operation/agentes/exportdata.php: Fixed data average export.
Fixes bug #3141351.
2010-12-22 Miguel de Dios <miguel.dedios@artica.es>
* operation/events/events.php: fixed the show list of events when to delete

36
pandora_console/operation/agentes/exportdata.php
View File

@ -54,6 +54,7 @@ if (is_ajax ()) {
// Load global vars
require_once ("include/config.php");
require_once ("include/functions_agents.php");
require_once ("include/functions_reporting.php");
check_login();
@ -164,6 +165,7 @@ if (!empty ($export_btn) && !empty ($module)) {
case "data":
case "excel":
case "csv":
case "avg":
// Show header
echo $datastart;
@ -183,9 +185,22 @@ if (!empty ($export_btn) && !empty ($module)) {
$work_end = $work_end + $work_period;
$data = array (); // Reinitialize array for each module chunk
$data_single = get_agentmodule_data ($selected, $work_period, $work_end);
if (!empty ($data_single)) {
$data = array_merge ($data, $data_single);
if ($export_type == "avg") {
$arr = array ();
$arr["data"] = get_agentmodule_data_average ($selected, $work_period, $work_end);
if ($arr["data"] === false) {
continue;
}
$arr["module_name"] = get_agentmodule_name ($selected);
$arr["agent_name"] = get_agentmodule_agent_name ($selected);
$arr["agent_id"] = get_agentmodule_agent ($selected);
$arr["utimestamp"] = $end;
array_push ($data, $arr);
} else {
$data_single = get_agentmodule_data ($selected, $work_period, $work_end);
if (!empty ($data_single)) {
$data = array_merge ($data, $data_single);
}
}
/*
@ -227,21 +242,6 @@ if (!empty ($export_btn) && !empty ($module)) {
} // main foreach
echo $dataend;
break;
case "avg":
foreach ($module as $selected) {
$arr = array ();
$arr["data"] = get_agentmodule_data_average ($selected, $period, $end);
if ($arr["data"] === false) {
continue;
}
$arr["module_name"] = get_agentmodule_name ($selected);
$arr["agent_name"] = get_agentmodule_agent_name ($selected);
$arr["agent_id"] = get_agentmodule_agent ($selected);
$arr["utimestamp"] = $end;
array_push ($data, $arr);
}
break;
default:
print_error_message (__('Invalid method supplied'));
return;