diff --git a/classesphp/classe_alteraclasse.php b/classesphp/classe_alteraclasse.php index 5adbf85..4f3d339 100755 --- a/classesphp/classe_alteraclasse.php +++ b/classesphp/classe_alteraclasse.php @@ -196,9 +196,9 @@ class Alteraclasse function alteraclasses($ids,$nomes,$exps,$base64="nao",$minScales="",$maxScales="") { if($base64 == "sim"){ - $ids = base64_decode($ids); - $nomes = base64_decode($nomes); - $exps = base64_decode($exps); + //$ids = base64_decode($ids); + //$nomes = base64_decode($nomes); + //$exps = base64_decode($exps); } //prepara os arrays com os valores $ids = explode(";",$ids); diff --git a/classesphp/classe_temas.php b/classesphp/classe_temas.php index be1dff6..8625333 100755 --- a/classesphp/classe_temas.php +++ b/classesphp/classe_temas.php @@ -495,7 +495,7 @@ $testa - Testa o filtro e retorna uma imagem. function insereFiltro($filtro,$testa="",$base64="nao") { if($base64 == "sim"){ - $filtro = base64_decode($filtro); + //$filtro = base64_decode($filtro); } foreach($this->indices as $indice){ $layer = $this->mapa->getlayer($indice); diff --git a/ferramentas/etiqueta/exec.php b/ferramentas/etiqueta/exec.php index 653905f..8b4132e 100755 --- a/ferramentas/etiqueta/exec.php +++ b/ferramentas/etiqueta/exec.php @@ -20,8 +20,10 @@ Ativa as etiquetas de um tema. $m->layer->setmetadata("IDENTIFICA",""); $m->layer->setmetadata("TIP",$tips); $m->layer->setmetadata("ITENS",$itens); - $m->layer->setmetadata("ITENSDESC",base64_decode($itensdesc)); - $m->layer->setmetadata("ITENSLINK",base64_decode($itenslink)); + //$m->layer->setmetadata("ITENSDESC",base64_decode($itensdesc)); + //$m->layer->setmetadata("ITENSLINK",base64_decode($itenslink)); + $m->layer->setmetadata("ITENSDESC",$itensdesc); + $m->layer->setmetadata("ITENSLINK",$itenslink); $m->layer->setmetadata("itembuscarapida",$itembuscarapida); $m->salva(); $_SESSION["contadorsalva"]++; diff --git a/ferramentas/etiqueta/index.js b/ferramentas/etiqueta/index.js index f726142..1076f36 100755 --- a/ferramentas/etiqueta/index.js +++ b/ferramentas/etiqueta/index.js @@ -326,8 +326,10 @@ i3GEOF.etiqueta = { + i3GEOF.etiqueta.tema + "&tips="+lista[0].toString(",") + "&itens="+lista[1].toString(",") - + "&itensdesc="+i3GEO.util.base64encode(lista[2].toString(",")) - + "&itenslink="+i3GEO.util.base64encode(lista[3].toString(",")) + //+ "&itensdesc="+i3GEO.util.base64encode(lista[2].toString(",")) + //+ "&itenslink="+i3GEO.util.base64encode(lista[3].toString(",")) + + "&itensdesc="+lista[2].toString(",") + + "&itenslink="+lista[3].toString(",") + "&itembuscarapida="+lista[4]; cp.set_response_type("JSON"); cp.set_transfer_mode('POST'); diff --git a/ferramentas/filtro/index.js b/ferramentas/filtro/index.js index 2d9ee4d..644e6e0 100755 --- a/ferramentas/filtro/index.js +++ b/ferramentas/filtro/index.js @@ -178,8 +178,8 @@ i3GEOF.filtro = { titulo = "
------
"+$trad("t29")+"
"; } janela = i3GEO.janela.cria( - "580px", - "250px", + "600px", + "260px", "", "", "", diff --git a/ferramentas/legenda/exec.php b/ferramentas/legenda/exec.php index 5230c0f..9c2e6d2 100755 --- a/ferramentas/legenda/exec.php +++ b/ferramentas/legenda/exec.php @@ -103,7 +103,7 @@ Acrescenta a contagem de elementos em cada classe. $m = new Temas($map_file,$tema); $l = $m->mapa->getlayerbyname($tema); if($filter != ""){ - $filter = base64decode($filter); + //$filter = base64decode($filter); } $m->criaCluster($group,$filter,$maxdistance,$region,$buffer); $m->salva(); diff --git a/ferramentas/legenda/index.js b/ferramentas/legenda/index.js index a91be55..3fbe43b 100755 --- a/ferramentas/legenda/index.js +++ b/ferramentas/legenda/index.js @@ -436,7 +436,7 @@ i3GEOF.legenda = + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=5&idajuda=41' > "; janela = - i3GEO.janela.cria("490px", "340px", "", "", "", titulo, "i3GEOF.legenda", false, "hd", cabecalho, minimiza, function() { + i3GEO.janela.cria("540px", "350px", "", "", "", titulo, "i3GEOF.legenda", false, "hd", cabecalho, minimiza, function() { i3GEO.guias.ajustaGuiaFerramenta("i3GEOF.legenda", "i3GEOlegenda"); }, true, "", "", "nao"); divid = janela[2].id; @@ -856,7 +856,7 @@ i3GEOF.legenda = var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); p = i3GEO.configura.locaplic + "/classesphp/mapa_controle.php?" - + "base64=sim" + + "base64=nao" + "&g_sid=" + i3GEO.configura.sid + "&funcao=alteraclasse" @@ -866,11 +866,13 @@ i3GEOF.legenda = cp = new cpaint(); cp.set_transfer_mode('POST'); cp.set_response_type("JSON"); - cp.call(p, "alteraclassesPost", temp, "ids=" + i3GEO.util.base64encode(ids) + cp.call(p, "alteraclassesPost", temp, "ids=" + ids + "&nomes=" - + i3GEO.util.base64encode(nomes) + //+ i3GEO.util.base64encode(nomes) + + nomes + "&exps=" - + i3GEO.util.base64encode(exps) + //+ i3GEO.util.base64encode(exps) + + exps + "&minScales=" + minScales + "&maxScales=" @@ -1981,7 +1983,7 @@ i3GEOF.legenda = $i("i3GEOlegendaComboSize").innerHTML = retorno.dados.replace("id=''"," onchange='$i(\"i3GEOlegendasizes\").value = this.value'"); } }); - + i3GEO.util.aplicaAquarela("i3GEOlegendaParametrosEstilos"); p = i3GEO.configura.locaplic + "/classesphp/mapa_controle.php?g_sid=" @@ -2301,7 +2303,8 @@ i3GEOF.legenda = + "&buffer=" + $i("i3GEOlegendaClusterBuffer").value + "&filter=" - + i3GEO.util.base64encode($i("i3GEOlegendaClusterFilter").value) + //+ i3GEO.util.base64encode($i("i3GEOlegendaClusterFilter").value) + + $i("i3GEOlegendaClusterFilter").value + "®ion=" + $i("i3GEOlegendaClusterRegion").value + "&group=" diff --git a/ferramentas/legenda/template_mst.html b/ferramentas/legenda/template_mst.html index 7c418c4..bdc5152 100755 --- a/ferramentas/legenda/template_mst.html +++ b/ferramentas/legenda/template_mst.html @@ -131,10 +131,14 @@
+

+

+

+

-- libgit2 0.21.2