diff --git a/admin/admin.db b/admin/admin.db
index 5965dfe..e8e0f3b 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/ferramentas/aplicarsld/index.js b/ferramentas/aplicarsld/index.js
index 1688329..4a53e50 100644
--- a/ferramentas/aplicarsld/index.js
+++ b/ferramentas/aplicarsld/index.js
@@ -105,7 +105,7 @@ i3GEOF.aplicarsld = {
 	*/
 	html:function(){
 		var ins = '<form id=i3GEOaplicarsldf target="i3GEOaplicarsldiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/aplicarsld/upload.php?tema='+i3GEO.temaAtivo+'" method="post" ENCTYPE="multipart/form-data">' +
-		'<p class="paragrafo" >Arquivo SLD: <br><input class=digitar type="file" size=42 name="i3GEOaplicarsld" style="top:0px;left:0px;cursor:pointer;"></p>' +
+		'<p class="paragrafo" >Arquivo SLD: <br><input type="file" size=42 name="i3GEOaplicarsld" style="top:0px;left:0px;cursor:pointer;"></p>' +
 		'<br><p class="paragrafo" ><input id=i3GEOaplicarsldbotao1 type="button" value="Aplicar" size=12 name="submit">' +
 		'<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' +
 		'<input type="hidden" name="MAX_FILE_SIZE" value="100000">' +
diff --git a/ferramentas/carregamapa/index.js b/ferramentas/carregamapa/index.js
index c47217a..7cd4a4a 100644
--- a/ferramentas/carregamapa/index.js
+++ b/ferramentas/carregamapa/index.js
@@ -84,6 +84,7 @@ i3GEOF.carregaMapa = {
 	inicia: function(iddiv){
 		try{
 			$i(iddiv).innerHTML += i3GEOF.carregaMapa.html();
+			document.body.scrollTop = document.documentElement.scrollTop = 0;
 			new YAHOO.widget.Button(
 				"i3GEOcarregamapabotao1",
 				{onclick:{fn: i3GEOF.carregaMapa.submete}}
@@ -102,17 +103,16 @@ i3GEOF.carregaMapa = {
 	*/
 	html:function(){
 		var ins = '';
-		ins += '<p class="paragrafo" >Digite o nome do arquivo .map (n&atilde;o utilize espa&ccedil;o em branco ou caracteres acentuados) ou busque com o navegador de arquivos:';
-		ins += '<br><br>';
-		ins += '<form id=i3GEOcarregamapaf target="i3GEOcarregamaiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/carregamapa/upload.php" method="post" ENCTYPE="multipart/form-data">';
-		ins += '<p class="paragrafo" ><input id="i3GEOcarregamapafilemap" type="file" name="i3GEOcarregamapafilemap" size="22" style="top:0px;left:0px;cursor:pointer;">';
-		ins += '<br><br>';
-		ins += '<p class="paragrafo" ><input id=i3GEOcarregamapabotao1 type="button" value="Carregar arquivo" size=12 name="submit">';
-		ins += '<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >';
-		ins += '<input type="hidden" name="MAX_FILE_SIZE" value="10000">';
-		ins += '<input type=hidden id=i3GEOcarregamapanomearq name=i3GEOcarregamapanomearq value="" >';
-		ins += '</form>';
-		ins += '<br><iframe name=i3GEOcarregamaiframe width="98%" height="70px" style="text-align:left;border:1px solid gray;" ></iframe>';
+		ins += '<form id=i3GEOcarregamapaf target="i3GEOcarregamaiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/carregamapa/upload.php" method="post" ENCTYPE="multipart/form-data" >' +
+			'<p class="paragrafo" >Arquivo para upload:' +
+			'<br><br>' +
+			'<p class="paragrafo" ><input type="file" name="i3GEOcarregamapafilemap" size="22" style="top:0px;left:0px;cursor:pointer;">' +
+			'<br><br>' +
+			'<p class="paragrafo" ><input id=i3GEOcarregamapabotao1 type="button" value="Carregar arquivo" size=12 name="submit"><br>' +
+			'<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' +
+			'<input type="hidden" name="MAX_FILE_SIZE" value="100000" >' +
+			'</form>' +
+			'<br><iframe name=i3GEOcarregamaiframe width="98%" height="70px" style="text-align:left;border:1px solid gray;" ></iframe>';
 		return ins;
 	},
 	/*
@@ -144,8 +144,9 @@ i3GEOF.carregaMapa = {
 	Envia o arquivo para o servidor
 	*/
 	submete: function(){
+		if(i3GEOF.carregaMapa.aguarde.visibility==="visible")
+		{return;}
 		i3GEOF.carregaMapa.aguarde.visibility="visible";
-		$i("i3GEOcarregamapanomearq").value = $i("i3GEOcarregamapafilemap").value;
 		$i("i3GEOcarregamapaf").submit();
 	}
 };
diff --git a/ferramentas/carregamapa/upload.php b/ferramentas/carregamapa/upload.php
index d666629..e9e32ec 100644
--- a/ferramentas/carregamapa/upload.php
+++ b/ferramentas/carregamapa/upload.php
@@ -2,7 +2,6 @@
 require_once("../../classesphp/pega_variaveis.php");
 require_once("../../classesphp/funcoes_gerais.php");
 include_once ("../../classesphp/carrega_ext.php");
-error_reporting(E_ALL);
 session_name("i3GeoPHP");
 if (isset($g_sid))
 {session_id($g_sid);}
@@ -18,7 +17,6 @@ $postgis_mapa = $_SESSION["postgis_mapa"];
 </head>
 <body bgcolor="white" style="background-color:white">
 <p>
-
 <?php
 if (isset($_FILES['i3GEOcarregamapafilemap']['name']))
 {
diff --git a/ferramentas/importarwmc/index.js b/ferramentas/importarwmc/index.js
index ffc6d06..1e546ac 100644
--- a/ferramentas/importarwmc/index.js
+++ b/ferramentas/importarwmc/index.js
@@ -105,8 +105,8 @@ i3GEOF.importarwmc = {
 	*/
 	html:function(){
 		var ins = '<form id=i3GEOimportarwmcf target="i3GEOimportarwmciframe" action="'+i3GEO.configura.locaplic+'/ferramentas/importarwmc/upload.php" method="post" ENCTYPE="multipart/form-data">' +
-		'<p class="paragrafo" >Arquivo: <br><input class=digitar type="file" size=35 name="i3GEOimportarwmc" style="top:0px;left:0px;cursor:pointer;"></p>' +
-		'<p class="paragrafo" >Ou URL: <br><input class=digitar type="text" size=35 name="i3GEOimportarwmcurl" style="top:0px;left:0px;cursor:text;"></p>' +
+		'<p class="paragrafo" >Arquivo: <br><input type="file" size=35 name="i3GEOimportarwmc" style="top:0px;left:0px;cursor:pointer;"></p>' +
+		'<p class="paragrafo" >Ou URL: <br><input type="text" size=35 name="i3GEOimportarwmcurl" style="top:0px;left:0px;cursor:text;"></p>' +
 		'<br><p class="paragrafo" ><input id=i3GEOimportarwmcbotao1 type="button" value="Importar" size=12 name="submit">' +
 		'<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' +
 		'<input type="hidden" name="MAX_FILE_SIZE" value="100000">' +
diff --git a/ferramentas/upload/index.js b/ferramentas/upload/index.js
index 6fc2e88..811de0a 100644
--- a/ferramentas/upload/index.js
+++ b/ferramentas/upload/index.js
@@ -105,9 +105,9 @@ i3GEOF.upload = {
 	*/
 	html:function(){
 		var ins = '<form id=i3GEOuploadf target="i3GEOuploadiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/upload/upload.php" method="post" ENCTYPE="multipart/form-data">' +
-		'<p class="paragrafo" >shp: <br><input class=digitar type="file" size=22 name="i3GEOuploadshp" style="top:0px;left:0px;cursor:pointer;"></p>' +
-		'<p class="paragrafo" >shx: <br><input class=digitar type="file" size=22 name="i3GEOuploadshx" style="top:0px;left:0px;cursor:pointer;"></p>' +
-		'<p class="paragrafo" >dbf: <br><input class=digitar type="file" size=22 name="i3GEOuploaddbf" style="top:0px;left:0px;cursor:pointer;"></p>';
+		'<p class="paragrafo" >shp: <br><input type="file" size=22 name="i3GEOuploadshp" style="top:0px;left:0px;cursor:pointer;"></p>' +
+		'<p class="paragrafo" >shx: <br><input type="file" size=22 name="i3GEOuploadshx" style="top:0px;left:0px;cursor:pointer;"></p>' +
+		'<p class="paragrafo" >dbf: <br><input type="file" size=22 name="i3GEOuploaddbf" style="top:0px;left:0px;cursor:pointer;"></p>';
 		if(i3GEO.parametros.editor === "sim")
 		{ins += '<p class="paragrafo" >pasta no servidor onde os dados<br>ser&atilde;o armazenados (opcional):<br><input class=digitar type="text" size=45 name="dirDestino" style="top:0px;left:0px;cursor:pointer;"></p>';}
 		ins += '<p class="paragrafo" >Tipo de geometria: ' +
diff --git a/ferramentas/uploaddbf/index.js b/ferramentas/uploaddbf/index.js
index b2cb3a0..c14f210 100644
--- a/ferramentas/uploaddbf/index.js
+++ b/ferramentas/uploaddbf/index.js
@@ -115,7 +115,7 @@ i3GEOF.uploaddbf = {
 		'<p class="paragrafo" >nome da coluna x: <br><input class=digitar type="text" size=32 name="i3GEOuploaddbfnomex" style="top:0px;left:0px"></p>' +
 		'<p class="paragrafo" >nome da coluna y: <br><input class=digitar type="text" size=32 name="i3GEOuploaddbfnomey" style="top:0px;left:0px"></p>' +
 
-		'<p class="paragrafo" >arquivo: <br><input class=digitar type="file" size=22 name="i3GEOuploaddbffile" style="top:0px;left:0px;cursor:pointer;"></p>' +
+		'<p class="paragrafo" >arquivo: <br><input type="file" size=22 name="i3GEOuploaddbffile" style="top:0px;left:0px;cursor:pointer;"></p>' +
 		'<p class=paragrafo >Proje&ccedil;&atilde;o:</p>' +
 		'<div id=i3GEOuploaddbfListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' +
 		'<br><p class="paragrafo" ><input id=i3GEOuploaddbfbotao1 type="button" value="Criar camada" size=12 name="submit">' +
diff --git a/ferramentas/uploadgpx/index.js b/ferramentas/uploadgpx/index.js
index 79eaa19..49cc4aa 100644
--- a/ferramentas/uploadgpx/index.js
+++ b/ferramentas/uploadgpx/index.js
@@ -111,7 +111,7 @@ i3GEOF.uploadgpx = {
 	*/
 	html:function(){
 		var ins = '<form id=i3GEOuploadgpxf target="i3GEOuploadgpxiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/uploadgpx/upload.php" method="post" ENCTYPE="multipart/form-data">' +
-		'<p class="paragrafo" >Arquivo gpx: <br><input class=digitar type="file" size=22 name="i3GEOuploadgpx" style="top:0px;left:0px;cursor:pointer;"></p>' +
+		'<p class="paragrafo" >Arquivo gpx: <br><input type="file" size=22 name="i3GEOuploadgpx" style="top:0px;left:0px;cursor:pointer;"></p>' +
 		'<p class=paragrafo >Proje&ccedil;&atilde;o:</p>' +
 		'<div id=i3GEOuploadgpxListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' +
 		'<br><p class="paragrafo" ><input id=i3GEOuploadgpxbotao1 type="button" value="Criar camada" size=12 name="submit">' +
diff --git a/ferramentas/uploadkml/index.js b/ferramentas/uploadkml/index.js
index 72a9659..c592923 100644
--- a/ferramentas/uploadkml/index.js
+++ b/ferramentas/uploadkml/index.js
@@ -112,7 +112,7 @@ i3GEOF.uploadkml = {
 	html:function(){
 		var ins = '<form id=i3GEOuploadkmlf target="i3GEOuploadkmliframe" action="'+i3GEO.configura.locaplic+'/ferramentas/uploadkml/upload.php" method="post" ENCTYPE="multipart/form-data">' +
 		'<p class="paragrafo" style=color:red >N&atilde;o use arquivos ou nome de layer com espa&ccedil;os em branco ou acentua&ccedil;&atilde;o</p>' +
-		'<p class="paragrafo" >Arquivo kml: <br><input class=digitar type="file" size=22 name="i3GEOuploadkml" style="top:0px;left:0px;cursor:pointer;"></p>' +
+		'<p class="paragrafo" >Arquivo kml: <br><input type="file" size=22 name="i3GEOuploadkml" style="top:0px;left:0px;cursor:pointer;"></p>' +
 		'<p class=paragrafo >Nome do layer KML: <br><input type=text size=42 name=layerkml value=""/></p>' +
 		'<p class=paragrafo >Proje&ccedil;&atilde;o:</p>' +
 		'<div id=i3GEOuploadkmlListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' +
--
libgit2 0.21.2