diff --git a/ferramentas/aplicarsld/upload.php b/ferramentas/aplicarsld/upload.php index 6a26e40..99490c2 100755 --- a/ferramentas/aplicarsld/upload.php +++ b/ferramentas/aplicarsld/upload.php @@ -28,10 +28,13 @@ if (isset($_FILES['i3GEOaplicarsld']['name'])) echo "

Carregando o arquivo...

"; $dirmap = dirname($map_file); //verifica nomes - verificaNome($_FILES['i3GEOaplicarsld']['name']); + $ArquivoDest = $_FILES['i3GEOaplicarsld']['name']; + $ArquivoDest = str_replace(".sld","",$ArquivoDest).".sld"; + verificaNome($ArquivoDest); + //sobe arquivo $Arquivo = $_FILES['i3GEOaplicarsld']['tmp_name']; - $status = move_uploaded_file($Arquivo,$dirmap."/".$_FILES['i3GEOaplicarsld']['name']); + $status = move_uploaded_file($Arquivo,$dirmap."/".$ArquivoDest); if($status != 1) {echo "

Ocorreu um erro no envio do arquivo SLD";paraAguarde();exit;} diff --git a/ferramentas/carregamapa/upload.php b/ferramentas/carregamapa/upload.php index c20af47..766558e 100755 --- a/ferramentas/carregamapa/upload.php +++ b/ferramentas/carregamapa/upload.php @@ -24,6 +24,8 @@ if (isset($_FILES['i3GEOcarregamapafilemap']['name'])) echo "

Carregando o arquivo...

"; $dirmap = $dir_tmp; $Arquivo = $_FILES['i3GEOcarregamapafilemap']['name']; + $Arquivo = str_replace(".map","",$Arquivo).".map"; + verificaNome($Arquivo); /* $statusNome = 1; diff --git a/ferramentas/importarwmc/upload.php b/ferramentas/importarwmc/upload.php index 88aae4d..9955bad 100755 --- a/ferramentas/importarwmc/upload.php +++ b/ferramentas/importarwmc/upload.php @@ -25,10 +25,12 @@ if(isset($_FILES['i3GEOimportarwmc']['name']) && !($_POST["i3GEOimportarwmcurl"] { echo "

Carregando o arquivo...

"; //verifica nomes - verificaNome($_FILES['i3GEOimportarwmc']['name']); + $ArquivoDest = $_FILES['i3GEOimportarwmc']['name']; + $ArquivoDest = str_replace(".xml","",$ArquivoDest).".xml"; + verificaNome($ArquivoDest); //sobe arquivo $Arquivo = $_FILES['i3GEOimportarwmc']['tmp_name']; - $status = move_uploaded_file($Arquivo,$dirmap."/".$_FILES['i3GEOimportarwmc']['name']); + $status = move_uploaded_file($Arquivo,$dirmap."/".$ArquivoDest); $arquivo = $dirmap."/".$_FILES['i3GEOimportarwmc']['name']; } if($_POST["i3GEOimportarwmcurl"]) diff --git a/ferramentas/uploaddbf/upload.php b/ferramentas/uploaddbf/upload.php index 61321d2..75cc9b7 100755 --- a/ferramentas/uploaddbf/upload.php +++ b/ferramentas/uploaddbf/upload.php @@ -31,13 +31,24 @@ if (isset($_FILES['i3GEOuploaddbffile']['name'])) sleep(1); $dirmap = dirname($map_file); //verifica nomes + $ArquivoDest = $_FILES['i3GEOuploaddbffile']['name']; + if($i3GEOuploaddbftipoarquivo != "dbf"){ + $ArquivoDest = str_replace(".csv","",$ArquivoDest).".csv"; + } + else{ + $ArquivoDest = str_replace(".dbf","",$ArquivoDest).".dbf"; + } + verificaNome($ArquivoDest); + + + verificaNome($_FILES['i3GEOuploaddbffile']['name']); //sobe arquivo $Arquivo = $_FILES['i3GEOuploaddbffile']['tmp_name']; - $status = move_uploaded_file($Arquivo,$dirmap."/".$_FILES['i3GEOuploaddbffile']['name']); + $status = move_uploaded_file($Arquivo,$dirmap."/".$ArquivoDest); if($status != 1) {echo "Ocorreu um erro no envio do arquivo";paraAguarde();exit;} - $nome = explode(".",$_FILES['i3GEOuploaddbffile']['name']); + $nome = explode(".",$ArquivoDest); $nome = $nome[0]; $nome = $nome."_".(nomeRandomico(4)); $nomeshp = $dirmap."/".$nome.".shp"; diff --git a/ferramentas/uploadgpx/upload.php b/ferramentas/uploadgpx/upload.php index 580c671..cbb62e2 100755 --- a/ferramentas/uploadgpx/upload.php +++ b/ferramentas/uploadgpx/upload.php @@ -32,11 +32,13 @@ if (isset($_FILES['i3GEOuploadgpx']['name'])) sleep(1); $dirmap = dirname($map_file); //verifica nomes - verificaNome($_FILES['i3GEOuploadgpx']['name']); + $ArquivoDest = $_FILES['i3GEOuploadgpx']['name']; + $ArquivoDest = str_replace(".gpx","",$ArquivoDest).".gpx"; + verificaNome($ArquivoDest); //sobe arquivo $Arquivo = $_FILES['i3GEOuploadgpx']['tmp_name']; - $status = move_uploaded_file($Arquivo,$dirmap."/".$_FILES['i3GEOuploadgpx']['name']); + $status = move_uploaded_file($Arquivo,$dirmap."/".$ArquivoDest); if($status != 1) {echo "

Ocorreu um erro no envio do arquivo gpx";paraAguarde();exit;} @@ -49,14 +51,14 @@ if (isset($_FILES['i3GEOuploadgpx']['name'])) $tipos = array("waypoints","routes","tracks","route_points","track_points"); foreach($tipos as $tipo){ $novolayer = ms_newLayerObj($mapa); - $novolayer->set("connection",$dirmap."/".$_FILES['i3GEOuploadgpx']['name']); + $novolayer->set("connection",$dirmap."/".$ArquivoDest); if(ms_GetVersionInt() > 50201) {$novolayer->setconnectiontype(MS_OGR);} else {$novolayer->set("connectiontype",MS_OGR);} - $nome = str_replace(".","",$_FILES['i3GEOuploadgpx']['name']); + $nome = str_replace(".","",$ArquivoDest); $novolayer->set("name",$nome.$tipo); - $novolayer->setmetadata("TEMA",$_FILES['i3GEOuploadgpx']['name']." ".$tipo); + $novolayer->setmetadata("TEMA",$ArquivoDest." ".$tipo); $novolayer->setmetadata("DOWNLOAD","SIM"); $novolayer->setmetadata("CLASSE","SIM"); $novolayer->setmetadata("TEXTO","NAO"); diff --git a/ferramentas/uploadkml/upload.php b/ferramentas/uploadkml/upload.php index bfeffba..e7d31b4 100755 --- a/ferramentas/uploadkml/upload.php +++ b/ferramentas/uploadkml/upload.php @@ -32,11 +32,13 @@ if (isset($_FILES['i3GEOuploadkml']['name'])) sleep(1); $dirmap = dirname($map_file); //verifica nomes - verificaNome($_FILES['i3GEOuploadkml']['name']); + $ArquivoDest = $_FILES['i3GEOuploadkml']['name']; + $ArquivoDest = str_replace(".kml","",$ArquivoDest).".kml"; + verificaNome($ArquivoDest); //sobe arquivo $Arquivo = $_FILES['i3GEOuploadkml']['tmp_name']; - $status = move_uploaded_file($Arquivo,$dirmap."/".$_FILES['i3GEOuploadkml']['name']); + $status = move_uploaded_file($Arquivo,$dirmap."/".$ArquivoDest); if($status != 1) {echo "

Ocorreu um erro no envio do arquivo kml";paraAguarde();exit;} @@ -49,15 +51,15 @@ if (isset($_FILES['i3GEOuploadkml']['name'])) $tipos = array("pontos","linhas","poligonos"); foreach($tipos as $tipo){ $novolayer = ms_newLayerObj($mapa); - $novolayer->set("connection",$dirmap."/".$_FILES['i3GEOuploadkml']['name']); + $novolayer->set("connection",$dirmap."/".$ArquivoDest); if(ms_GetVersionInt() > 50201) {$novolayer->setconnectiontype(MS_OGR);} else {$novolayer->set("connectiontype",MS_OGR);} - $nome = str_replace(".","",$_FILES['i3GEOuploadkml']['name']); + $nome = str_replace(".","",$ArquivoDest); $novolayer->set("name",$nome.$tipo); - $novolayer->setmetadata("TEMA",$_FILES['i3GEOuploadkml']['name']." ".$tipo); + $novolayer->setmetadata("TEMA",$ArquivoDest." ".$tipo); $novolayer->setmetadata("DOWNLOAD","SIM"); $novolayer->setmetadata("CLASSE","SIM"); $novolayer->setmetadata("TEXTO","NAO"); diff --git a/ferramentas/uploadsimbolo/upload.php b/ferramentas/uploadsimbolo/upload.php index 1c94c02..b373139 100755 --- a/ferramentas/uploadsimbolo/upload.php +++ b/ferramentas/uploadsimbolo/upload.php @@ -41,6 +41,9 @@ if (isset($_FILES['i3GEOuploadsimboloarq']['name'])){ //verifica nomes $nome = basename($_FILES['i3GEOuploadsimboloarq']['name']); + + $nome = str_replace(".png","",$nome).".png"; + verificaNome($nome); //sobe arquivo $Arquivo = $_FILES['i3GEOuploadsimboloarq']['tmp_name']; diff --git a/ms_criamapa.php b/ms_criamapa.php index 8e11f66..79d4198 100755 --- a/ms_criamapa.php +++ b/ms_criamapa.php @@ -251,7 +251,6 @@ include_once (dirname(__FILE__)."/classesphp/pega_variaveis.php"); include_once (dirname(__FILE__)."/classesphp/funcoes_gerais.php"); $versao = versao(); $versao = $versao["principal"]; - // //verifica a sessao que controla o login do usuario // -- libgit2 0.21.2