Download as
Browse Code »

Commit d68ef852133e09c23f0bc67fd4e34f7fe0e9d5ef

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

Correção nas ferramentas de upload

Showing 8 changed files with 41 additions and 17 deletions   Show diff stats
ferramentas/aplicarsld/upload.php
  Diff comments   View file @d68ef85
@@ -28,10 +28,13 @@ if (isset($_FILES['i3GEOaplicarsld']['name'])) @@ -28,10 +28,13 @@ if (isset($_FILES['i3GEOaplicarsld']['name']))
28 echo "<p class='paragrafo' >Carregando o arquivo...</p>"; 28 echo "<p class='paragrafo' >Carregando o arquivo...</p>";
29 $dirmap = dirname($map_file); 29 $dirmap = dirname($map_file);
30 //verifica nomes 30 //verifica nomes
31 - verificaNome($_FILES['i3GEOaplicarsld']['name']); 31 + $ArquivoDest = $_FILES['i3GEOaplicarsld']['name'];
  32 + $ArquivoDest = str_replace(".sld","",$ArquivoDest).".sld";
  33 + verificaNome($ArquivoDest);
  34 +
32 //sobe arquivo 35 //sobe arquivo
33 $Arquivo = $_FILES['i3GEOaplicarsld']['tmp_name']; 36 $Arquivo = $_FILES['i3GEOaplicarsld']['tmp_name'];
34 - $status = move_uploaded_file($Arquivo,$dirmap."/".$_FILES['i3GEOaplicarsld']['name']); 37 + $status = move_uploaded_file($Arquivo,$dirmap."/".$ArquivoDest);
35 38
36 if($status != 1) 39 if($status != 1)
37 {echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo SLD";paraAguarde();exit;} 40 {echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo SLD";paraAguarde();exit;}
ferramentas/carregamapa/upload.php
  Diff comments   View file @d68ef85
@@ -24,6 +24,8 @@ if (isset($_FILES[&#39;i3GEOcarregamapafilemap&#39;][&#39;name&#39;])) @@ -24,6 +24,8 @@ if (isset($_FILES[&#39;i3GEOcarregamapafilemap&#39;][&#39;name&#39;]))
24 echo "<p class='paragrafo' >Carregando o arquivo...</p>"; 24 echo "<p class='paragrafo' >Carregando o arquivo...</p>";
25 $dirmap = $dir_tmp; 25 $dirmap = $dir_tmp;
26 $Arquivo = $_FILES['i3GEOcarregamapafilemap']['name']; 26 $Arquivo = $_FILES['i3GEOcarregamapafilemap']['name'];
  27 + $Arquivo = str_replace(".map","",$Arquivo).".map";
  28 +
27 verificaNome($Arquivo); 29 verificaNome($Arquivo);
28 /* 30 /*
29 $statusNome = 1; 31 $statusNome = 1;
ferramentas/importarwmc/upload.php
  Diff comments   View file @d68ef85
@@ -25,10 +25,12 @@ if(isset($_FILES[&#39;i3GEOimportarwmc&#39;][&#39;name&#39;]) &amp;&amp; !($_POST[&quot;i3GEOimportarwmcurl&quot;] @@ -25,10 +25,12 @@ if(isset($_FILES[&#39;i3GEOimportarwmc&#39;][&#39;name&#39;]) &amp;&amp; !($_POST[&quot;i3GEOimportarwmcurl&quot;]
25 { 25 {
26 echo "<p class='paragrafo' >Carregando o arquivo...</p>"; 26 echo "<p class='paragrafo' >Carregando o arquivo...</p>";
27 //verifica nomes 27 //verifica nomes
28 - verificaNome($_FILES['i3GEOimportarwmc']['name']); 28 + $ArquivoDest = $_FILES['i3GEOimportarwmc']['name'];
  29 + $ArquivoDest = str_replace(".xml","",$ArquivoDest).".xml";
  30 + verificaNome($ArquivoDest);
29 //sobe arquivo 31 //sobe arquivo
30 $Arquivo = $_FILES['i3GEOimportarwmc']['tmp_name']; 32 $Arquivo = $_FILES['i3GEOimportarwmc']['tmp_name'];
31 - $status = move_uploaded_file($Arquivo,$dirmap."/".$_FILES['i3GEOimportarwmc']['name']); 33 + $status = move_uploaded_file($Arquivo,$dirmap."/".$ArquivoDest);
32 $arquivo = $dirmap."/".$_FILES['i3GEOimportarwmc']['name']; 34 $arquivo = $dirmap."/".$_FILES['i3GEOimportarwmc']['name'];
33 } 35 }
34 if($_POST["i3GEOimportarwmcurl"]) 36 if($_POST["i3GEOimportarwmcurl"])
ferramentas/uploaddbf/upload.php
  Diff comments   View file @d68ef85
@@ -31,13 +31,24 @@ if (isset($_FILES[&#39;i3GEOuploaddbffile&#39;][&#39;name&#39;])) @@ -31,13 +31,24 @@ if (isset($_FILES[&#39;i3GEOuploaddbffile&#39;][&#39;name&#39;]))
31 sleep(1); 31 sleep(1);
32 $dirmap = dirname($map_file); 32 $dirmap = dirname($map_file);
33 //verifica nomes 33 //verifica nomes
  34 + $ArquivoDest = $_FILES['i3GEOuploaddbffile']['name'];
  35 + if($i3GEOuploaddbftipoarquivo != "dbf"){
  36 + $ArquivoDest = str_replace(".csv","",$ArquivoDest).".csv";
  37 + }
  38 + else{
  39 + $ArquivoDest = str_replace(".dbf","",$ArquivoDest).".dbf";
  40 + }
  41 + verificaNome($ArquivoDest);
  42 +
  43 +
  44 +
34 verificaNome($_FILES['i3GEOuploaddbffile']['name']); 45 verificaNome($_FILES['i3GEOuploaddbffile']['name']);
35 //sobe arquivo 46 //sobe arquivo
36 $Arquivo = $_FILES['i3GEOuploaddbffile']['tmp_name']; 47 $Arquivo = $_FILES['i3GEOuploaddbffile']['tmp_name'];
37 - $status = move_uploaded_file($Arquivo,$dirmap."/".$_FILES['i3GEOuploaddbffile']['name']); 48 + $status = move_uploaded_file($Arquivo,$dirmap."/".$ArquivoDest);
38 if($status != 1) 49 if($status != 1)
39 {echo "Ocorreu um erro no envio do arquivo";paraAguarde();exit;} 50 {echo "Ocorreu um erro no envio do arquivo";paraAguarde();exit;}
40 - $nome = explode(".",$_FILES['i3GEOuploaddbffile']['name']); 51 + $nome = explode(".",$ArquivoDest);
41 $nome = $nome[0]; 52 $nome = $nome[0];
42 $nome = $nome."_".(nomeRandomico(4)); 53 $nome = $nome."_".(nomeRandomico(4));
43 $nomeshp = $dirmap."/".$nome.".shp"; 54 $nomeshp = $dirmap."/".$nome.".shp";
ferramentas/uploadgpx/upload.php
  Diff comments   View file @d68ef85
@@ -32,11 +32,13 @@ if (isset($_FILES[&#39;i3GEOuploadgpx&#39;][&#39;name&#39;])) @@ -32,11 +32,13 @@ if (isset($_FILES[&#39;i3GEOuploadgpx&#39;][&#39;name&#39;]))
32 sleep(1); 32 sleep(1);
33 $dirmap = dirname($map_file); 33 $dirmap = dirname($map_file);
34 //verifica nomes 34 //verifica nomes
35 - verificaNome($_FILES['i3GEOuploadgpx']['name']); 35 + $ArquivoDest = $_FILES['i3GEOuploadgpx']['name'];
  36 + $ArquivoDest = str_replace(".gpx","",$ArquivoDest).".gpx";
  37 + verificaNome($ArquivoDest);
36 38
37 //sobe arquivo 39 //sobe arquivo
38 $Arquivo = $_FILES['i3GEOuploadgpx']['tmp_name']; 40 $Arquivo = $_FILES['i3GEOuploadgpx']['tmp_name'];
39 - $status = move_uploaded_file($Arquivo,$dirmap."/".$_FILES['i3GEOuploadgpx']['name']); 41 + $status = move_uploaded_file($Arquivo,$dirmap."/".$ArquivoDest);
40 42
41 if($status != 1) 43 if($status != 1)
42 {echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo gpx";paraAguarde();exit;} 44 {echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo gpx";paraAguarde();exit;}
@@ -49,14 +51,14 @@ if (isset($_FILES[&#39;i3GEOuploadgpx&#39;][&#39;name&#39;])) @@ -49,14 +51,14 @@ if (isset($_FILES[&#39;i3GEOuploadgpx&#39;][&#39;name&#39;]))
49 $tipos = array("waypoints","routes","tracks","route_points","track_points"); 51 $tipos = array("waypoints","routes","tracks","route_points","track_points");
50 foreach($tipos as $tipo){ 52 foreach($tipos as $tipo){
51 $novolayer = ms_newLayerObj($mapa); 53 $novolayer = ms_newLayerObj($mapa);
52 - $novolayer->set("connection",$dirmap."/".$_FILES['i3GEOuploadgpx']['name']); 54 + $novolayer->set("connection",$dirmap."/".$ArquivoDest);
53 if(ms_GetVersionInt() > 50201) 55 if(ms_GetVersionInt() > 50201)
54 {$novolayer->setconnectiontype(MS_OGR);} 56 {$novolayer->setconnectiontype(MS_OGR);}
55 else 57 else
56 {$novolayer->set("connectiontype",MS_OGR);} 58 {$novolayer->set("connectiontype",MS_OGR);}
57 - $nome = str_replace(".","",$_FILES['i3GEOuploadgpx']['name']); 59 + $nome = str_replace(".","",$ArquivoDest);
58 $novolayer->set("name",$nome.$tipo); 60 $novolayer->set("name",$nome.$tipo);
59 - $novolayer->setmetadata("TEMA",$_FILES['i3GEOuploadgpx']['name']." ".$tipo); 61 + $novolayer->setmetadata("TEMA",$ArquivoDest." ".$tipo);
60 $novolayer->setmetadata("DOWNLOAD","SIM"); 62 $novolayer->setmetadata("DOWNLOAD","SIM");
61 $novolayer->setmetadata("CLASSE","SIM"); 63 $novolayer->setmetadata("CLASSE","SIM");
62 $novolayer->setmetadata("TEXTO","NAO"); 64 $novolayer->setmetadata("TEXTO","NAO");
ferramentas/uploadkml/upload.php
  Diff comments   View file @d68ef85
@@ -32,11 +32,13 @@ if (isset($_FILES[&#39;i3GEOuploadkml&#39;][&#39;name&#39;])) @@ -32,11 +32,13 @@ if (isset($_FILES[&#39;i3GEOuploadkml&#39;][&#39;name&#39;]))
32 sleep(1); 32 sleep(1);
33 $dirmap = dirname($map_file); 33 $dirmap = dirname($map_file);
34 //verifica nomes 34 //verifica nomes
35 - verificaNome($_FILES['i3GEOuploadkml']['name']); 35 + $ArquivoDest = $_FILES['i3GEOuploadkml']['name'];
  36 + $ArquivoDest = str_replace(".kml","",$ArquivoDest).".kml";
  37 + verificaNome($ArquivoDest);
36 38
37 //sobe arquivo 39 //sobe arquivo
38 $Arquivo = $_FILES['i3GEOuploadkml']['tmp_name']; 40 $Arquivo = $_FILES['i3GEOuploadkml']['tmp_name'];
39 - $status = move_uploaded_file($Arquivo,$dirmap."/".$_FILES['i3GEOuploadkml']['name']); 41 + $status = move_uploaded_file($Arquivo,$dirmap."/".$ArquivoDest);
40 42
41 if($status != 1) 43 if($status != 1)
42 {echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo kml";paraAguarde();exit;} 44 {echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo kml";paraAguarde();exit;}
@@ -49,15 +51,15 @@ if (isset($_FILES[&#39;i3GEOuploadkml&#39;][&#39;name&#39;])) @@ -49,15 +51,15 @@ if (isset($_FILES[&#39;i3GEOuploadkml&#39;][&#39;name&#39;]))
49 $tipos = array("pontos","linhas","poligonos"); 51 $tipos = array("pontos","linhas","poligonos");
50 foreach($tipos as $tipo){ 52 foreach($tipos as $tipo){
51 $novolayer = ms_newLayerObj($mapa); 53 $novolayer = ms_newLayerObj($mapa);
52 - $novolayer->set("connection",$dirmap."/".$_FILES['i3GEOuploadkml']['name']); 54 + $novolayer->set("connection",$dirmap."/".$ArquivoDest);
53 if(ms_GetVersionInt() > 50201) 55 if(ms_GetVersionInt() > 50201)
54 {$novolayer->setconnectiontype(MS_OGR);} 56 {$novolayer->setconnectiontype(MS_OGR);}
55 else 57 else
56 {$novolayer->set("connectiontype",MS_OGR);} 58 {$novolayer->set("connectiontype",MS_OGR);}
57 59
58 - $nome = str_replace(".","",$_FILES['i3GEOuploadkml']['name']); 60 + $nome = str_replace(".","",$ArquivoDest);
59 $novolayer->set("name",$nome.$tipo); 61 $novolayer->set("name",$nome.$tipo);
60 - $novolayer->setmetadata("TEMA",$_FILES['i3GEOuploadkml']['name']." ".$tipo); 62 + $novolayer->setmetadata("TEMA",$ArquivoDest." ".$tipo);
61 $novolayer->setmetadata("DOWNLOAD","SIM"); 63 $novolayer->setmetadata("DOWNLOAD","SIM");
62 $novolayer->setmetadata("CLASSE","SIM"); 64 $novolayer->setmetadata("CLASSE","SIM");
63 $novolayer->setmetadata("TEXTO","NAO"); 65 $novolayer->setmetadata("TEXTO","NAO");
ferramentas/uploadsimbolo/upload.php
  Diff comments   View file @d68ef85
@@ -41,6 +41,9 @@ if (isset($_FILES[&#39;i3GEOuploadsimboloarq&#39;][&#39;name&#39;])){ @@ -41,6 +41,9 @@ if (isset($_FILES[&#39;i3GEOuploadsimboloarq&#39;][&#39;name&#39;])){
41 //verifica nomes 41 //verifica nomes
42 42
43 $nome = basename($_FILES['i3GEOuploadsimboloarq']['name']); 43 $nome = basename($_FILES['i3GEOuploadsimboloarq']['name']);
  44 +
  45 + $nome = str_replace(".png","",$nome).".png";
  46 +
44 verificaNome($nome); 47 verificaNome($nome);
45 //sobe arquivo 48 //sobe arquivo
46 $Arquivo = $_FILES['i3GEOuploadsimboloarq']['tmp_name']; 49 $Arquivo = $_FILES['i3GEOuploadsimboloarq']['tmp_name'];
ms_criamapa.php
  Diff comments   View file @d68ef85
@@ -251,7 +251,6 @@ include_once (dirname(__FILE__).&quot;/classesphp/pega_variaveis.php&quot;); @@ -251,7 +251,6 @@ include_once (dirname(__FILE__).&quot;/classesphp/pega_variaveis.php&quot;);
251 include_once (dirname(__FILE__)."/classesphp/funcoes_gerais.php"); 251 include_once (dirname(__FILE__)."/classesphp/funcoes_gerais.php");
252 $versao = versao(); 252 $versao = versao();
253 $versao = $versao["principal"]; 253 $versao = $versao["principal"];
254 -  
255 // 254 //
256 //verifica a sessao que controla o login do usuario 255 //verifica a sessao que controla o login do usuario
257 // 256 //