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

Solved problems (deletion, edition, creation) on GIS maps Tickets #3762

This commit is contained in:
fermin831 2016-06-06 12:13:01 +02:00
parent 004b5c57b9
commit 86c2a56ab4
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pandora_console/godmode/gis_maps/configure_gis_map.php
View File

@ -29,6 +29,13 @@ require_once ('include/functions_gis.php');
$idMap = (int)get_parameter('map_id', 0); $idMap = (int)get_parameter('map_id', 0);
$action = get_parameter('action', 'new_map'); $action = get_parameter('action', 'new_map');
$sec2 = get_parameter_get ('sec2');
$sec2 = safe_url_extraclean ($sec2);
$sec = get_parameter_get ('sec');
$sec = safe_url_extraclean ($sec);
$next_action = 'new_map';
switch ($action) { switch ($action) {
case 'save_new': case 'save_new':
@ -75,8 +82,8 @@ switch ($action) {
$arrayLayers = array(); $arrayLayers = array();
foreach ($layer_list as $layerID) { foreach ($layer_list as $layerID) {
$layer = get_parameter('layer_values_' . $layerID); $layer = get_parameter('layer_values_' . $layerID);
$layer = json_decode(io_safe_output ($layer), true);
$arrayLayers[] = JSON_decode($layer, true); array_unshift ($arrayLayers, $layer);
} }
$invalidFields = gis_validate_map_data($map_name, $map_zoom_level, $invalidFields = gis_validate_map_data($map_name, $map_zoom_level,
@ -90,9 +97,10 @@ switch ($action) {
$map_default_longitude, $map_default_latitude, $map_default_altitude, $map_default_longitude, $map_default_latitude, $map_default_altitude,
$map_group_id, $map_connection_list, $arrayLayers); $map_group_id, $map_connection_list, $arrayLayers);
$mapCreatedOk = true; $mapCreatedOk = true;
$next_action = 'update_saved';
} }
else { else {
html_print_input_hidden('action', 'save_new'); $next_action = 'save_new';
$mapCreatedOk = false; $mapCreatedOk = false;
} }
$layer_list = $arrayLayers; $layer_list = $arrayLayers;
@ -101,7 +109,7 @@ switch ($action) {
__('Map could not be created')); __('Map could not be created'));
break; break;
case 'new_map': case 'new_map':
html_print_input_hidden('action', 'save_new'); $next_action = 'save_new';
$map_name = ''; $map_name = '';
$map_initial_longitude = ''; $map_initial_longitude = '';
@ -118,9 +126,7 @@ switch ($action) {
$map_levels_zoom = 0; $map_levels_zoom = 0;
break; break;
case 'edit_map': case 'edit_map':
html_print_input_hidden('action', 'update_saved'); $next_action = 'update_saved';
html_print_input_hidden('map_id', $idMap);
break; break;
case 'update_saved': case 'update_saved':
@ -165,7 +171,8 @@ switch ($action) {
$arrayLayers = array(); $arrayLayers = array();
foreach ($layer_list as $layerID) { foreach ($layer_list as $layerID) {
$layer = get_parameter('layer_values_' . $layerID); $layer = get_parameter('layer_values_' . $layerID);
$arrayLayers[] = JSON_decode($layer, true); $layer = json_decode(io_safe_output ($layer), true);
array_unshift ($arrayLayers, $layer);
} }
@ -184,19 +191,19 @@ switch ($action) {
$mapCreatedOk = true; $mapCreatedOk = true;
} }
else { else {
$next_action = 'update_saved';
html_print_input_hidden('action', 'update_saved');
$mapCreatedOk = false; $mapCreatedOk = false;
} }
ui_print_result_message ($mapCreatedOk, __('Map successfully update'), ui_print_result_message ($mapCreatedOk, __('Map successfully update'),
__('Map could not be updated')); __('Map could not be updated'));
html_print_input_hidden('action', 'update_saved'); $next_action = 'update_saved';
html_print_input_hidden('map_id', $idMap); html_print_input_hidden('map_id', $idMap);
break; break;
} }
$url = 'index.php?sec=' . $sec . '&sec2=' . $sec2 . '&map_id=' . $idMap . '&action=' . $next_action;
$buttons['gis_maps_list'] = array('active' => true, $buttons['gis_maps_list'] = array('active' => true,
'text' => '<a href="index.php?sec=godgismaps&sec2=operation/gis_maps/gis_map">' . 'text' => '<a href="index.php?sec=godgismaps&sec2=operation/gis_maps/gis_map">' .
@ -267,7 +274,7 @@ function updateArrowLayers() {
</script> </script>
<?php <?php
echo '<form id="form_setup" method="post" onSubmit="fillOrderField();">'; echo '<form action="' . $url . '" id="form_setup" method="post" onSubmit="fillOrderField();">';

8
pandora_console/include/functions_gis.php
View File

@ -733,9 +733,13 @@ function gis_delete_map($idMap) {
db_process_sql_delete('tgis_map_layer_has_tagente', db_process_sql_delete('tgis_map_layer_has_tagente',
array('tgis_map_layer_id_tmap_layer' => $idLayer)); array('tgis_map_layer_id_tmap_layer' => $idLayer));
} }
$correct = (bool)db_process_sql_delete('tgis_map_layer',
array('tgis_map_id_tgis_map' => $idMap));
} else {
$correct = true;
} }
$correct = (bool)db_process_sql_delete('tgis_map_layer',
array('tgis_map_id_tgis_map' => $idMap));
if ($correct) { if ($correct) {
$correct = db_process_sql_delete('tgis_map_has_tgis_map_con', $correct = db_process_sql_delete('tgis_map_has_tgis_map_con',
array('tgis_map_id_tgis_map' => $idMap)); array('tgis_map_id_tgis_map' => $idMap));