diff --git a/admin/admin.db b/admin/admin.db
index f6f1149..8a42c8f 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin1/catalogo/mapfile/conexao/ogc/funcoes.php b/admin1/catalogo/mapfile/conexao/ogc/funcoes.php
index 088147d..f8ed9ff 100755
--- a/admin1/catalogo/mapfile/conexao/ogc/funcoes.php
+++ b/admin1/catalogo/mapfile/conexao/ogc/funcoes.php
@@ -53,9 +53,9 @@ function alterar($locaplic,$codigo,$connection,$connectiontype,$ows_srs,$ows_nam
 	$layer->set("type",$type);
 	$metas = array("_srs","_name","_server_version","_format","_auth_username","_auth_password","_auth_type","_connectiontimeout","_latlonboundingbox","_proxy_auth_type","_proxy_host","_proxy_port","_proxy_type","_proxy_username","_proxy_password","_sld_body","_sld_url","_style","_bgcolor","_transparent","_time","_tile");
 	foreach ($metas as $m){
-		$layer->setmetadata("wms".$m,"ows".$m);
-		$layer->setmetadata("wfs".$m,"ows".$m);
-		$layer->setmetadata("ows".$m,"ows".$m);
+		$layer->setmetadata("wms".$m,${"ows".$m});
+		$layer->setmetadata("wfs".$m,${"ows".$m});
+		$layer->setmetadata("ows".$m,${"ows".$m});
 	}
 	try {
 		$mapa->save ( $arq );
diff --git a/admin1/catalogo/mapfile/conexao/ogc/index.js b/admin1/catalogo/mapfile/conexao/ogc/index.js
index 58dc8a7..7fe2bed 100755
--- a/admin1/catalogo/mapfile/conexao/ogc/index.js
+++ b/admin1/catalogo/mapfile/conexao/ogc/index.js
@@ -69,7 +69,7 @@ i3GEOadmin.ogc = {
 			);
 		},
 		salvar: function(codigo,id_tema){
-			var parametros = $("#form-edicao-ogc").serialize();
+			var parametros = $("#form-edicao-conexaoogc").serialize();
 			i3GEOadmin.core.modalAguarde(true);
 			$.post(
 					"exec.php?funcao=alterar",
diff --git a/admin1/catalogo/mapfile/conexao/ogc/index.php b/admin1/catalogo/mapfile/conexao/ogc/index.php
index eb80f29..111a0e2 100755
--- a/admin1/catalogo/mapfile/conexao/ogc/index.php
+++ b/admin1/catalogo/mapfile/conexao/ogc/index.php
@@ -29,7 +29,7 @@ $id_tema = (int) $_GET ["id_tema"];
 				<span><?php echo $codigo; ?></span>
 			</a>
 			<a class="btn btn-default" style="pointer-events: none">
-				<span>Conex&atilde;o local</span>
+				<span>Conex&atilde;o externa</span>
 			</a>
 		</div>
 	</div>
diff --git a/admin1/catalogo/mapfile/index.js b/admin1/catalogo/mapfile/index.js
index 574d6ee..7b60266 100755
--- a/admin1/catalogo/mapfile/index.js
+++ b/admin1/catalogo/mapfile/index.js
@@ -243,7 +243,7 @@ Obt&eacute;m a lista
 		},
 		salvarDialogo: function(id){
 			i3GEOadmin.mapfile.parametrosSalvar = $("#form-edicao-" + id).serialize();
-			console.info(i3GEOadmin.mapfile.parametrosSalvar);
+			//console.info(i3GEOadmin.mapfile.parametrosSalvar);
 			var hash = {
 					"mensagem": i3GEOadmin.mapfile.dicionario.confirma,
 					"onBotao1": "i3GEOadmin.mapfile.salvar('"+id+"')",
diff --git a/css/i3geo7.css.php b/css/i3geo7.css.php
old mode 100755
new mode 100644
index e299447..e299447
--- a/css/i3geo7.css.php
+++ b/css/i3geo7.css.php
diff --git a/ferramentas/filtro/index.js b/ferramentas/filtro/index.js
index 3bdeb23..2d6b105 100755
--- a/ferramentas/filtro/index.js
+++ b/ferramentas/filtro/index.js
@@ -41,7 +41,10 @@ i3GEOF.filtro = {
 		dicionario["idRetorno"] = idRetorno;
 		if(modoCalculadora == true){
 			dicionario["escondeGuias"] = "hidden";
+		} else {
+			dicionario["escondeGuias"] = "";
 		}
+		i3GEOF.filtro.dicionario["escondeGuias"] = dicionario["escondeGuias"];
 		return dicionario;
 	},
 	/*
@@ -224,7 +227,7 @@ i3GEOF.filtro = {
 		ntr.id = "linhaFiltro"+i3GEOF.filtro.CONTADOR;
 		temp = Mustache.render(
 				"{{#data}}" + i3GEOF.filtro.MUSTACHELINHAFILTRO + "{{/data}}",
-				{"data":{"comboTemas": i3GEOF.filtro.comboTemas,"contador": i3GEOF.filtro.CONTADOR}}
+				{"data":{"comboTemas": i3GEOF.filtro.comboTemas,"contador": i3GEOF.filtro.CONTADOR, "escondeGuias": i3GEOF.filtro.dicionario["escondeGuias"]}}
 		);
 		$(ntr).html(temp);
 		tabela = $i("i3GEOfiltroparametros");
diff --git a/ferramentas/filtro/template_linhafiltro_mst.html b/ferramentas/filtro/template_linhafiltro_mst.html
index 99d6eff..e3c83a2 100755
--- a/ferramentas/filtro/template_linhafiltro_mst.html
+++ b/ferramentas/filtro/template_linhafiltro_mst.html
@@ -1,10 +1,10 @@
 <td>
-	<button onclick='i3GEOF.filtro.adicionaLinhaFiltro()' class="btn btn-xs" style="margin: 2px; padding: 2px;">
+	<button onclick='i3GEOF.filtro.adicionaLinhaFiltro()' class="btn btn-xs {{{escondeGuias}}}" style="margin: 2px; padding: 2px;">
 		<span class="material-icons">add</span>
 	</button>
 </td>
 <td>
-	<button onclick='i3GEOF.filtro.removeLinha(this,{{{contador}}})' class="btn btn-xs" style="margin: 2px; padding: 2px;">
+	<button onclick='i3GEOF.filtro.removeLinha(this,{{{contador}}})' class="btn btn-xs {{{escondeGuias}}}" style="margin: 2px; padding: 2px;">
 		<span class="material-icons">clear</span>
 	</button>
 </td>
@@ -33,12 +33,12 @@
 	</div>
 </td>
 <td>
-	<button onclick='i3GEOF.filtro.listaValores({{{contador}}});' class="btn btn-xs" style="margin: 2px; padding: 2px;">
+	<button onclick='i3GEOF.filtro.listaValores({{{contador}}});' class="btn btn-xs {{{escondeGuias}}}" style="margin: 2px; padding: 2px;">
 		<span class="material-icons">build</span>
 	</button>
 </td>
 <td>
-	<div class='form-group condensed' style="padding-left:10px;">
+	<div class='form-group condensed {{{escondeGuias}}}' style="padding-left:10px;">
 		<select name="conector" class="form-control" >
 			<option value="and">and</option>
 			<option value="or">or</option>
diff --git a/ferramentas/legenda/templateLista_mst.html b/ferramentas/legenda/templateLista_mst.html
index 030f009..a03ce47 100755
--- a/ferramentas/legenda/templateLista_mst.html
+++ b/ferramentas/legenda/templateLista_mst.html
@@ -1,7 +1,7 @@
 <!-- para o caso de vetores -->
 <div class="{{{hidden2}}}">
 	<button onclick="i3GEOF.legenda.mudaLegenda()" class='btn btn-primary btn-sm btn-raised'>{{{aplicaAlteracao}}}</button>
-	<button onclick="i3GEOF.legenda.adicionaClasse()" title='{{{adicionaNovaClasse}}}' class='btn btn-primary btn-sm btn-raised'>{{{adicionaClasse}}}</button>
+	<button id="botaoAdicionaClasse" onclick="i3GEOF.legenda.adicionaClasse()" title='{{{adicionaNovaClasse}}}' class='btn btn-primary btn-sm btn-raised'>{{{adicionaClasse}}}</button>
 	<h5 class="alert alert-info">{{{clicaSimbolo}}}</h5>
 	<table id="i3GEOlegendalegenda" class="lista8" style="background-color: #89afd4;">
 		<tr>
@@ -44,13 +44,13 @@
 			</td>
 			<td style="padding: 5px;">
 				<div class='form-group label-fixed condensed'>
-					<input id="i3GEOlegendaid_{{{id}}}" style="width: 200px;" value="{{{nome}}}" name="nome" title="{{{novoNome}}}" tabindex="0" class="form-control input-lg" type='text' />
+					<input onchange="$('#botaoAdicionaClasse').prop('disabled', true);" id="i3GEOlegendaid_{{{id}}}" style="width: 200px;" value="{{{nome}}}" name="nome" title="{{{novoNome}}}" tabindex="0" class="form-control input-lg" type='text' />
 				</div>
 			</td>
 			<td style="padding: 5px;">
 				<div class='form-group label-fixed condensed'>
 					<!-- id necessario para o construtor de filtro -->
-					<input id="i3GEOlegendaid_exp{{{id}}}" style="width: 200px;" value='{{{exp}}}' name="expressao" tabindex="0" class="form-control input-lg" type='text' />
+					<input onchange="$('#botaoAdicionaClasse').prop('disabled', true);" id="i3GEOlegendaid_exp{{{id}}}" style="width: 200px;" value='{{{exp}}}' name="expressao" tabindex="0" class="form-control input-lg" type='text' />
 				</div>
 			</td>
 			<td>
diff --git a/ferramentas/salvamapfile/index.js b/ferramentas/salvamapfile/index.js
index 2f97da6..630155e 100755
--- a/ferramentas/salvamapfile/index.js
+++ b/ferramentas/salvamapfile/index.js
@@ -102,7 +102,7 @@ i3GEOF.salvamapfile = {
 					}
 					var ins = "<p class=paragrafo >"+$trad('ajuda',i3GEOF.salvamapfile.dicionario) +
 					'<span id="i3GEOsalvamapconcluido" style=display:none;color:red  > '+$trad('concluido',i3GEOF.salvamapfile.dicionario)+'</span></p>' +
-					'<br><p class=paragrafo ><input size=20 id=i3GEOsalvamapfilebotao1 type=button value="'+$trad('salva',i3GEOF.salvamapfile.dicionario)+'"  />&nbsp;&nbsp;<input size=20 id=i3GEOsalvamapfilebotao2 type=button value="'+$trad('testa',i3GEOF.salvamapfile.dicionario)+'"  />';
+					'<br><p class=paragrafo ><input size=20 id=i3GEOsalvamapfilebotao1 type=button value="'+$trad('salva',i3GEOF.salvamapfile.dicionario)+'"  />';
 					$i(iddiv).innerHTML = ins;
 					new YAHOO.widget.Button(
 						"i3GEOsalvamapfilebotao1",
diff --git a/js/i3geo_tudo_compacto7.js.php b/js/i3geo_tudo_compacto7.js.php
old mode 100755
new mode 100644
index f0d5593..f0d5593
--- a/js/i3geo_tudo_compacto7.js.php
+++ b/js/i3geo_tudo_compacto7.js.php
--
libgit2 0.21.2