diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2bb541a819..8be6c34481 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2012-01-12 Vanessa Gil + * godmode/netflow/nf_report_item.php + include/functions_netflow.php: changes netflow groups. + 2012-01-12 Ramon Novoa * include/graphs/functions_fsgraph.php: Fixed empty chart detection for diff --git a/pandora_console/godmode/netflow/nf_report_item.php b/pandora_console/godmode/netflow/nf_report_item.php index b14eb7d54e..67adb61bc4 100644 --- a/pandora_console/godmode/netflow/nf_report_item.php +++ b/pandora_console/godmode/netflow/nf_report_item.php @@ -49,7 +49,8 @@ ui_print_page_header (__('Netflow Report'), "images/networkmap/so_cisco_new.png" if ($id_rc) { $item = netflow_reports_get_content ($id_rc); - $name_filter = $item['id_filter']; + $id_filter = $item['id_filter']; + $name_filter = db_get_value('id_name', 'tnetflow_filter', 'id_sg', $id_filter); $max_val = $item['max']; $show_graph = $item['show_graph']; } else { @@ -115,10 +116,12 @@ if ($filters === false) { $own_info = get_user_info ($config['id_user']); // Get group list that user has access $groups_user = users_get_groups ($config['id_user'], "IW", $own_info['is_admin'], true); + $groups_id = array(); foreach($groups_user as $key => $groups){ $groups_id[] = $groups['id_grupo']; } + $sql = "SELECT * FROM tnetflow_filter WHERE id_group IN (".implode(',',$groups_id).")"; $table->data[0][0] = ''.__('Filters').''; $table->data[0][1] = html_print_select_from_sql($sql, 'id_filter', $name_filter, '', '', 0, true); diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index 3683775ad5..f610249b26 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -75,8 +75,9 @@ function netflow_check_filter_group ($id_sg) { global $config; $id_group = db_get_value('id_group', 'tnetflow_filter', 'id_sg', $id_sg); + $own_info = get_user_info ($config['id_user']); // Get group list that user has access - $groups_user = users_get_groups ($config['id_user'], "IW", false, true); + $groups_user = users_get_groups ($config['id_user'], "IW", $own_info['is_admin'], true); $groups_id = array(); $has_permission = false;