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

2014-01-23 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/reporting/map_builder.php,
	godmode/reporting/visual_console_builder.data.php: fixed the access
	to user with operator read or and operator write in all group into
	the visualmaps.
	
	Incident: #538 from local tracker




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9358 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-01-23 14:26:41 +00:00
parent d59437f34a
commit 6bb7ca3a17
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2014-01-23 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/map_builder.php,
godmode/reporting/visual_console_builder.data.php: fixed the access
to user with operator read or and operator write in all group into
the visualmaps.
Incident: #538 from local tracker
2014-01-23 Miguel de Dios <miguel.dedios@artica.es> 2014-01-23 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js, * godmode/reporting/visual_console_builder.editor.js,

5
pandora_console/godmode/reporting/map_builder.php
View File

@ -157,9 +157,10 @@ $table->align[2] = 'center';
$table->align[3] = 'center'; $table->align[3] = 'center';
$table->align[4] = 'center'; $table->align[4] = 'center';
// Only display maps of "All" group if user is administrator or has "PM" privileges, otherwise show only maps of user group // Only display maps of "All" group if user is administrator
// or has "RR" privileges, otherwise show only maps of user group
$own_info = get_user_info ($config['id_user']); $own_info = get_user_info ($config['id_user']);
if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM")) if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "RR"))
$maps = visual_map_get_user_layouts (); $maps = visual_map_get_user_layouts ();
else else
$maps = visual_map_get_user_layouts ($config['id_user'], false, false, false); $maps = visual_map_get_user_layouts ($config['id_user'], false, false, false);

5
pandora_console/godmode/reporting/visual_console_builder.data.php
View File

@ -78,8 +78,9 @@ $table->data[1][0] = __('Group:');
$groups = users_get_groups ($config['id_user'], 'RW'); $groups = users_get_groups ($config['id_user'], 'RW');
$own_info = get_user_info($config['id_user']); $own_info = get_user_info($config['id_user']);
// Only display group "All" if user is administrator or has "PM" privileges // Only display group "All" if user is administrator
if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM")) // or has "RW" privileges
if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "RW"))
$display_all_group = true; $display_all_group = true;
else else
$display_all_group = false; $display_all_group = false;