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

Removed reference to fail gis map connection. Ticket #3967

This commit is contained in:
Arturo Gonzalez 2016-10-20 12:16:51 +02:00
parent 26862b5f9d
commit af3d8d8d24
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_gis.php
View File

@ -511,6 +511,12 @@ function gis_get_map_conf($idMap) {
return $mapConfs; return $mapConfs;
} }
function get_good_con() {
$sql = 'SELECT * FROM tgis_map_connection WHERE id_tmap_connection = 2';
return db_get_all_rows_sql($sql);
}
function gis_get_map_connection($idMapConnection) { function gis_get_map_connection($idMapConnection) {
return db_get_row('tgis_map_connection', 'id_tmap_connection', $idMapConnection); return db_get_row('tgis_map_connection', 'id_tmap_connection', $idMapConnection);
} }

9
pandora_console/operation/gis_maps/render_view.php
View File

@ -29,6 +29,15 @@ $show_history = get_parameter ('show_history', 'n');
$map = db_get_row ('tgis_map', 'id_tgis_map', $idMap); $map = db_get_row ('tgis_map', 'id_tgis_map', $idMap);
$confMap = gis_get_map_conf($idMap); $confMap = gis_get_map_conf($idMap);
/* -------------------------------------------------- */
/* I apply this change because open maps now are paid */
/* --------------- Remove to go back ---------------- */
/* -------------------------------------------------- */
if ($confMap !== false) { /* ------------------------ */
$confMap = get_good_con(); /* ------------------- */
} /* ------------------------------------------------ */
/* -------------------------------------------------- */
if (! check_acl ($config['id_user'], $map['group_id'], "MR") && ! check_acl ($config['id_user'], $map['group_id'], "MW") && ! check_acl ($config['id_user'], $map['group_id'], "MM")) { if (! check_acl ($config['id_user'], $map['group_id'], "MR") && ! check_acl ($config['id_user'], $map['group_id'], "MW") && ! check_acl ($config['id_user'], $map['group_id'], "MM")) {
db_pandora_audit("ACL Violation", "Trying to access map builder"); db_pandora_audit("ACL Violation", "Trying to access map builder");
require ("general/noaccess.php"); require ("general/noaccess.php");