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

2013-02-11 Sergio Martin <sergio.martin@artica.es> 

* operation/gis_maps/index.php
	godmode/gis_maps/index.php: Fixed ACL access of 
	not admin users to the maps of group All on GIS

	* godmode/users/configure_user.php: Change a string to
	crearify the tags ACLs assignation



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7616 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-02-11 10:11:00 +00:00
parent 51d3057ae6
commit 50d963745a
4 changed files with 17 additions and 18 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 @@
2013-02-11 Sergio Martin <sergio.martin@artica.es>
* operation/gis_maps/index.php
godmode/gis_maps/index.php: Fixed ACL access of
not admin users to the maps of group All on GIS
* godmode/users/configure_user.php: Change a string to
crearify the tags ACLs assignation
2013-02-08 Sergio Martin <sergio.martin@artica.es>
* godmode/groups/configure_group.php: Fixed some bugs on

7
pandora_console/godmode/gis_maps/index.php
View File

@ -88,11 +88,10 @@ $defaultMapId = null;
if ($maps){
$own_info = get_user_info($config['id_user']);
foreach ($maps as $map) {
if (!check_acl ($config["id_user"], $map["group_id"], "IR")) {
if (!check_acl ($config["id_user"], $map["group_id"], "IW")) {
continue;
}
if ($map['group_id'] == 0 && (!$own_info['is_admin'] || !check_acl ($config['id_user'], 0, "PM")))
continue;
$checked = false;
if ($map['default_map']) {
$checked = true;
@ -163,4 +162,4 @@ function setDefault(id_tgis_map) {
});
}
}
</script>
</script>

2
pandora_console/godmode/users/configure_user.php
View File

@ -580,7 +580,7 @@ $data[1] = html_print_select_groups($config['id_user'], "UM",
$tags = tags_get_all_tags();
$data[2] = html_print_select($tags, 'assign_tags[]', '', '', __('None'), '', true, true);
$data[2] = html_print_select($tags, 'assign_tags[]', '', '', __('Any'), '', true, true);
$data[3] = html_print_input_image ('add', 'images/add.png', 1, '', true);
$data[3] .= html_print_input_hidden ('id', $id, true);

17
pandora_console/operation/gis_maps/index.php
View File

@ -38,14 +38,12 @@ $table->align[1] = 'center';
$rowPair = true;
$iterator = 0;
$own_info = get_user_info ($config['id_user']);
if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
$own_groups = array_keys(users_get_groups($config['id_user'], "IR"));
else
$own_groups = array_keys(users_get_groups($config['id_user'], "IR", false));
if ($maps !== false) {
foreach ($maps as $map) {
if (!check_acl ($config["id_user"], $map["group_id"], "IR", 0, true)) {
continue;
}
if ($rowPair)
$table->rowclass[$iterator] = 'rowPair';
else
@ -53,13 +51,6 @@ if ($maps !== false) {
$rowPair = !$rowPair;
$iterator++;
$is_in_group = in_array($map['group_id'], $own_groups);
if (!$is_in_group){
continue;
}
if (!check_acl ($config["id_user"], $map["group_id"], "IR", 0, true)) {
continue;
}
$data = array ();
$data[0] = '<a href="index.php?sec=gismaps&amp;sec2=operation/gis_maps/render_view&amp;map_id='.