Download as
Browse Code »

Commit 4e629496892b0bb9f3fe78a708950cfea6f1f449

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

Correção no editor de mapfile para evitar perda de strings quando existirem sina… 

…is não permitidos no mapfile (usados em expressões)
Showing 6 changed files with 23 additions and 32 deletions   Show diff stats
admin/admin.db
View file @4e62949
No preview for this file type
admin/catalogo/mapfile/editor/funcoes.php
  Diff comments   View file @4e62949
@@ -195,7 +195,7 @@ function salvaMapfile() @@ -195,7 +195,7 @@ function salvaMapfile()
195 195
196 $layer = $mapa->getlayerbyname($codigo); 196 $layer = $mapa->getlayerbyname($codigo);
197 if ($layer == "") { 197 if ($layer == "") {
198 - return "<br><span style='color:red;'>Atenção: não existe nenhum LAYER com NAME igual a " . $codigo . "</span><br>"; 198 + return "<br><span style='color:red;'>Aten&ccedil;&atilde;o: n&atilde;o existe nenhum LAYER com NAME igual a " . $codigo . "</span><br>";
199 } else { 199 } else {
200 // pega o metadata 200 // pega o metadata
201 $meta = $layer->getmetadata("permitedownload"); 201 $meta = $layer->getmetadata("permitedownload");
admin/catalogo/mapfile/editor/index.php
  Diff comments   View file @4e62949
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
3 // TODO editor de cores 3 // TODO editor de cores
4 // 4 //
5 5
  6 +//nao tire daqui ou as expressoes podem ser sanitizadas
  7 +if (isset ( $_POST ["texto"] )) {
  8 + $gravarTexto = $_POST ["texto"];
  9 + $_POST ["texto"] = "";
  10 +}
6 /****************************************************************/ 11 /****************************************************************/
7 //include ("exec.php"); 12 //include ("exec.php");
8 // 13 //
@@ -14,7 +19,6 @@ @@ -14,7 +19,6 @@
14 include ("../../../php/checaLogin.php"); 19 include ("../../../php/checaLogin.php");
15 \admin\php\login\checaLogin(); 20 \admin\php\login\checaLogin();
16 21
17 -  
18 //$k = filter_var ( $k, FILTER_SANITIZE_STRING ); 22 //$k = filter_var ( $k, FILTER_SANITIZE_STRING );
19 23
20 //funcoes de administracao 24 //funcoes de administracao
@@ -39,10 +43,6 @@ define ( &quot;ONDEI3GEO&quot;, &quot;../../../..&quot; ); @@ -39,10 +43,6 @@ define ( &quot;ONDEI3GEO&quot;, &quot;../../../..&quot; );
39 include "../../../head.php"; 43 include "../../../head.php";
40 $codigo = filter_var ( $_GET ["codigo"], FILTER_SANITIZE_STRING ); 44 $codigo = filter_var ( $_GET ["codigo"], FILTER_SANITIZE_STRING );
41 $id_tema = ( int ) $_GET ["id_tema"]; 45 $id_tema = ( int ) $_GET ["id_tema"];
42 -if (isset ( $_POST ["texto"] )) {  
43 - $gravarTexto = $_POST ["texto"];  
44 - $_POST ["texto"] = "";  
45 -}  
46 46
47 if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( "admin/html/editortexto" ) === false) { 47 if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( "admin/html/editortexto" ) === false) {
48 header ( "HTTP/1.1 403 Vc nao pode realizar essa operacao" ); 48 header ( "HTTP/1.1 403 Vc nao pode realizar essa operacao" );
@@ -50,6 +50,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/editortexto&quot; ) @@ -50,6 +50,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/editortexto&quot; )
50 } 50 }
51 $versao = \admin\php\funcoesAdmin\versao (); 51 $versao = \admin\php\funcoesAdmin\versao ();
52 $versao = $versao ["principal"]; 52 $versao = $versao ["principal"];
  53 +
53 \admin\catalogo\mapfile\editor\salvaMapfile (); 54 \admin\catalogo\mapfile\editor\salvaMapfile ();
54 $textoMapfile = \admin\catalogo\mapfile\editor\textoMapfile ( $codigo ); 55 $textoMapfile = \admin\catalogo\mapfile\editor\textoMapfile ( $codigo );
55 ?> 56 ?>
ferramentas/salvamapfile/index.js
  Diff comments   View file @4e62949
@@ -129,7 +129,7 @@ i3GEOF.salvamapfile = { @@ -129,7 +129,7 @@ i3GEOF.salvamapfile = {
129 titulo = "<span class='i3GeoTituloJanelaBsNolink' >" + $trad("x55") + "</span></div>"; 129 titulo = "<span class='i3GeoTituloJanelaBsNolink' >" + $trad("x55") + "</span></div>";
130 janela = i3GEO.janela.cria( 130 janela = i3GEO.janela.cria(
131 "340px", 131 "340px",
132 - "160px", 132 + "260px",
133 "", 133 "",
134 "", 134 "",
135 "", 135 "",
temas/_lbairros.map
  Diff comments   View file @4e62949
1 MAP 1 MAP
2 - FONTSET "/var/www/i3geo/symbols/fontes.txt"  
3 - SYMBOLSET "/var/www/i3geo/symbols/simbolosv6.sym" 2 + FONTSET "/var/www/i3geo/symbols/fontes.txt"
  3 + SYMBOLSET "/var/www/i3geo/symbols/simbolosv6.sym"
4 LAYER 4 LAYER
5 - CONNECTION "user=postgres password=postgres dbname=i3geosaude host=localhost port=5432" 5 + CONNECTION "i3geosaude"
6 CONNECTIONTYPE POSTGIS 6 CONNECTIONTYPE POSTGIS
7 DATA "the_geom from (select gid, st_setsrid(the_geom,4326) as the_geom,co_bairro,no_bairro,no_distr,no_municip from i3geo_metaestat.bairros ) as foo using unique co_bairro using srid=4326" 7 DATA "the_geom from (select gid, st_setsrid(the_geom,4326) as the_geom,co_bairro,no_bairro,no_distr,no_municip from i3geo_metaestat.bairros ) as foo using unique co_bairro using srid=4326"
8 METADATA 8 METADATA
9 - "cache" "sim"  
10 "TIP" "no_bairro,id" 9 "TIP" "no_bairro,id"
  10 + "cache" "sim"
11 "CLASSE" "SIM" 11 "CLASSE" "SIM"
12 "permitekmz" "SIM" 12 "permitekmz" "SIM"
13 "ITENSDESC" "id,Código bairro,Nome,Distrito,Município" 13 "ITENSDESC" "id,Código bairro,Nome,Distrito,Município"
@@ -18,11 +18,11 @@ MAP @@ -18,11 +18,11 @@ MAP
18 "permitecomentario" "NAO" 18 "permitecomentario" "NAO"
19 "escondido" "NAO" 19 "escondido" "NAO"
20 "download" "SIM" 20 "download" "SIM"
21 - "CONEXAOORIGINAL" "i3geosaude"  
22 "ITENS" "gid,co_bairro,no_bairro,no_distr,no_municip" 21 "ITENS" "gid,co_bairro,no_bairro,no_distr,no_municip"
23 - "permitekml" "SIM"  
24 - "permiteogc" "SIM" 22 + "CONEXAOORIGINAL" "i3geosaude"
25 "transitioneffect" "NAO" 23 "transitioneffect" "NAO"
  24 + "permiteogc" "SIM"
  25 + "permitekml" "SIM"
26 "TEMA" "_Bairros POSTGIS" 26 "TEMA" "_Bairros POSTGIS"
27 "identifica" "sim" 27 "identifica" "sim"
28 END # METADATA 28 END # METADATA
@@ -35,13 +35,13 @@ MAP @@ -35,13 +35,13 @@ MAP
35 TYPE POLYGON 35 TYPE POLYGON
36 UNITS METERS 36 UNITS METERS
37 CLASS 37 CLASS
38 - NAME "" 38 + NAME " "
39 STYLE 39 STYLE
40 - OUTLINECOLOR 255 100 0  
41 - END # STYLE  
42 - TITLE "" 40 + COLOR 255 0 0
  41 + OUTLINECOLOR 255 255 255
  42 + END
43 END # CLASS 43 END # CLASS
44 - END # LAYER  
45 44
  45 + END # LAYER
46 END # MAP 46 END # MAP
47 47
temas/_lbiomashp.map
  Diff comments   View file @4e62949
1 MAP 1 MAP
2 - FONTSET "../symbols/fontes.txt"  
3 - SYMBOLSET "../symbols/simbolosv6.sym" 2 + FONTSET "../symbols/fontes.txt"
  3 + SYMBOLSET "../symbols/simbolosv6.sym"
4 LAYER 4 LAYER
5 COMPOSITE 5 COMPOSITE
6 OPACITY 50 6 OPACITY 50
@@ -11,23 +11,15 @@ MAP @@ -11,23 +11,15 @@ MAP
11 "TIP" "CD_LEGENDA" 11 "TIP" "CD_LEGENDA"
12 "cache" "sim" 12 "cache" "sim"
13 "CLASSE" "SIM" 13 "CLASSE" "SIM"
14 - "olopacity" ""  
15 "animagif" "" 14 "animagif" ""
16 "permitekmz" "SIM" 15 "permitekmz" "SIM"
17 - "gmopacity" ""  
18 - "gmstatus" ""  
19 "ITENSDESC" "Teste de acentuação" 16 "ITENSDESC" "Teste de acentuação"
20 "TILES" "SIM" 17 "TILES" "SIM"
21 "ESCALA" "250000" 18 "ESCALA" "250000"
22 "editavel" "" 19 "editavel" ""
23 - "arquivotemaoriginal" ""  
24 "extensao" "-73.990940816816 -33.74827031115 -34.822855820777 5.272224303909" 20 "extensao" "-73.990940816816 -33.74827031115 -34.822855820777 5.272224303909"
25 - "nomeoriginal" ""  
26 - "olstatus" ""  
27 "permitedownload" "SIM" 21 "permitedownload" "SIM"
28 - "FILTROORIGINAL" ""  
29 "permitecomentario" "NAO" 22 "permitecomentario" "NAO"
30 - "DATAORIGINAL" ""  
31 "escondido" "NAO" 23 "escondido" "NAO"
32 "download" "SIM" 24 "download" "SIM"
33 "esquematabelaeditavel" "" 25 "esquematabelaeditavel" ""
@@ -58,7 +50,7 @@ MAP @@ -58,7 +50,7 @@ MAP
58 NAME "CAATINGA" 50 NAME "CAATINGA"
59 EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA') 51 EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA')
60 STYLE 52 STYLE
61 - COLOR 183 247 169 53 + COLOR 50 247 169
62 OUTLINECOLOR 255 255 255 54 OUTLINECOLOR 255 255 255
63 END # STYLE 55 END # STYLE
64 TITLE "" 56 TITLE ""
@@ -109,6 +101,4 @@ MAP @@ -109,6 +101,4 @@ MAP
109 TITLE "" 101 TITLE ""
110 END # CLASS 102 END # CLASS
111 END # LAYER 103 END # LAYER
112 -  
113 END # MAP 104 END # MAP
114 -