From 6920cf73af1440a07306d6bff287746e97b0a106 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Fri, 28 Oct 2011 12:45:55 +0000
Subject: [PATCH] 

---
 admin/js/editormapfile.js |  8 +++++++-
 admin/php/admin.php       | 10 +++++-----
 admin/php/conexao.php     |  1 +
 aplicmap/ogcws.map        |  1 +
 aplicmap/ogcwsv5.map      |  1 +
 aplicmap/ogcwsv6.map      |  3 ++-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/admin/js/editormapfile.js b/admin/js/editormapfile.js
index 90816ee..72909ad 100644
--- a/admin/js/editormapfile.js
+++ b/admin/js/editormapfile.js
@@ -1909,7 +1909,13 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo,
   				{
   					if(testar == false){
   						if(tipo=="conexao")
-  						{montaEditorConexao(YAHOO.lang.JSON.parse(o.responseText));}
+  						{montaEditorDados(YAHOO.lang.JSON.parse(o.responseText));}
+  						if(tipo=="comport")
+  						{montaEditorComport(YAHOO.lang.JSON.parse(o.responseText));}
+  						if(tipo=="dispo")
+  						{montaEditorDispo(YAHOO.lang.JSON.parse(o.responseText));}
+  						if(tipo=="titulo")
+  						{montaEditorTitulo(YAHOO.lang.JSON.parse(o.responseText));}						
   						if(tipo=="metadados")
   						{montaEditorMetadados(YAHOO.lang.JSON.parse(o.responseText));}
   						if(tipo=="geral")
diff --git a/admin/php/admin.php b/admin/php/admin.php
index fb0ade9..7903341 100644
--- a/admin/php/admin.php
+++ b/admin/php/admin.php
@@ -83,10 +83,10 @@ Imprime na saída a string JSON
 function retornaJSON($obj)
 {
 	global $locaplic;
-	if(function_exists("json_encode"))
-	{echojson(json_encode($obj));}
-	else
-	{
+	//if(function_exists("json_encode"))
+	//{echojson(json_encode($obj));}
+	//else
+	//{
 		include_once($locaplic."/pacotes/cpaint/JSON/json2.php");
 		error_reporting(0);
 		$j = new Services_JSON();
@@ -94,7 +94,7 @@ function retornaJSON($obj)
 		if (!mb_detect_encoding($texto,"UTF-8",true))
 		$texto = utf8_encode($texto);
 		echo $texto;
-	}
+	//}
 /*
 	include_once($locaplic."/pacotes/cpaint/JSON/json2.php");
 	error_reporting(0);
diff --git a/admin/php/conexao.php b/admin/php/conexao.php
index 37bdffd..05d588d 100644
--- a/admin/php/conexao.php
+++ b/admin/php/conexao.php
@@ -98,4 +98,5 @@ if($conexaoadmin == "")
 }
 else
 include($conexaoadmin);
+
 ?>
\ No newline at end of file
diff --git a/aplicmap/ogcws.map b/aplicmap/ogcws.map
index c5c4ada..ba44303 100644
--- a/aplicmap/ogcws.map
+++ b/aplicmap/ogcws.map
@@ -102,6 +102,7 @@ MAP
       "ows_namespace_uri"	"http://www.omsug.ca/osgis2004"
       "ows_address"	"http://www.mma.gov.br"
       "ows_postcode"	""
+	  "ows_enable_request" "*"
     END
     QUERYFORMAT text/html
     LEGENDFORMAT text/html
diff --git a/aplicmap/ogcwsv5.map b/aplicmap/ogcwsv5.map
index b0d841a..5e6ae84 100644
--- a/aplicmap/ogcwsv5.map
+++ b/aplicmap/ogcwsv5.map
@@ -104,6 +104,7 @@ MAP
       "ows_namespace_uri"	"http://www.omsug.ca/osgis2004"
       "ows_address"	"http://www.mma.gov.br"
       "ows_postcode"	""
+	  "ows_enable_request" "*"
     END
     QUERYFORMAT text/html
     LEGENDFORMAT text/html
diff --git a/aplicmap/ogcwsv6.map b/aplicmap/ogcwsv6.map
index 8f26853..62b9f97 100644
--- a/aplicmap/ogcwsv6.map
+++ b/aplicmap/ogcwsv6.map
@@ -18,7 +18,7 @@ MAP
 		NAME 'png'
 		MIMETYPE "image/png"
  		DRIVER AGG/PNG
- 		IMAGEMODE RGB
+ 		IMAGEMODE RGBA
  		FORMATOPTION "QUANTIZE_FORCE=ON"
  		FORMATOPTION "QUANTIZE_DITHER=OFF"
  		FORMATOPTION "QUANTIZE_COLORS=256"
@@ -105,6 +105,7 @@ MAP
       "ows_namespace_uri"	"http://www.omsug.ca/osgis2004"
       "ows_address"	"http://www.mma.gov.br"
       "ows_postcode"	""
+	  "ows_enable_request" "*"
     END
     QUERYFORMAT text/html
     LEGENDFORMAT text/html
--
libgit2 0.21.2