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

2010-04-30 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_reporting.php: added the parameter "$html" in the
	function "get_module_detailed_event_reporting", this flag is for return
	the html table or object table, by default the html.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2653 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-05-03 09:39:51 +00:00
parent c61965981f
commit 0964265d71
2 changed files with 17 additions and 4 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 @@
2010-04-30 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: added the parameter "$html" in the
function "get_module_detailed_event_reporting", this flag is for return
the html table or object table, by default the html.
2010-05-03 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/alerts_status.php

15
pandora_console/include/functions_reporting.php
View File

@ -1171,10 +1171,11 @@ function get_agents_detailed_event_reporting ($id_agents, $period = 0, $date = 0
* @param int Period of time (in seconds) to get the report.
* @param int Beginning date (unixtime) of the report
* @param bool Flag to return or echo the report table (echo by default).
* @param bool Flag to return the html or table object, by default html.
*
* @return A table object (XHTML)
* @return mixed A table object (XHTML) or object table is false the html.
*/
function get_module_detailed_event_reporting ($id_modules, $period = 0, $date = 0, $return = false) {
function get_module_detailed_event_reporting ($id_modules, $period = 0, $date = 0, $return = false, $html = true) {
$id_modules = (array)safe_int ($id_modules, 1);
if (!is_numeric ($date)) {
@ -1219,8 +1220,14 @@ function get_module_detailed_event_reporting ($id_modules, $period = 0, $date =
}
}
if ($events)
return print_table ($table, $return);
if ($events) {
if ($html) {
return print_table ($table, $return);
}
else {
return $table;
}
}
}
/**