atualização das ferramentas de upload

Edmar Moretti
1 parent 0063b5f9
Showing 7 changed files with 51 additions and 52 deletions Show diff stats
ferramentas/aplicarsld/upload.php
ferramentas/importarwmc/upload.php
ferramentas/upload/upload.php
ferramentas/uploaddbf/upload.php
ferramentas/uploadgpx/upload.php
ferramentas/uploadkml/upload.php
ferramentas/uploadsimbolo/upload.php
@@ -43,7 +43,7 @@ if (isset($_FILES[&#39;i3GEOaplicarsld&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;i3GEOa
 	//sobe arquivo
 	$Arquivo = $_FILES['i3GEOaplicarsld']['tmp_name'];
-	$checkphp = fileContemString($_FILES['i3GEOaplicarsld']['tmp_name'],"<?");
+	$checkphp = fileContemString($_FILES['i3GEOaplicarsld']['tmp_name'],"<?php");
 	if($checkphp == true){
 		exit;
 	}
@@ -54,7 +54,7 @@ if (isset($_FILES[&#39;i3GEOaplicarsld&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;i3GEOa
 	{echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo SLD";paraAguarde();exit;}
 	if($status == 1)
 	{
-		echo "<p class='paragrafo' >Arquivo enviado. Aplicando SLD...$tema</p>";
+		echo "<p class='paragrafo' >Arquivo enviado. Aplicando SLD...</p>";
 		$layer = $mapa->getlayerbyname($tema);
 		$arq = $dirmap."/".$ArquivoDest;
 		$abre = fopen($arq, "r");
@@ -36,7 +36,7 @@ if(isset($_FILES[&#39;i3GEOimportarwmc&#39;][&#39;name&#39;]) &amp;&amp; !($_POST[&quot;i3GEOimportarwmcurl&quot;]
 	verificaNome($ArquivoDest);
 	//sobe arquivo
-	$checkphp = fileContemString($_FILES['i3GEOimportarwmc']['tmp_name'],"<?");
+	$checkphp = fileContemString($_FILES['i3GEOimportarwmc']['tmp_name'],"<?php");
 	if($checkphp == true){
 		exit;
 	}
@@ -59,24 +59,6 @@ if (isset($_FILES[&#39;i3GEOuploadshp&#39;][&#39;name&#39;]))
 		verificaNome($_FILES['i3GEOuploadprj']['name']);
 	}
-	$checkphp = fileContemString($_FILES['i3GEOuploadprj']['tmp_name'],"<?");
-	if($checkphp == true){
-		exit;
-	}
-	$checkphp = fileContemString($_FILES['i3GEOuploadshx']['tmp_name'],"<?");
-	if($checkphp == true){
-		exit;
-	}
-	$checkphp = fileContemString($_FILES['i3GEOuploaddbf']['tmp_name'],"<?");
-	if($checkphp == true){
-		exit;
-	}
-	$checkphp = fileContemString($_FILES['i3GEOuploadshp']['tmp_name'],"<?");
-	if($checkphp == true){
-		exit;
-	}
-
-
 	//remove acentos
 	$nomePrefixo = str_replace(" ","_",removeAcentos(str_replace(".shp","",$_FILES['i3GEOuploadshp']['name'])));
@@ -88,7 +70,7 @@ if (isset($_FILES[&#39;i3GEOuploadshp&#39;][&#39;name&#39;]))
 	//sobe arquivo
 	$Arquivo = $_FILES['i3GEOuploadshp']['tmp_name'];
 	if(file_exists($dirmap."/".$nomePrefixo.".shp"))
-	{echo "<p class='paragrafo' >J&aacute; existe um SHP com o nome ".$dirmap."/".$nomePrefixo;paraAguarde();exit;}
+	{echo "<p class='paragrafo' >J&aacute; existe um SHP com o nome ";paraAguarde();exit;}
 	$status =  move_uploaded_file($Arquivo,$dirmap."/".$nomePrefixo.".shp");
 	if($status != 1)
 	{echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo SHP. Pode ser uma limita&ccedil;&atilde;o quanto ao tamanho do arquivo ou permiss&atilde;o de escrita na pasta indicada.";paraAguarde();exit;}
@@ -112,10 +94,24 @@ if (isset($_FILES[&#39;i3GEOuploadshp&#39;][&#39;name&#39;]))
 	}
 	if(!file_exists($dirmap."/".$nomePrefixo.".shp"))
-	{echo "<p class='paragrafo' >Ocorreu algum problema no envio do arquivo ".$dirmap."/".$nomePrefixo;paraAguarde();exit;}
+	{echo "<p class='paragrafo' >Ocorreu algum problema no envio do arquivo ";paraAguarde();exit;}
+
+
+	$checkphp = fileContemString($dirmap."/".$nomePrefixo.".prj","<?");
+	if($checkphp == true){
+		exit;
+	}
+	$checkphp = fileContemString($dirmap."/".$nomePrefixo.".shx","<?");
+	if($checkphp == true){
+		exit;
+	}
+	$checkphp = fileContemString($dirmap."/".$nomePrefixo.".dbf","<?");
+	if($checkphp == true){
+		exit;
+	}
 	echo "<p class='paragrafo' >Arquivo enviado.</p>";
-	echo "<p class='paragrafo'>Nome: ".$dirmap."/".$nomePrefixo.".shp </p>";
+	echo "<p class='paragrafo'></p>";
 	//nesse caso o formulario de upload esta sendo executado de dentro de um mapa interativo, por isso o mapfile ja existe
 	if(isset($map_file)){
 		echo "<p class='paragrafo' >Adicionando tema...</p>";
@@ -124,8 +120,8 @@ if (isset($_FILES[&#39;i3GEOuploadshp&#39;][&#39;name&#39;]))
 		sleep(1);
 		$novolayer = ms_newLayerObj($mapa);
 		$novolayer->set("data",$dirmap."/".$nomePrefixo.".shp");
-		$novolayer->set("name",$nomePrefixo.".shp");
-		$novolayer->setmetadata("TEMA",$nomePrefixo.".shp");
+		$novolayer->set("name",$_FILES['i3GEOuploadshp']['name']);
+		$novolayer->setmetadata("TEMA",$_FILES['i3GEOuploadshp']['name']);
 		$novolayer->setmetadata("DOWNLOAD","SIM");
 		$sfileObj = ms_newShapefileObj($dirmap."/".$nomePrefixo.".shp", -1);
 		if(!isset($tipo) || $tipo == "")
@@ -199,7 +195,7 @@ if (isset($_FILES[&#39;i3GEOuploadshp&#39;][&#39;name&#39;]))
 		$data = $dirmap."/".$nomePrefixo.".shp";
 		include_once($locaplic."/admin/php/editormapfile.php");
 		echo "<b><p class='paragrafo' >Criado!!!<br>";
-		echo "Para editar clique: <a href='../../admin/html/editormapfile.html' target=_blank >".$nomePrefixo."</a>";
+		echo "Para editar clique: <a href='../../admin/html/editormapfile.html' target=_blank >editar</a>";
 		echo "<script>window.scrollTo(0,10000);i3GEO.util.insereCookie('I3GEOletraAdmin','".$nomePrefixo."');</script>";
 	}
 }
@@ -20,10 +20,14 @@ if (ob_get_level() == 0) ob_start();
 <body bgcolor="white" style="background-color:white;text-align:left;">
 <p>
 <?php
+$i3GEOuploaddbftipoarquivo = $_GET["i3GEOuploaddbftipoarquivo"];
+$i3GEOuploaddbfnomex = $_GET["i3GEOuploaddbfnomex"];
+$i3GEOuploaddbfnomey = $_GET["i3GEOuploaddbfnomey"];
 if (isset($_FILES['i3GEOuploaddbffile']['name']) && strlen(basename($_FILES['i3GEOuploaddbffile']['name'])) < 200 )
 {
-	$checkphp = fileContemString($_FILES['i3GEOuploaddbffile']['tmp_name'],"<?");
+	$checkphp = fileContemString($_FILES['i3GEOuploaddbffile']['tmp_name'],"<?php");
 	if($checkphp == true){
+		echo "erro";
 		exit;
 	}
@@ -40,7 +44,7 @@ if (isset($_FILES[&#39;i3GEOuploaddbffile&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;i3G
 	$ArquivoDest = $ArquivoDest . md5(uniqid(rand(), true));
-	if($i3GEOuploaddbftipoarquivo != "dbf"){
+	if($_GET["i3GEOuploaddbftipoarquivo"] != "dbf"){
 		$ArquivoDest = str_replace(".csv","",$ArquivoDest).".csv";
 	}
 	else{
@@ -75,7 +79,7 @@ if (isset($_FILES[&#39;i3GEOuploaddbffile&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;i3G
 				include_once(dirname(__FILE__)."/../../pacotes/parsecsv/parsecsv.lib.php");
 				$csv = new parseCSV();
 				$csv->delimiter = $separador;
-				$dados = $csv->parse($dirmap."/".$_FILES['i3GEOuploaddbffile']['name']);
+				$dados = $csv->parse($dirmap."/".$ArquivoDest);
 				$conta = 0;
 				$xy = array();
 				$colunas = array_keys($csv->data[0]);
@@ -111,9 +115,9 @@ if (isset($_FILES[&#39;i3GEOuploaddbffile&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;i3G
 				xbase_close($db);
 			}
 			else{
-				copy($dirmap."/".$_FILES['i3GEOuploaddbffile']['name'],$dirmap."/".$nome.".dbf");
+				copy($dirmap."/".$ArquivoDest,$dirmap."/".$nome.".dbf");
 			}
-			echo "<p class='paragrafo'>Arquivo enviado. Criando shape file...$nomeshp </p>";
+			echo "<p class='paragrafo'>Arquivo enviado. Criando shape file... </p>";
 			ob_flush();
 			flush();
 			sleep(1);
@@ -124,9 +128,6 @@ if (isset($_FILES[&#39;i3GEOuploaddbffile&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;i3G
 				paraAguarde();
 			}
 			$shapefileObj = ms_newShapefileObj($nomeshp,-2);
-			$i3GEOuploaddbftipoarquivo = $_GET["i3GEOuploaddbftipoarquivo"];
-			$i3GEOuploaddbfnomex = $_GET["i3GEOuploaddbfnomex"];
-			$i3GEOuploaddbfnomey = $_GET["i3GEOuploaddbfnomey"];
 			if($i3GEOuploaddbftipoarquivo != "dbf"){
 				foreach($csv->data as $d){
@@ -138,8 +139,8 @@ if (isset($_FILES[&#39;i3GEOuploaddbffile&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;i3G
 			else
 			{
 				require_once(dirname(__FILE__)."/../../pacotes/phpxbase/api_conversion.php");
-				echo "<p class='paragrafo'>Lendo arquivo ".$dirmap."/".$_FILES['i3GEOuploaddbffile']['name']."</p>";
-				$dbf = xbase_open($dirmap."/".$_FILES['i3GEOuploaddbffile']['name']);
+				echo "<p class='paragrafo'>Lendo arquivo </p>";
+				$dbf = xbase_open($dirmap."/".$nome.".dbf");
 				$records = xbase_numrecords($dbf);
 				echo "<p class='paragrafo'>Numero de pontos: $records</p>";
 				ob_flush();
@@ -157,8 +158,8 @@ if (isset($_FILES[&#39;i3GEOuploaddbffile&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;i3G
 			$shapefileObj->free();
 			$novolayer = ms_newLayerObj($mapa);
 			$novolayer->set("data",$nomeshp);
-			$novolayer->set("name",basename($nomeshp));
-			$novolayer->setmetadata("TEMA",basename($nomeshp));
+			$novolayer->set("name",$_FILES['i3GEOuploaddbffile']['name']);
+			$novolayer->setmetadata("TEMA",$_FILES['i3GEOuploaddbffile']['name']);
 			$novolayer->setmetadata("DOWNLOAD","SIM");
 			$novolayer->setmetadata("TEMALOCAL","SIM");
 			$novolayer->setmetadata("CLASSE","SIM");
@@ -23,8 +23,9 @@ if (ob_get_level() == 0) ob_start();
 <?php
 if (isset($_FILES['i3GEOuploadgpx']['name']) && strlen(basename($_FILES['i3GEOuploadgpx']['name'])) < 200 )
 {
-	$checkphp = fileContemString($_FILES['i3GEOuploadgpx']['tmp_name'],"<?");
+	$checkphp = fileContemString($_FILES['i3GEOuploadgpx']['tmp_name'],"<?php");
 	if($checkphp == true){
+		echo "erro";
 		exit;
 	}
 	//$ndir = dirname($filen);
@@ -49,10 +50,12 @@ if (isset($_FILES[&#39;i3GEOuploadgpx&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;i3GEOup
 	$Arquivo = $_FILES['i3GEOuploadgpx']['tmp_name'];
 	$status =  move_uploaded_file($Arquivo,$dirmap."/".$ArquivoDest);
-	if($status != 1)
-	{echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo gpx";paraAguarde();exit;}
-	if($status == 1)
-	{
+	if($status != 1){
+		echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo gpx";
+		paraAguarde();
+		exit;
+	}
+	if($status == 1){
 		echo "<p class='paragrafo' >Arquivo enviado. Adicionando tema...</p>";
 		ob_flush();
 		flush();
@@ -66,8 +69,8 @@ if (isset($_FILES[&#39;i3GEOuploadgpx&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;i3GEOup
 			else
 			{$novolayer->set("connectiontype",MS_OGR);}
 			$nome = str_replace(".","",$ArquivoDest);
-			$novolayer->set("name",$nome.$tipo);
-			$novolayer->setmetadata("TEMA",$ArquivoDest." ".$tipo);
+			$novolayer->set("name",$_FILES['i3GEOuploadgpx']['name'].$tipo);
+			$novolayer->setmetadata("TEMA",$_FILES['i3GEOuploadgpx']['name']." ".$tipo);
 			$novolayer->setmetadata("DOWNLOAD","SIM");
 			$novolayer->setmetadata("CLASSE","SIM");
 			$novolayer->setmetadata("TEXTO","NAO");
@@ -25,7 +25,7 @@ if (ob_get_level() == 0) ob_start();
 <?php
 if (isset($_FILES['i3GEOuploadkml']['name']) && strlen(basename($_FILES['i3GEOuploadkml']['name'])) < 200 )
 {
-	$checkphp = fileContemString($_FILES['i3GEOuploadkml']['tmp_name'],"<?");
+	$checkphp = fileContemString($_FILES['i3GEOuploadkml']['tmp_name'],"<?php");
 	if($checkphp == true){
 		exit;
 	}
@@ -70,7 +70,7 @@ if (isset($_FILES[&#39;i3GEOuploadkml&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;i3GEOup
 			$nome = str_replace(".","",$ArquivoDest);
 			$novolayer->set("name",$nome.$tipo);
-			$novolayer->setmetadata("TEMA",$ArquivoDest." ".$tipo);
+			$novolayer->setmetadata("TEMA",$_FILES['i3GEOuploadkml']['name']." ".$tipo);
 			$novolayer->setmetadata("DOWNLOAD","SIM");
 			$novolayer->setmetadata("CLASSE","SIM");
 			$novolayer->setmetadata("TEXTO","NAO");
@@ -20,7 +20,7 @@ if (ob_get_level() == 0) ob_start();
 <?php
 if (isset($_FILES['i3GEOuploadsimboloarq']['name']) && strlen(basename($_FILES['i3GEOuploadsimboloarq']['name'])) < 200){
-	$checkphp = fileContemString($_FILES['i3GEOuploadkml']['tmp_name'],"<?");
+	$checkphp = fileContemString($_FILES['i3GEOuploadsimboloarq']['tmp_name'],"<?");
 	if($checkphp == true){
 		exit;
 	}
@@ -65,15 +65,14 @@ if (isset($_FILES[&#39;i3GEOuploadsimboloarq&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;
 	}
 	if(file_exists($destino))
-	{echo "<p class='paragrafo' >J&aacute; existe um arquivo com o nome ".$destino;paraAguarde();exit;}
+	{echo "<p class='paragrafo' >J&aacute; existe um arquivo com o nome ";paraAguarde();exit;}
 	$status =  move_uploaded_file($Arquivo,$destino);
 	if($status != 1)
 	{echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo. Pode ser uma limita&ccedil;&atilde;o quanto ao tamanho do arquivo.";paraAguarde();exit;}
 	if(!file_exists($destino))
-	{echo "<p class='paragrafo' >Ocorreu algum problema no envio do arquivo ".$destino;paraAguarde();exit;}
+	{echo "<p class='paragrafo' >Ocorreu algum problema no envio do arquivo ";paraAguarde();exit;}
 	echo "<p class='paragrafo' >Arquivo enviado.</p>";
-	echo "<p class='paragrafo'>Nome: ".$destino." </p>";
 }
 else
 {
	@@ -43,7 +43,7 @@ if (isset($_FILES['i3GEOaplicarsld']['name']) && strlen(basename($_FILES['i3GEOa		@@ -43,7 +43,7 @@ if (isset($_FILES['i3GEOaplicarsld']['name']) && strlen(basename($_FILES['i3GEOa
43	//sobe arquivo	43	//sobe arquivo
44	$Arquivo = $_FILES['i3GEOaplicarsld']['tmp_name'];	44	$Arquivo = $_FILES['i3GEOaplicarsld']['tmp_name'];
45		45
46	- $checkphp = fileContemString($_FILES['i3GEOaplicarsld']['tmp_name'],"<?");	46	+ $checkphp = fileContemString($_FILES['i3GEOaplicarsld']['tmp_name'],"<?php");
47	if($checkphp == true){	47	if($checkphp == true){
48	exit;	48	exit;
49	}	49	}
	@@ -54,7 +54,7 @@ if (isset($_FILES['i3GEOaplicarsld']['name']) && strlen(basename($_FILES['i3GEOa		@@ -54,7 +54,7 @@ if (isset($_FILES['i3GEOaplicarsld']['name']) && strlen(basename($_FILES['i3GEOa
54	{echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo SLD";paraAguarde();exit;}	54	{echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo SLD";paraAguarde();exit;}
55	if($status == 1)	55	if($status == 1)
56	{	56	{
57	- echo "<p class='paragrafo' >Arquivo enviado. Aplicando SLD...$tema</p>";	57	+ echo "<p class='paragrafo' >Arquivo enviado. Aplicando SLD...</p>";
58	$layer = $mapa->getlayerbyname($tema);	58	$layer = $mapa->getlayerbyname($tema);
59	$arq = $dirmap."/".$ArquivoDest;	59	$arq = $dirmap."/".$ArquivoDest;
60	$abre = fopen($arq, "r");	60	$abre = fopen($arq, "r");
	@@ -36,7 +36,7 @@ if(isset($_FILES['i3GEOimportarwmc']['name']) && !($_POST["i3GEOimportarwmcurl"]		@@ -36,7 +36,7 @@ if(isset($_FILES['i3GEOimportarwmc']['name']) && !($_POST["i3GEOimportarwmcurl"]
36	verificaNome($ArquivoDest);	36	verificaNome($ArquivoDest);
37	//sobe arquivo	37	//sobe arquivo
38		38
39	- $checkphp = fileContemString($_FILES['i3GEOimportarwmc']['tmp_name'],"<?");	39	+ $checkphp = fileContemString($_FILES['i3GEOimportarwmc']['tmp_name'],"<?php");
40	if($checkphp == true){	40	if($checkphp == true){
41	exit;	41	exit;
42	}	42	}
	@@ -25,7 +25,7 @@ if (ob_get_level() == 0) ob_start();		@@ -25,7 +25,7 @@ if (ob_get_level() == 0) ob_start();
25	<?php	25	<?php
26	if (isset($_FILES['i3GEOuploadkml']['name']) && strlen(basename($_FILES['i3GEOuploadkml']['name'])) < 200 )	26	if (isset($_FILES['i3GEOuploadkml']['name']) && strlen(basename($_FILES['i3GEOuploadkml']['name'])) < 200 )
27	{	27	{
28	- $checkphp = fileContemString($_FILES['i3GEOuploadkml']['tmp_name'],"<?");	28	+ $checkphp = fileContemString($_FILES['i3GEOuploadkml']['tmp_name'],"<?php");
29	if($checkphp == true){	29	if($checkphp == true){
30	exit;	30	exit;
31	}	31	}
	@@ -70,7 +70,7 @@ if (isset($_FILES['i3GEOuploadkml']['name']) && strlen(basename($_FILES['i3GEOup		@@ -70,7 +70,7 @@ if (isset($_FILES['i3GEOuploadkml']['name']) && strlen(basename($_FILES['i3GEOup
70		70
71	$nome = str_replace(".","",$ArquivoDest);	71	$nome = str_replace(".","",$ArquivoDest);
72	$novolayer->set("name",$nome.$tipo);	72	$novolayer->set("name",$nome.$tipo);
73	- $novolayer->setmetadata("TEMA",$ArquivoDest." ".$tipo);	73	+ $novolayer->setmetadata("TEMA",$_FILES['i3GEOuploadkml']['name']." ".$tipo);
74	$novolayer->setmetadata("DOWNLOAD","SIM");	74	$novolayer->setmetadata("DOWNLOAD","SIM");
75	$novolayer->setmetadata("CLASSE","SIM");	75	$novolayer->setmetadata("CLASSE","SIM");
76	$novolayer->setmetadata("TEXTO","NAO");	76	$novolayer->setmetadata("TEXTO","NAO");