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

Fixed some things.

This commit is contained in:
Arturo Gonzalez Diaz 2015-10-14 08:38:30 +02:00
parent adebbb8c7d
commit 67d0a6602e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_reporting_html.php
View File

@ -2774,7 +2774,7 @@ function reporting_get_last_activity() {
function reporting_get_event_histogram ($events, $text_header_event = false) { function reporting_get_event_histogram ($events, $text_header_event = false) {
global $config; global $config;
if (!defined("METACONSOLE")) { if (!defined("METACONSOLE")) {
include_once ($config['homedir'] .'include/graphs/functions_gd.php'); include_once ($config['homedir'] .'/include/graphs/functions_gd.php');
} }
else { else {
include_once ('../../include/graphs/functions_gd.php'); include_once ('../../include/graphs/functions_gd.php');

4
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -498,11 +498,11 @@ if (!empty($network_interfaces)) {
$unixtime = get_system_time () - SECONDS_1DAY; //last hour $unixtime = get_system_time () - SECONDS_1DAY; //last hour
$time_condition = 'AND (utimestamp > '.$unixtime.')'; $time_condition = 'AND (utimestamp > '.$unixtime.')';
// Tags ACLS // Tags ACLS
if ($id_group > 0 && in_array (0, array_keys (users_get_groups($config['id_user'], 'ER')))) { if ($id_group > 0 && in_array (0, $user_groups_ids) {
$group_array = (array) $id_group; $group_array = (array) $id_group;
} }
else { else {
$group_array = array_keys(users_get_groups($config['id_user'], 'ER')); $group_array = $user_groups_ids;
} }
$acl_tags = tags_get_acl_tags($config['id_user'], $group_array, 'ER', $acl_tags = tags_get_acl_tags($config['id_user'], $group_array, 'ER',
'event_condition', 'AND', '', true, array(), true); 'event_condition', 'AND', '', true, array(), true);