diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 9a5fbaed51..3386924a6e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2010-10-05 Miguel de Dios + + * 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 * operation/agentes/estado_ultimopaquete.php diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 1a4cd4cb61..dd54617247 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -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 { diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 6a53582c14..87d2593340 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -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; + } } /**