From 1e4582d9b21ea86f170a5eca82c7d0149fb8eabd Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 17 Oct 2018 09:59:25 -0300
Subject: [PATCH] Compatibilização da abertura de mapas salvos anteriormente com os nomes das novas interfaces

---
 classesphp/funcoes_gerais.php     | 1 +
 mapas/templates/templatelista.php | 8 --------
 ms_criamapa.php                   | 7 ++++---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/classesphp/funcoes_gerais.php b/classesphp/funcoes_gerais.php
index 5dbed83..51033aa 100755
--- a/classesphp/funcoes_gerais.php
+++ b/classesphp/funcoes_gerais.php
@@ -3077,6 +3077,7 @@ function restauraMapaAdmin($id_mapa, $dir_tmp)
     $dbh = null;
     $dbhw = null;
     $mapasalvo = $mapasalvo[0];
+    //var_dump($mapasalvo);exit;
     $base = "";
     if (! isset($mapasalvo["publicado"])) {
         $mapasalvo["publicado"] = "";
diff --git a/mapas/templates/templatelista.php b/mapas/templates/templatelista.php
index 834d625..c16cb7d 100755
--- a/mapas/templates/templatelista.php
+++ b/mapas/templates/templatelista.php
@@ -4,14 +4,6 @@
 		<h4 class="list-group-item-heading">
 			<div class="hidden-xs">
 				<span class="pull-right">&nbsp;&nbsp;</span>
-				<a title="{{{outrosLinks}}}" onclick="mostraLinks('detalhe_{{ID_MAPA}}')" href="javascript:void(0)" class="btn btn-danger btn-fab btn-fab-mini pull-right" role="button">
-					<i class="material-icons md-18">more_horiz</i>
-				</a>
-				<span class="pull-right">&nbsp;&nbsp;</span>
-				<a title="{{{linkDefault}}}" href="{{{LINK}}}" target="_blank" class="btn btn-danger btn-fab btn-fab-mini pull-right" role="button">
-					<i class="material-icons md-18">launch</i>
-				</a>
-				<span class="pull-right">&nbsp;&nbsp;</span>
 				<a title="link" role="button" href="javascript:void(0)" data-toggle="quadroQrcode" data-url="{{{LINK}}}" class="btn btn-danger btn-fab btn-fab-mini pull-right">
 					<span class="glyphicon glyphicon-qrcode" aria-hidden="true"></span>
 				</a>
diff --git a/ms_criamapa.php b/ms_criamapa.php
index b069ade..d8f3f13 100755
--- a/ms_criamapa.php
+++ b/ms_criamapa.php
@@ -354,7 +354,6 @@ if (! isset($mapext) || empty($mapext)) {
     $mapext = "";
 } else {
     $mapext = str_replace(",", " ", $mapext);
-
 }
 $saikuUrl_ = $saikuUrl;
 $cachedir_ = $cachedir;
@@ -533,7 +532,6 @@ if (file_exists($base)) {
     $map = ms_newMapObj($locaplic . "/aplicmap/" . $base . ".map");
     $mapn = ms_newMapObj($locaplic . "/aplicmap/" . $base . ".map");
 }
-
 /*
  * Par&acirc;metros adicionais.
  *
@@ -653,7 +651,6 @@ if (isset($url_wms)) {
 }
 
 adaptaLayers($tmpfname, $versao);
-
 if ($interface != "mashup") {
     abreInterface($interface, $caminho);
 }
@@ -729,11 +726,15 @@ function abreInterface($interface, $caminho)
         }
         exit();
     } else {
+        //para efeitos de compatibilidade
+        $interface = str_replace("ol.htm","ol.php",$interface);
+        $interface = str_replace("osm.htm","osm.php",$interface);
         if (file_exists($caminho . $customDir . "/" . $interface)) {
             $urln = $caminho . $customDir . "/" . $interface . "?&" . session_id();
         } else {
             $urln = $interface . "?&" . session_id();
         }
+        //echo $urln;exit;
         if (! headers_sent()) {
             header("Location:" . $urln);
         } else {
--
libgit2 0.21.2