From 83fb4e3e1436520a4ebabe5effc1a85add2adf40 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Mon, 25 Feb 2013 11:57:34 +0000 Subject: [PATCH] 2013-02-25 Sergio Martin * include/functions_reports.php godmode/reporting/reporting_builder.php: Fixed some interface errors on reports views and other ACLs fixes git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7711 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 +++++ .../godmode/reporting/reporting_builder.php | 26 +++++++++++-------- pandora_console/include/functions_reports.php | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 710ea32d9c..56cbca499f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2013-02-25 Sergio Martin + + * include/functions_reports.php + godmode/reporting/reporting_builder.php: Fixed some interface errors on + reports views and other ACLs fixes + 2013-02-25 Miguel de Dios * godmode/modules/manage_network_components_form_common.php, diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 34a81c06f1..df591c9da0 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -365,7 +365,7 @@ switch ($action) { $next = 6; } - //Admin options only for IW flag + //Admin options only for RM flag if (check_acl ($config['id_user'], 0, "RM")) { $table->head[$next] = __('Private'); @@ -416,16 +416,20 @@ switch ($action) { } - if ($report["private"] == 1) - $data[$next] = __('Yes'); - else - $data[$next] = __('No'); - - $next++; - - - $data[$next] = ui_print_group_icon($report['id_group'], true, "groups_small", '', !defined('METACONSOLE')); - $next++; + //Admin options only for RM flag + if (check_acl ($config['id_user'], 0, "RM")) { + + if ($report["private"] == 1) + $data[$next] = __('Yes'); + else + $data[$next] = __('No'); + + $next++; + + + $data[$next] = ui_print_group_icon($report['id_group'], true, "groups_small", '', !defined('METACONSOLE')); + $next++; + } $type_access_selected = reports_get_type_access($report); $edit = false; diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php index e6f7c1438e..8022cde74c 100644 --- a/pandora_console/include/functions_reports.php +++ b/pandora_console/include/functions_reports.php @@ -118,7 +118,7 @@ function reports_get_reports ($filter = false, $fields = false, $returnAllGroup if (!in_array($report['id_group'], array_keys($groups))) continue; if ($config['id_user'] != $report['id_user'] - && ! check_acl ($config['id_user'], $report['id_group'], 'RR')) + && ! check_acl ($config['id_user'], $report['id_group'], $privileges)) continue; } array_push ($reports, $report);