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

2011-04-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_events.php
	include/functions_reporting.php: Fixed some mistakes of my last commit.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4264 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-04-20 11:31:25 +00:00
parent da0eab5b58
commit aa46a12de4
3 changed files with 8 additions and 3 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 @@
2011-04-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_events.php
include/functions_reporting.php: Fixed some mistakes of my last commit.
2011-04-20 Miguel de Dios <miguel.dedios@artica.es> 2011-04-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: fixed duplicated function. * include/functions_graph.php: fixed duplicated function.

2
pandora_console/include/functions_events.php
View File

@ -591,7 +591,7 @@ function events_print_type_description ($type, $return = false) {
* *
* @return array An array with all the events happened. * @return array An array with all the events happened.
*/ */
function events_get_group ($id_group, $period, $date) { function events_get_group_events ($id_group, $period, $date) {
global $config; global $config;
$id_group = safe_acl_group ($config["id_user"], $id_group, "AR"); $id_group = safe_acl_group ($config["id_user"], $id_group, "AR");

4
pandora_console/include/functions_reporting.php
View File

@ -921,7 +921,7 @@ function event_reporting ($id_group, $period, $date = 0, $return = false) {
$table->head[2] = __('User ID'); $table->head[2] = __('User ID');
$table->head[3] = __('Timestamp'); $table->head[3] = __('Timestamp');
$events = events_get_group ($id_group, $period, $date); $events = events_get_group_events ($id_group, $period, $date);
if (empty ($events)) { if (empty ($events)) {
$events = array (); $events = array ();
} }
@ -1651,7 +1651,7 @@ function get_group_detailed_event_reporting ($id_group, $period = 0, $date = 0,
$table->head[2] = __('Criticity'); $table->head[2] = __('Criticity');
$table->head[3] = __('Timestamp'); $table->head[3] = __('Timestamp');
$events = events_get_group($id_group, $period, $date); $events = events_get_group_events($id_group, $period, $date);
if ($events) { if ($events) {
foreach ($events as $event) { foreach ($events as $event) {