diff --git a/classesphp/classe_atributos.php b/classesphp/classe_atributos.php index dfe264a..d5c99f7 100755 --- a/classesphp/classe_atributos.php +++ b/classesphp/classe_atributos.php @@ -2151,6 +2151,7 @@ class Atributos $ptimg = xy2imagem($map_file,array($x,$y),$mapa); //$formatoinfo = "MIME"; $formatosinfo = $layer->getmetadata("formatosinfo"); + $formatosinfohtml = false; if ($formatosinfo != ""){ $formatosinfo = explode(",",$formatosinfo); if ($formatosinfo[0] != ""){ @@ -2160,6 +2161,9 @@ class Atributos if(strtoupper($f) == "TEXT/PLAIN"){ $formatoinfo = "text/plain"; } + if(strtoupper($f) == "TEXT/HTML"){ + $formatosinfohtml = true; + } } } else{ @@ -2218,9 +2222,9 @@ class Atributos //if(strtoupper($formatoinfo) == "TEXT/HTML" && $res != ""){ //$n[] = array("alias"=>"","valor"=>"","link"=>"","img"=>""); //} - //if(strtoupper($formatoinfo) == "MIME" && $res2 != ""){ + if($formatosinfohtml == true){ $n[] = array("alias"=>"","valor"=>"","link"=>"","img"=>""); - //} + } if($res != ""){ $n[] = array("alias"=>"Link WMS","valor"=>"getfeatureinfo ".$formatoinfo,"link"=>$res,"img"=>"","idIframe"=>$id); } diff --git a/css/i3geo7.css.php b/css/i3geo7.css.php old mode 100644 new mode 100755 index 964febb..964febb --- a/css/i3geo7.css.php +++ b/css/i3geo7.css.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 7f92a7e..7f92a7e --- a/ferramentas/editorol/editorol_compacto.js +++ b/ferramentas/editorol/editorol_compacto.js diff --git a/js/compactados/ajuda_compacto.js b/js/compactados/ajuda_compacto.js old mode 100644 new mode 100755 index fa79a23..fa79a23 --- 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 28898ba..28898ba --- 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 fdb5153..fdb5153 --- 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 9695067..9695067 --- 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 a7caecf..a7caecf --- 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 789c4e8..789c4e8 --- 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 1648605..1648605 --- 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 07c1cb1..07c1cb1 --- 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 9443b42..9443b42 --- 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 b358bcf..b358bcf --- 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 0f6be58..0f6be58 --- 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 5838112..5838112 --- 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 62bedfa..62bedfa --- 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 7e20e40..7e20e40 --- 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 3da9ee1..3da9ee1 --- 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 4041401..4041401 --- 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 b477c59..b477c59 --- 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 35eabe5..35eabe5 --- 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 1b9d6d2..1b9d6d2 --- 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 39d4b26..39d4b26 --- 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 c1de594..c1de594 --- 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 22ef305..22ef305 --- 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 890a808..890a808 --- 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 38d9c7d..38d9c7d --- a/js/i3geo_tudo_compacto7.js.php +++ b/js/i3geo_tudo_compacto7.js.php diff --git a/pacotes/cpaint/cpaint2_compacto.inc.js b/pacotes/cpaint/cpaint2_compacto.inc.js old mode 100644 new mode 100755 index 1179423..1179423 --- a/pacotes/cpaint/cpaint2_compacto.inc.js +++ b/pacotes/cpaint/cpaint2_compacto.inc.js diff --git a/pacotes/mobileesp/mdetect_compacto.js b/pacotes/mobileesp/mdetect_compacto.js old mode 100644 new mode 100755 index 9ab0db5..9ab0db5 --- a/pacotes/mobileesp/mdetect_compacto.js +++ b/pacotes/mobileesp/mdetect_compacto.js diff --git a/pacotes/yui290/build/carousel/carousel_compacto.js b/pacotes/yui290/build/carousel/carousel_compacto.js old mode 100644 new mode 100755 index 2111cd6..2111cd6 --- a/pacotes/yui290/build/carousel/carousel_compacto.js +++ b/pacotes/yui290/build/carousel/carousel_compacto.js diff --git a/pacotes/yui290/build/container/container_compacto.js b/pacotes/yui290/build/container/container_compacto.js old mode 100644 new mode 100755 index aa7fb0c..aa7fb0c --- a/pacotes/yui290/build/container/container_compacto.js +++ b/pacotes/yui290/build/container/container_compacto.js diff --git a/pacotes/yui290/build/container/container_core_compacto.js b/pacotes/yui290/build/container/container_core_compacto.js old mode 100644 new mode 100755 index f2c2d3c..f2c2d3c --- a/pacotes/yui290/build/container/container_core_compacto.js +++ b/pacotes/yui290/build/container/container_core_compacto.js diff --git a/pacotes/yui290/build/resize/resize_compacto.js b/pacotes/yui290/build/resize/resize_compacto.js old mode 100644 new mode 100755 index 335f70f..335f70f --- a/pacotes/yui290/build/resize/resize_compacto.js +++ b/pacotes/yui290/build/resize/resize_compacto.js diff --git a/pacotes/yui290/build/treeview/treeview_compacto.js b/pacotes/yui290/build/treeview/treeview_compacto.js old mode 100644 new mode 100755 index 6ff4374..6ff4374 --- a/pacotes/yui290/build/treeview/treeview_compacto.js +++ b/pacotes/yui290/build/treeview/treeview_compacto.js diff --git a/pacotes/yui290/build/utilities/utilities_compacto.js b/pacotes/yui290/build/utilities/utilities_compacto.js old mode 100644 new mode 100755 index 7a1455c..7a1455c --- a/pacotes/yui290/build/utilities/utilities_compacto.js +++ b/pacotes/yui290/build/utilities/utilities_compacto.js -- libgit2 0.21.2