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

2010-10-05 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_reporting.php: cleaned source code style and optimize
	some parts (deleted redundant if sentences).
	
	* include/functions_db.php: cleaned source code style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3343 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-10-05 11:44:14 +00:00
parent 7af53909dc
commit acc02b912c
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2010-10-05 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: cleaned source code style and optimize
some parts (deleted redundant if sentences).
* include/functions_db.php: cleaned source code style.
2010-10-05 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/estado_ultimopaquete.php

3
pandora_console/include/functions_db.php
View File

@ -139,7 +139,8 @@ function check_acl ($id_user, $id_group, $access) {
//User ID needs to be specified
trigger_error ("Security error: check_acl got an empty string for user id", E_USER_WARNING);
return 0;
} elseif (is_user_admin ($id_user)) {
}
elseif (is_user_admin ($id_user)) {
return 1;
}
else {

36
pandora_console/include/functions_reporting.php
View File

@ -1391,7 +1391,7 @@ function get_group_detailed_event_reporting ($id_group, $period = 0, $date = 0,
$events = get_group_events($id_group, $period, $date);
if ($events)
if ($events) {
foreach ($events as $event) {
$data = array ();
$data[0] = $event['evento'];
@ -1400,8 +1400,7 @@ function get_group_detailed_event_reporting ($id_group, $period = 0, $date = 0,
$data[3] = $event['timestamp'];
array_push ($table->data, $data);
}
if ($events) {
if ($html) {
return print_table ($table, $return);
}
@ -1409,6 +1408,9 @@ function get_group_detailed_event_reporting ($id_group, $period = 0, $date = 0,
return $table;
}
}
else {
return false;
}
}
/**
@ -1457,20 +1459,19 @@ function get_module_detailed_event_reporting ($id_modules, $period = 0, $date =
}
}
if ($events)
foreach ($events as $eventRow) {
foreach ($eventRow as $event) {
$data = array ();
$data[0] = $event['evento'];
$data[1] = $event['event_type'];
$data[2] = get_priority_name ($event['criticity']);
$data[3] = $event['count_rep'];
$data[4] = $event['time2'];
array_push ($table->data, $data);
}
}
if ($events) {
foreach ($events as $eventRow) {
foreach ($eventRow as $event) {
$data = array ();
$data[0] = $event['evento'];
$data[1] = $event['event_type'];
$data[2] = get_priority_name ($event['criticity']);
$data[3] = $event['count_rep'];
$data[4] = $event['time2'];
array_push ($table->data, $data);
}
}
if ($html) {
return print_table ($table, $return);
}
@ -1478,6 +1479,9 @@ function get_module_detailed_event_reporting ($id_modules, $period = 0, $date =
return $table;
}
}
else {
return false;
}
}
/**