Download as
Browse Code »

Commit 3ba33202a5a5b179ef3b4ac17057c1420fc2e357

Authored by Edmar Moretti
1 parent 60e46c5d
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

atualização do i3geo

Showing 8 changed files with 53 additions and 23 deletions   Show diff stats
classesphp/classe_alteraclasse.php
  Diff comments   View file @3ba3320
@@ -196,9 +196,9 @@ class Alteraclasse @@ -196,9 +196,9 @@ class Alteraclasse
196 function alteraclasses($ids,$nomes,$exps,$base64="nao",$minScales="",$maxScales="") 196 function alteraclasses($ids,$nomes,$exps,$base64="nao",$minScales="",$maxScales="")
197 { 197 {
198 if($base64 == "sim"){ 198 if($base64 == "sim"){
199 - $ids = base64_decode($ids);  
200 - $nomes = base64_decode($nomes);  
201 - $exps = base64_decode($exps); 199 + //$ids = base64_decode($ids);
  200 + //$nomes = base64_decode($nomes);
  201 + //$exps = base64_decode($exps);
202 } 202 }
203 //prepara os arrays com os valores 203 //prepara os arrays com os valores
204 $ids = explode(";",$ids); 204 $ids = explode(";",$ids);
classesphp/classe_temas.php
  Diff comments   View file @3ba3320
@@ -495,7 +495,7 @@ $testa - Testa o filtro e retorna uma imagem. @@ -495,7 +495,7 @@ $testa - Testa o filtro e retorna uma imagem.
495 function insereFiltro($filtro,$testa="",$base64="nao") 495 function insereFiltro($filtro,$testa="",$base64="nao")
496 { 496 {
497 if($base64 == "sim"){ 497 if($base64 == "sim"){
498 - $filtro = base64_decode($filtro); 498 + //$filtro = base64_decode($filtro);
499 } 499 }
500 foreach($this->indices as $indice){ 500 foreach($this->indices as $indice){
501 $layer = $this->mapa->getlayer($indice); 501 $layer = $this->mapa->getlayer($indice);
classesphp/mapa_controle.php
  Diff comments   View file @3ba3320
@@ -125,11 +125,6 @@ if ($funcao != "pegaTodosTemas" && $funcao != "download3" && $funcao != "listain @@ -125,11 +125,6 @@ if ($funcao != "pegaTodosTemas" && $funcao != "download3" && $funcao != "listain
125 session_id($g_sid); 125 session_id($g_sid);
126 } 126 }
127 session_start(); 127 session_start();
128 - foreach(array_keys($_SESSION) as $k){  
129 - if(!is_array($_SESSION[$k])){  
130 - //eval("\$".$k."='".$_SESSION[$k]."';");  
131 - }  
132 - }  
133 $statusFerramentas = $_SESSION["statusFerramentas"]; 128 $statusFerramentas = $_SESSION["statusFerramentas"];
134 $imgurl = $_SESSION["imgurl"]; 129 $imgurl = $_SESSION["imgurl"];
135 $tmpurl = $_SESSION["tmpurl"]; 130 $tmpurl = $_SESSION["tmpurl"];
ferramentas/etiqueta/exec.php
  Diff comments   View file @3ba3320
@@ -20,8 +20,10 @@ Ativa as etiquetas de um tema. @@ -20,8 +20,10 @@ Ativa as etiquetas de um tema.
20 $m->layer->setmetadata("IDENTIFICA",""); 20 $m->layer->setmetadata("IDENTIFICA","");
21 $m->layer->setmetadata("TIP",$tips); 21 $m->layer->setmetadata("TIP",$tips);
22 $m->layer->setmetadata("ITENS",$itens); 22 $m->layer->setmetadata("ITENS",$itens);
23 - $m->layer->setmetadata("ITENSDESC",base64_decode($itensdesc));  
24 - $m->layer->setmetadata("ITENSLINK",base64_decode($itenslink)); 23 + //$m->layer->setmetadata("ITENSDESC",base64_decode($itensdesc));
  24 + //$m->layer->setmetadata("ITENSLINK",base64_decode($itenslink));
  25 + $m->layer->setmetadata("ITENSDESC",$itensdesc);
  26 + $m->layer->setmetadata("ITENSLINK",$itenslink);
25 $m->layer->setmetadata("itembuscarapida",$itembuscarapida); 27 $m->layer->setmetadata("itembuscarapida",$itembuscarapida);
26 $m->salva(); 28 $m->salva();
27 $_SESSION["contadorsalva"]++; 29 $_SESSION["contadorsalva"]++;
ferramentas/etiqueta/index.js
  Diff comments   View file @3ba3320
@@ -326,8 +326,10 @@ i3GEOF.etiqueta = { @@ -326,8 +326,10 @@ i3GEOF.etiqueta = {
326 + i3GEOF.etiqueta.tema 326 + i3GEOF.etiqueta.tema
327 + "&tips="+lista[0].toString(",") 327 + "&tips="+lista[0].toString(",")
328 + "&itens="+lista[1].toString(",") 328 + "&itens="+lista[1].toString(",")
329 - + "&itensdesc="+i3GEO.util.base64encode(lista[2].toString(","))  
330 - + "&itenslink="+i3GEO.util.base64encode(lista[3].toString(",")) 329 + //+ "&itensdesc="+i3GEO.util.base64encode(lista[2].toString(","))
  330 + //+ "&itenslink="+i3GEO.util.base64encode(lista[3].toString(","))
  331 + + "&itensdesc="+lista[2].toString(",")
  332 + + "&itenslink="+lista[3].toString(",")
331 + "&itembuscarapida="+lista[4]; 333 + "&itembuscarapida="+lista[4];
332 cp.set_response_type("JSON"); 334 cp.set_response_type("JSON");
333 cp.set_transfer_mode('POST'); 335 cp.set_transfer_mode('POST');
ferramentas/inicia.php
  Diff comments   View file @3ba3320
@@ -31,11 +31,39 @@ if(!empty($g_sid)){ @@ -31,11 +31,39 @@ if(!empty($g_sid)){
31 session_name("i3GeoPHP"); 31 session_name("i3GeoPHP");
32 session_id($g_sid); 32 session_id($g_sid);
33 session_start(); 33 session_start();
34 - foreach(array_keys($_SESSION) as $k){  
35 - if(!is_array($_SESSION[$k]))  
36 - eval("\$".$k."='".$_SESSION[$k]."';");  
37 - } 34 + $statusFerramentas = $_SESSION["statusFerramentas"];
  35 + $imgurl = $_SESSION["imgurl"];
  36 + $tmpurl = $_SESSION["tmpurl"];
  37 + $map_file = $_SESSION["map_file"];
  38 + $mapext = $_SESSION["mapext"];
  39 + $dir_tmp = $_SESSION["dir_tmp"] ;
  40 + $cachedir = $_SESSION["cachedir"];
  41 + $emailInstituicao = $_SESSION["emailInstituicao"];
  42 + $locmapserv = $_SESSION["locmapserv"];
  43 + $locaplic = $_SESSION["locaplic"];
  44 + $R_path = $_SESSION["R_path"];
  45 + $mapext = $_SESSION["mapext"];
  46 + $debug = $_SESSION["debug"];
  47 + $ler_extensoes = $_SESSION["ler_extensoes"];
  48 + $postgis_mapa = $_SESSION["postgis_mapa"];
  49 + $perfil = $_SESSION["perfil"];
  50 + $navegadoresLocais = $_SESSION["navegadoresLocais"];
  51 + $utilizacgi = $_SESSION["utilizacgi"];
  52 + $tituloInstituicao = $_SESSION["tituloInstituicao"];
  53 + $expoeMapfile = $_SESSION["expoeMapfile"];
  54 + $googleApiKey = $_SESSION["googleApiKey"];
  55 + $mensagemInicia = $_SESSION["mensagemInicia"];
  56 + $interfacePadrao = $_SESSION["interfacePadrao"];
  57 + $interface = $_SESSION["interface"];
  58 + $kmlurl = $_SESSION["kmlurl"];
  59 + $mapdir = $_SESSION["mapdir"];
  60 + $imgdir = $_SESSION["imgdir"];
  61 + $contadorsalva = $_SESSION["contadorsalva"];
  62 + $i3georendermode = $_SESSION["i3georendermode"];
  63 + $saikuUrl = $_SESSION["saikuUrl"];
  64 + //sao arrays
38 $postgis_mapa = $_SESSION["postgis_mapa"]; 65 $postgis_mapa = $_SESSION["postgis_mapa"];
  66 + $statusFerramentas = $_SESSION["statusFerramentas"];
39 } 67 }
40 include_once(dirname(__FILE__)."/../classesphp/funcoes_gerais.php"); 68 include_once(dirname(__FILE__)."/../classesphp/funcoes_gerais.php");
41 if(isset($fingerprint) && !empty($g_sid)) { 69 if(isset($fingerprint) && !empty($g_sid)) {
ferramentas/legenda/exec.php
  Diff comments   View file @3ba3320
@@ -103,7 +103,7 @@ Acrescenta a contagem de elementos em cada classe. @@ -103,7 +103,7 @@ Acrescenta a contagem de elementos em cada classe.
103 $m = new Temas($map_file,$tema); 103 $m = new Temas($map_file,$tema);
104 $l = $m->mapa->getlayerbyname($tema); 104 $l = $m->mapa->getlayerbyname($tema);
105 if($filter != ""){ 105 if($filter != ""){
106 - $filter = base64decode($filter); 106 + //$filter = base64decode($filter);
107 } 107 }
108 $m->criaCluster($group,$filter,$maxdistance,$region,$buffer); 108 $m->criaCluster($group,$filter,$maxdistance,$region,$buffer);
109 $m->salva(); 109 $m->salva();
ferramentas/legenda/index.js
  Diff comments   View file @3ba3320
@@ -856,7 +856,7 @@ i3GEOF.legenda = @@ -856,7 +856,7 @@ i3GEOF.legenda =
856 var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten); 856 var ext = i3GEO.util.extOSM2Geo(i3GEO.parametros.mapexten);
857 p = 857 p =
858 i3GEO.configura.locaplic + "/classesphp/mapa_controle.php?" 858 i3GEO.configura.locaplic + "/classesphp/mapa_controle.php?"
859 - + "base64=sim" 859 + + "base64=nao"
860 + "&g_sid=" 860 + "&g_sid="
861 + i3GEO.configura.sid 861 + i3GEO.configura.sid
862 + "&funcao=alteraclasse" 862 + "&funcao=alteraclasse"
@@ -866,11 +866,13 @@ i3GEOF.legenda = @@ -866,11 +866,13 @@ i3GEOF.legenda =
866 cp = new cpaint(); 866 cp = new cpaint();
867 cp.set_transfer_mode('POST'); 867 cp.set_transfer_mode('POST');
868 cp.set_response_type("JSON"); 868 cp.set_response_type("JSON");
869 - cp.call(p, "alteraclassesPost", temp, "ids=" + i3GEO.util.base64encode(ids) 869 + cp.call(p, "alteraclassesPost", temp, "ids=" + ids
870 + "&nomes=" 870 + "&nomes="
871 - + i3GEO.util.base64encode(nomes) 871 + //+ i3GEO.util.base64encode(nomes)
  872 + + nomes
872 + "&exps=" 873 + "&exps="
873 - + i3GEO.util.base64encode(exps) 874 + //+ i3GEO.util.base64encode(exps)
  875 + + exps
874 + "&minScales=" 876 + "&minScales="
875 + minScales 877 + minScales
876 + "&maxScales=" 878 + "&maxScales="
@@ -2301,7 +2303,8 @@ i3GEOF.legenda = @@ -2301,7 +2303,8 @@ i3GEOF.legenda =
2301 + "&buffer=" 2303 + "&buffer="
2302 + $i("i3GEOlegendaClusterBuffer").value 2304 + $i("i3GEOlegendaClusterBuffer").value
2303 + "&filter=" 2305 + "&filter="
2304 - + i3GEO.util.base64encode($i("i3GEOlegendaClusterFilter").value) 2306 + //+ i3GEO.util.base64encode($i("i3GEOlegendaClusterFilter").value)
  2307 + + $i("i3GEOlegendaClusterFilter").value
2305 + "&region=" 2308 + "&region="
2306 + $i("i3GEOlegendaClusterRegion").value 2309 + $i("i3GEOlegendaClusterRegion").value
2307 + "&group=" 2310 + "&group="