From d2b06052fb617ae9f0e5b91bc6d34985238f2370 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Tue, 9 Jan 2018 11:42:58 -0200
Subject: [PATCH] Correção na função de substituição de chaves da ferramenta parametrossql. Ocorriam erros quando campos de tipos diferentes não seguiam a mesma ordem das chaves

---
 ferramentas/editorgm/editorgm_compacto.js     |  0
 ferramentas/editorol/editorol_compacto.js     |  0
 ferramentas/parametrossql/exec.php            | 41 +++++++++++++++++++++++++++++------------
 js/compactados/ajuda_compacto.js              |  0
 js/compactados/analise_compacto.js            |  0
 js/compactados/arvoredecamadas_compacto.js    |  0
 js/compactados/arvoredetemas_compacto.js      |  0
 js/compactados/base64_compacto.js             |  0
 js/compactados/busca_compacto.js              |  0
 js/compactados/caixaDeFerramentas_compacto.js |  0
 js/compactados/calculo_compacto.js            |  0
 js/compactados/catalogoDir_compacto.js        |  0
 js/compactados/catalogoEstrelas_compacto.js   |  0
 js/compactados/catalogoInde_compacto.js       |  0
 js/compactados/catalogoMapas_compacto.js      |  0
 js/compactados/catalogoMenus_compacto.js      |  0
 js/compactados/catalogoMetaestat_compacto.js  |  0
 js/compactados/catalogoOgc_compacto.js        |  0
 js/compactados/catalogoRegioes_compacto.js    |  0
 js/compactados/catalogoSistemas_compacto.js   |  0
 js/compactados/configura_compacto.js          |  0
 js/compactados/coordenadas_compacto.js        |  0
 js/compactados/desenho_compacto.js            |  0
 js/compactados/dicionario_ajuda_compacto.js   |  0
 js/compactados/dicionario_compacto.js         |  0
 js/compactados/editor_compacto.js             |  0
 js/compactados/eventos_compacto.js            |  0
 js/compactados/guias_compacto.js              |  0
 js/compactados/idioma_compacto.js             |  0
 js/compactados/ini_i3geo_compacto.js          |  0
 js/compactados/interface_compacto.js          |  0
 js/compactados/janela_compacto.js             |  0
 js/compactados/legenda_compacto.js            |  0
 js/compactados/login_compacto.js              |  0
 js/compactados/mapa_compacto.js               |  0
 js/compactados/maparef_compacto.js            |  0
 js/compactados/marcador_compacto.js           |  0
 js/compactados/material.js                    |  0
 js/compactados/mustache.js                    |  0
 js/compactados/navega_compacto.js             |  0
 js/compactados/php_compacto.js                |  0
 js/compactados/plugini3geo_compacto.js        |  0
 js/compactados/proj4js.js                     |  0
 js/compactados/social_compacto.js             |  0
 js/compactados/tema_compacto.js               |  0
 js/compactados/util_compacto.js               |  0
 js/compactados/wicket.js                      |  0
 js/i3geo_tudo_compacto7.js.php                |  0
 48 files changed, 29 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 ferramentas/editorgm/editorgm_compacto.js
 mode change 100644 => 100755 ferramentas/editorol/editorol_compacto.js
 mode change 100644 => 100755 js/compactados/ajuda_compacto.js
 mode change 100644 => 100755 js/compactados/analise_compacto.js
 mode change 100644 => 100755 js/compactados/arvoredecamadas_compacto.js
 mode change 100644 => 100755 js/compactados/arvoredetemas_compacto.js
 mode change 100644 => 100755 js/compactados/base64_compacto.js
 mode change 100644 => 100755 js/compactados/busca_compacto.js
 mode change 100644 => 100755 js/compactados/caixaDeFerramentas_compacto.js
 mode change 100644 => 100755 js/compactados/calculo_compacto.js
 mode change 100644 => 100755 js/compactados/catalogoDir_compacto.js
 mode change 100644 => 100755 js/compactados/catalogoEstrelas_compacto.js
 mode change 100644 => 100755 js/compactados/catalogoInde_compacto.js
 mode change 100644 => 100755 js/compactados/catalogoMapas_compacto.js
 mode change 100644 => 100755 js/compactados/catalogoMenus_compacto.js
 mode change 100644 => 100755 js/compactados/catalogoMetaestat_compacto.js
 mode change 100644 => 100755 js/compactados/catalogoOgc_compacto.js
 mode change 100644 => 100755 js/compactados/catalogoRegioes_compacto.js
 mode change 100644 => 100755 js/compactados/catalogoSistemas_compacto.js
 mode change 100644 => 100755 js/compactados/configura_compacto.js
 mode change 100644 => 100755 js/compactados/coordenadas_compacto.js
 mode change 100644 => 100755 js/compactados/desenho_compacto.js
 mode change 100644 => 100755 js/compactados/dicionario_ajuda_compacto.js
 mode change 100644 => 100755 js/compactados/dicionario_compacto.js
 mode change 100644 => 100755 js/compactados/editor_compacto.js
 mode change 100644 => 100755 js/compactados/eventos_compacto.js
 mode change 100644 => 100755 js/compactados/guias_compacto.js
 mode change 100644 => 100755 js/compactados/idioma_compacto.js
 mode change 100644 => 100755 js/compactados/ini_i3geo_compacto.js
 mode change 100644 => 100755 js/compactados/interface_compacto.js
 mode change 100644 => 100755 js/compactados/janela_compacto.js
 mode change 100644 => 100755 js/compactados/legenda_compacto.js
 mode change 100644 => 100755 js/compactados/login_compacto.js
 mode change 100644 => 100755 js/compactados/mapa_compacto.js
 mode change 100644 => 100755 js/compactados/maparef_compacto.js
 mode change 100644 => 100755 js/compactados/marcador_compacto.js
 mode change 100644 => 100755 js/compactados/material.js
 mode change 100644 => 100755 js/compactados/mustache.js
 mode change 100644 => 100755 js/compactados/navega_compacto.js
 mode change 100644 => 100755 js/compactados/php_compacto.js
 mode change 100644 => 100755 js/compactados/plugini3geo_compacto.js
 mode change 100644 => 100755 js/compactados/proj4js.js
 mode change 100644 => 100755 js/compactados/social_compacto.js
 mode change 100644 => 100755 js/compactados/tema_compacto.js
 mode change 100644 => 100755 js/compactados/util_compacto.js
 mode change 100644 => 100755 js/compactados/wicket.js
 mode change 100644 => 100755 js/i3geo_tudo_compacto7.js.php

diff --git a/ferramentas/editorgm/editorgm_compacto.js b/ferramentas/editorgm/editorgm_compacto.js
old mode 100644
new mode 100755
index e69de29..e69de29
--- a/ferramentas/editorgm/editorgm_compacto.js
+++ b/ferramentas/editorgm/editorgm_compacto.js
diff --git a/ferramentas/editorol/editorol_compacto.js b/ferramentas/editorol/editorol_compacto.js
old mode 100644
new mode 100755
index 1cc5cb2..1cc5cb2
--- a/ferramentas/editorol/editorol_compacto.js
+++ b/ferramentas/editorol/editorol_compacto.js
diff --git a/ferramentas/parametrossql/exec.php b/ferramentas/parametrossql/exec.php
index a8ba276..76407f5 100755
--- a/ferramentas/parametrossql/exec.php
+++ b/ferramentas/parametrossql/exec.php
@@ -57,7 +57,24 @@ switch (strtoupper($funcao))
 		*/
 	case "APLICAR":
 		$valores = $_GET["valores"];
+		$valores = str_ireplace(array(" and ", " or ", "select","from","where","update","delete","insert","--","drop",";"),"",$valores);
+		$valores = explode(",",$valores);
 		$titulos = $_GET["titulos"];
+		$titulos = explode(",",$titulos);
+		$chaves = $_GET["chaves"];
+		$chaves = str_ireplace(array(" and ", " or ", "select","from","where","update","delete","insert","--","drop",";"),"",$chaves);
+		$chaves = explode(",",$chaves);
+		if(count($chaves) <> count($valores)){
+			echo "erro";
+			exit;
+		}
+		//cria um array cuja key e a chave
+		$dados = array();
+		$n = count($chaves);
+		for($i = 0; $i < $n; $i++){
+			$dados[$chaves[$i]] = array("valor"=>$valores[$i],"titulo"=>$titulos[$i]);
+		}
+		
 		$map = ms_newMapObj($map_file);
 		//pega o layer
 		$layer = $map->getlayerbyname($tema);
@@ -75,6 +92,7 @@ switch (strtoupper($funcao))
 					$retorno = "erro";
 				}
 				if($c != ""){
+					//pega as chaves originais do mapfile
 					$cs = json_decode(utf8_encode($c),true);
 					$cs = $cs["parametros"];
 					$chaves = array();
@@ -82,20 +100,19 @@ switch (strtoupper($funcao))
 						$chaves[] = $c["chave"];
 					}
 					$chaves = implode(",",$chaves);
+					$chaves = str_ireplace(array(" and ", " or ", "select","from","where","update","delete","insert","--","drop",";"),"",$chaves);
+					$chaves = explode(",",$chaves);
 					$filtro = $layer1->getFilterString();
-					if(!empty($valores)){
-						$chaves = str_ireplace(array(" and ", " or ", "select","from","where","update","delete","insert","--","drop",";"),"",$chaves);
-						$chaves = explode(",",$chaves);
-						$valores = str_ireplace(array(" and ", " or ", "select","from","where","update","delete","insert","--","drop",";"),"",$valores);
-						$valores = explode(",",strip_tags($valores));
-						$n = count($chaves);
-						for($i = 0; $i < $n; $i++){
-							if($chaves[$i] != ""){
-								$v = $valores[$i];
-								$data = str_replace($chaves[$i],$v,$data);
+					$titulofim = array();
+					if(!empty($dados)){
+						foreach($chaves as $k){
+							if($k != ""){
+								$v = $dados[$k]["valor"];
+								$data = str_replace($k,$v,$data);
 								if($filtro != ""){
-									$filtro = str_replace($chaves[$i],$v,$filtro);
+									$filtro = str_replace($k,$v,$filtro);
 								}
+								$titulofim[] = $dados[$k]["titulo"]." ".$v;
 							}
 						}
 						if($filtro != ""){
@@ -107,7 +124,7 @@ switch (strtoupper($funcao))
 					   $layer->set("status",MS_DEFAULT);
 					}
 					$layer->setmetadata("PLUGINI3GEO",'{"plugin":"parametrossql","ativo":"sim"}');
-					$layer->setmetadata("TEMA",$layer1->getmetadata("TEMA")." - ".$titulos);
+					$layer->setmetadata("TEMA",$layer1->getmetadata("TEMA")." - ".implode(". ",$titulofim));
 
 					//$layer->set("name","plugin".nomeRandomico());
 					$layer->setmetadata("nomeoriginal",$layer1->name);
diff --git a/js/compactados/ajuda_compacto.js b/js/compactados/ajuda_compacto.js
old mode 100644
new mode 100755
index 8e4086f..8e4086f
--- a/js/compactados/ajuda_compacto.js
+++ b/js/compactados/ajuda_compacto.js
diff --git a/js/compactados/analise_compacto.js b/js/compactados/analise_compacto.js
old mode 100644
new mode 100755
index 91868c6..91868c6
--- a/js/compactados/analise_compacto.js
+++ b/js/compactados/analise_compacto.js
diff --git a/js/compactados/arvoredecamadas_compacto.js b/js/compactados/arvoredecamadas_compacto.js
old mode 100644
new mode 100755
index 0f3bb10..0f3bb10
--- a/js/compactados/arvoredecamadas_compacto.js
+++ b/js/compactados/arvoredecamadas_compacto.js
diff --git a/js/compactados/arvoredetemas_compacto.js b/js/compactados/arvoredetemas_compacto.js
old mode 100644
new mode 100755
index 192e851..192e851
--- a/js/compactados/arvoredetemas_compacto.js
+++ b/js/compactados/arvoredetemas_compacto.js
diff --git a/js/compactados/base64_compacto.js b/js/compactados/base64_compacto.js
old mode 100644
new mode 100755
index 9ff1f1a..9ff1f1a
--- a/js/compactados/base64_compacto.js
+++ b/js/compactados/base64_compacto.js
diff --git a/js/compactados/busca_compacto.js b/js/compactados/busca_compacto.js
old mode 100644
new mode 100755
index 380c4a5..380c4a5
--- a/js/compactados/busca_compacto.js
+++ b/js/compactados/busca_compacto.js
diff --git a/js/compactados/caixaDeFerramentas_compacto.js b/js/compactados/caixaDeFerramentas_compacto.js
old mode 100644
new mode 100755
index 05d4cd7..05d4cd7
--- a/js/compactados/caixaDeFerramentas_compacto.js
+++ b/js/compactados/caixaDeFerramentas_compacto.js
diff --git a/js/compactados/calculo_compacto.js b/js/compactados/calculo_compacto.js
old mode 100644
new mode 100755
index 32b90de..32b90de
--- a/js/compactados/calculo_compacto.js
+++ b/js/compactados/calculo_compacto.js
diff --git a/js/compactados/catalogoDir_compacto.js b/js/compactados/catalogoDir_compacto.js
old mode 100644
new mode 100755
index f414552..f414552
--- a/js/compactados/catalogoDir_compacto.js
+++ b/js/compactados/catalogoDir_compacto.js
diff --git a/js/compactados/catalogoEstrelas_compacto.js b/js/compactados/catalogoEstrelas_compacto.js
old mode 100644
new mode 100755
index 7d8e059..7d8e059
--- a/js/compactados/catalogoEstrelas_compacto.js
+++ b/js/compactados/catalogoEstrelas_compacto.js
diff --git a/js/compactados/catalogoInde_compacto.js b/js/compactados/catalogoInde_compacto.js
old mode 100644
new mode 100755
index 6bafaef..6bafaef
--- a/js/compactados/catalogoInde_compacto.js
+++ b/js/compactados/catalogoInde_compacto.js
diff --git a/js/compactados/catalogoMapas_compacto.js b/js/compactados/catalogoMapas_compacto.js
old mode 100644
new mode 100755
index 670e4ce..670e4ce
--- a/js/compactados/catalogoMapas_compacto.js
+++ b/js/compactados/catalogoMapas_compacto.js
diff --git a/js/compactados/catalogoMenus_compacto.js b/js/compactados/catalogoMenus_compacto.js
old mode 100644
new mode 100755
index f3d6155..f3d6155
--- a/js/compactados/catalogoMenus_compacto.js
+++ b/js/compactados/catalogoMenus_compacto.js
diff --git a/js/compactados/catalogoMetaestat_compacto.js b/js/compactados/catalogoMetaestat_compacto.js
old mode 100644
new mode 100755
index 2b6cb74..2b6cb74
--- a/js/compactados/catalogoMetaestat_compacto.js
+++ b/js/compactados/catalogoMetaestat_compacto.js
diff --git a/js/compactados/catalogoOgc_compacto.js b/js/compactados/catalogoOgc_compacto.js
old mode 100644
new mode 100755
index ffce5a9..ffce5a9
--- a/js/compactados/catalogoOgc_compacto.js
+++ b/js/compactados/catalogoOgc_compacto.js
diff --git a/js/compactados/catalogoRegioes_compacto.js b/js/compactados/catalogoRegioes_compacto.js
old mode 100644
new mode 100755
index 404db8e..404db8e
--- a/js/compactados/catalogoRegioes_compacto.js
+++ b/js/compactados/catalogoRegioes_compacto.js
diff --git a/js/compactados/catalogoSistemas_compacto.js b/js/compactados/catalogoSistemas_compacto.js
old mode 100644
new mode 100755
index 9245cfc..9245cfc
--- a/js/compactados/catalogoSistemas_compacto.js
+++ b/js/compactados/catalogoSistemas_compacto.js
diff --git a/js/compactados/configura_compacto.js b/js/compactados/configura_compacto.js
old mode 100644
new mode 100755
index e3d6fe5..e3d6fe5
--- a/js/compactados/configura_compacto.js
+++ b/js/compactados/configura_compacto.js
diff --git a/js/compactados/coordenadas_compacto.js b/js/compactados/coordenadas_compacto.js
old mode 100644
new mode 100755
index 404bf09..404bf09
--- a/js/compactados/coordenadas_compacto.js
+++ b/js/compactados/coordenadas_compacto.js
diff --git a/js/compactados/desenho_compacto.js b/js/compactados/desenho_compacto.js
old mode 100644
new mode 100755
index 0906ae5..0906ae5
--- a/js/compactados/desenho_compacto.js
+++ b/js/compactados/desenho_compacto.js
diff --git a/js/compactados/dicionario_ajuda_compacto.js b/js/compactados/dicionario_ajuda_compacto.js
old mode 100644
new mode 100755
index e69de29..e69de29
--- a/js/compactados/dicionario_ajuda_compacto.js
+++ b/js/compactados/dicionario_ajuda_compacto.js
diff --git a/js/compactados/dicionario_compacto.js b/js/compactados/dicionario_compacto.js
old mode 100644
new mode 100755
index 270f8c4..270f8c4
--- a/js/compactados/dicionario_compacto.js
+++ b/js/compactados/dicionario_compacto.js
diff --git a/js/compactados/editor_compacto.js b/js/compactados/editor_compacto.js
old mode 100644
new mode 100755
index adf656f..adf656f
--- a/js/compactados/editor_compacto.js
+++ b/js/compactados/editor_compacto.js
diff --git a/js/compactados/eventos_compacto.js b/js/compactados/eventos_compacto.js
old mode 100644
new mode 100755
index 9131b8b..9131b8b
--- a/js/compactados/eventos_compacto.js
+++ b/js/compactados/eventos_compacto.js
diff --git a/js/compactados/guias_compacto.js b/js/compactados/guias_compacto.js
old mode 100644
new mode 100755
index 42d21d0..42d21d0
--- a/js/compactados/guias_compacto.js
+++ b/js/compactados/guias_compacto.js
diff --git a/js/compactados/idioma_compacto.js b/js/compactados/idioma_compacto.js
old mode 100644
new mode 100755
index 50f94a7..50f94a7
--- a/js/compactados/idioma_compacto.js
+++ b/js/compactados/idioma_compacto.js
diff --git a/js/compactados/ini_i3geo_compacto.js b/js/compactados/ini_i3geo_compacto.js
old mode 100644
new mode 100755
index c00af43..c00af43
--- a/js/compactados/ini_i3geo_compacto.js
+++ b/js/compactados/ini_i3geo_compacto.js
diff --git a/js/compactados/interface_compacto.js b/js/compactados/interface_compacto.js
old mode 100644
new mode 100755
index d91d7ca..d91d7ca
--- a/js/compactados/interface_compacto.js
+++ b/js/compactados/interface_compacto.js
diff --git a/js/compactados/janela_compacto.js b/js/compactados/janela_compacto.js
old mode 100644
new mode 100755
index 6235310..6235310
--- a/js/compactados/janela_compacto.js
+++ b/js/compactados/janela_compacto.js
diff --git a/js/compactados/legenda_compacto.js b/js/compactados/legenda_compacto.js
old mode 100644
new mode 100755
index 50fb45f..50fb45f
--- a/js/compactados/legenda_compacto.js
+++ b/js/compactados/legenda_compacto.js
diff --git a/js/compactados/login_compacto.js b/js/compactados/login_compacto.js
old mode 100644
new mode 100755
index 4a18b82..4a18b82
--- a/js/compactados/login_compacto.js
+++ b/js/compactados/login_compacto.js
diff --git a/js/compactados/mapa_compacto.js b/js/compactados/mapa_compacto.js
old mode 100644
new mode 100755
index 726a181..726a181
--- a/js/compactados/mapa_compacto.js
+++ b/js/compactados/mapa_compacto.js
diff --git a/js/compactados/maparef_compacto.js b/js/compactados/maparef_compacto.js
old mode 100644
new mode 100755
index 6da2a2a..6da2a2a
--- a/js/compactados/maparef_compacto.js
+++ b/js/compactados/maparef_compacto.js
diff --git a/js/compactados/marcador_compacto.js b/js/compactados/marcador_compacto.js
old mode 100644
new mode 100755
index 06123bb..06123bb
--- a/js/compactados/marcador_compacto.js
+++ b/js/compactados/marcador_compacto.js
diff --git a/js/compactados/material.js b/js/compactados/material.js
old mode 100644
new mode 100755
index 660c8fd..660c8fd
--- a/js/compactados/material.js
+++ b/js/compactados/material.js
diff --git a/js/compactados/mustache.js b/js/compactados/mustache.js
old mode 100644
new mode 100755
index 7473a81..7473a81
--- a/js/compactados/mustache.js
+++ b/js/compactados/mustache.js
diff --git a/js/compactados/navega_compacto.js b/js/compactados/navega_compacto.js
old mode 100644
new mode 100755
index 222b2f9..222b2f9
--- a/js/compactados/navega_compacto.js
+++ b/js/compactados/navega_compacto.js
diff --git a/js/compactados/php_compacto.js b/js/compactados/php_compacto.js
old mode 100644
new mode 100755
index 35dfbd6..35dfbd6
--- a/js/compactados/php_compacto.js
+++ b/js/compactados/php_compacto.js
diff --git a/js/compactados/plugini3geo_compacto.js b/js/compactados/plugini3geo_compacto.js
old mode 100644
new mode 100755
index 5142488..5142488
--- a/js/compactados/plugini3geo_compacto.js
+++ b/js/compactados/plugini3geo_compacto.js
diff --git a/js/compactados/proj4js.js b/js/compactados/proj4js.js
old mode 100644
new mode 100755
index 9bdc4ce..9bdc4ce
--- a/js/compactados/proj4js.js
+++ b/js/compactados/proj4js.js
diff --git a/js/compactados/social_compacto.js b/js/compactados/social_compacto.js
old mode 100644
new mode 100755
index 8aa672a..8aa672a
--- a/js/compactados/social_compacto.js
+++ b/js/compactados/social_compacto.js
diff --git a/js/compactados/tema_compacto.js b/js/compactados/tema_compacto.js
old mode 100644
new mode 100755
index 788606d..788606d
--- a/js/compactados/tema_compacto.js
+++ b/js/compactados/tema_compacto.js
diff --git a/js/compactados/util_compacto.js b/js/compactados/util_compacto.js
old mode 100644
new mode 100755
index 5b317b6..5b317b6
--- a/js/compactados/util_compacto.js
+++ b/js/compactados/util_compacto.js
diff --git a/js/compactados/wicket.js b/js/compactados/wicket.js
old mode 100644
new mode 100755
index e0e5f3b..e0e5f3b
--- a/js/compactados/wicket.js
+++ b/js/compactados/wicket.js
diff --git a/js/i3geo_tudo_compacto7.js.php b/js/i3geo_tudo_compacto7.js.php
old mode 100644
new mode 100755
index 9392d53..9392d53
--- a/js/i3geo_tudo_compacto7.js.php
+++ b/js/i3geo_tudo_compacto7.js.php
--
libgit2 0.21.2