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

2012-01-12 Vanessa Gil <vanessa.gil@artica.es> 

* godmode/netflow/nf_report_item.php
	  include/functions_netflow.php: changes netflow groups.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5358 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-01-12 11:32:49 +00:00
parent 1bcb0c8a25
commit 2989dc4e98
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_report_item.php
include/functions_netflow.php: changes netflow groups.
2012-01-12 Ramon Novoa <rnovoa@artica.es>
* include/graphs/functions_fsgraph.php: Fixed empty chart detection for

5
pandora_console/godmode/netflow/nf_report_item.php
View File

@ -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] = '<b>'.__('Filters').'</b>';
$table->data[0][1] = html_print_select_from_sql($sql, 'id_filter', $name_filter, '', '', 0, true);

3
pandora_console/include/functions_netflow.php
View File

@ -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;