From 46d066765249f0d4c70d5a14aa252c80f3d58249 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Tue, 19 May 2015 14:18:09 +0000
Subject: [PATCH] Correção na geração de RSS

---
 admin/menu.html            | 10 ----------
 admin/php/xml.php          |  6 +++---
 classesphp/classe_mapa.php | 25 ++++++++++++++++++++-----
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/admin/menu.html b/admin/menu.html
index 916106b..8c1b18f 100644
--- a/admin/menu.html
+++ b/admin/menu.html
@@ -292,16 +292,6 @@
 
 		}
 	]},{
-	html: "Configura&ccedil;&atilde;o dos servi&ccedil;os OGC",
-	type: "html",
-	children:[
-		{
-		html: "<a href='html/ogcws.html' target='principal'>Edi&ccedil;&atilde;o</a>",
-		type: "html",
-		enableHighlight: false,
-
-		}
-	]},{
 	html: "Outras op&ccedil;&otilde;es",
 	type: "html",
 	children:[
diff --git a/admin/php/xml.php b/admin/php/xml.php
index fbf2dda..2e475d3 100644
--- a/admin/php/xml.php
+++ b/admin/php/xml.php
@@ -491,7 +491,7 @@ function geraXmlRSS($locaplic,$sql,$descricao)
 	$xml .= "<rss version='2.0'>";
 	$xml .= "<channel>\n";
 	$xml .= "<title>RSS</title>\n";
-	$xml .= "<description>$descricao</description>\n";
+	$xml .= "<description>".str_replace("&","&amp;",$descricao)."</description>\n";
 	$xml .= "<link></link>\n";
 	$xml .= "<docs></docs>\n";
 	$xml .= "<copyright>Gerado pelo i3Geo</copyright>\n";
@@ -527,7 +527,7 @@ function geraXmlAtlas($locaplic,$editores)
 	error_reporting(0);
 	$dbh = "";
 	include($locaplic."/admin/php/conexao.php");
-	
+
 	if($convUTF)
 	$xml = "<"."\x3F"."xml version='1.0' encoding='UTF-8' "."\x3F".">";
 	else
@@ -914,7 +914,7 @@ function array_in_array($needle, $haystack)
 }
 function xmlTexto_prepara($texto)
 {
-	return str_replace("&","&",$texto);
+	return str_replace("&","&amp;",$texto);
 }
 function entity_decode($texto)
 {
diff --git a/classesphp/classe_mapa.php b/classesphp/classe_mapa.php
index 68b3135..e9c4d3e 100644
--- a/classesphp/classe_mapa.php
+++ b/classesphp/classe_mapa.php
@@ -270,7 +270,8 @@ class Mapa
 				"colunaidunico",
 				"cortepixels",
 				"plugini3geo",
-				"link_tema"
+				"link_tema",
+				"ferramentas"
 		);
 		foreach ($this->layers as $oLayer){
 			$sel = "nao";
@@ -430,6 +431,19 @@ class Mapa
 				if($link_tema == "" && $oLayer->getmetadata("link_tema") != ""){
 					$link_tema = $oLayer->getmetadata("link_tema");
 				}
+				//TODO colocar aqui os parametros da linha do tempo???
+				//
+				//parametros para ferramentas especiaifcas
+				//
+				$ferramentas = array();
+				//mapa 3d
+				if($oLayer->getmetadata("tme") != ""){
+					$f = $oLayer->getmetadata("tme");
+					if (!mb_detect_encoding($f,"UTF-8",true)){
+						$f = mb_convert_encoding($f,"UTF-8","ISO-8859-1");
+					}
+					$ferramentas["tme"] = json_decode($f);
+				}
 				//formatacao antiga, antes da versao 6.0
 				/*
 				 $temas[] = array(
@@ -516,7 +530,8 @@ class Mapa
 						$oLayer->getmetadata("COLUNAIDUNICO"),
 						$cortepixels,
 						$plugini3geo,
-						$link_tema
+						$link_tema,
+						$ferramentas
 				);
 			}
 		}
@@ -1091,7 +1106,7 @@ class Mapa
 		//tem erro na vers&atilde;o 6 do Mapserver. J&aacute; abri um ticket no trac da OSGEO
 		$nlayer = criaLayer($this->mapa,MS_LAYER_LINE,MS_DEFAULT,"Grade de coordenadas","SIM");
 		ms_newgridobj($nlayer);
-		
+
 		$nlayer->grid->set("labelformat", "DDMMSS");
 		$nlayer->grid->set("maxinterval", $intervalo);
 		$classe = $nlayer->getclass(0);
@@ -1117,7 +1132,7 @@ class Mapa
 			else{
 				$label = $classe->label;
 			}
-			
+
 			$label->set("size",$tamanhotexto);
 			$label->set("type",MS_BITMAP);
 			if ($fonte != "bitmap")	{
@@ -1305,7 +1320,7 @@ class Mapa
 						$nNome = str_replace(".map","",basename($nomemap));
 						$nlayer->setmetadata("arquivotemaoriginal",$nNome);
 						$nlayer->setmetadata("nomeoriginal",$nlayer->name);
-						
+
 						$nlayer->set("name",$nomeunico[$n]);
 						//altera o nome do grupo se existir
 						if ($nlayer->group != " " && $nlayer->group != "" ){
--
libgit2 0.21.2