From 5e02f849b0c5cc047c03621921e501f08628d437 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 20 May 2009 17:49:08 +0000
Subject: [PATCH] Correção na árvore de WMS e no registro dos acessos aos WMS

---
 admin/php/webservices.php | 2 ++
 classesphp/wmswfs.php     | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/admin/php/webservices.php b/admin/php/webservices.php
index 3ff0af7..cf52c99 100644
--- a/admin/php/webservices.php
+++ b/admin/php/webservices.php
@@ -132,11 +132,13 @@ function adicionaAcesso($id_ws,$sucesso)
     	include("conexao.php");
     	$dados = pegaDados("select * from i3geoadmin_ws WHERE id_ws = $id_ws");
     	//var_dump($dados);
+    	if($dados[0]["nacessos"] == ""){$dados[0]["nacessos"] = 0;}
     	$acessos = $dados[0]["nacessos"] + 1;
     	if($sucesso)
     	$ok = $dados[0]["nacessosok"] + 1;
     	else
     	$ok = $dados[0]["nacessosok"];
+    	if($ok == ""){$ok = 0;}
    		$dbhw->query("UPDATE i3geoadmin_ws SET nacessos = '$acessos',nacessosok = '$ok' WHERE id_ws = $id_ws");
     	$dbhw = null;
     	$dbh = null;
diff --git a/classesphp/wmswfs.php b/classesphp/wmswfs.php
index bc88831..e46121b 100644
--- a/classesphp/wmswfs.php
+++ b/classesphp/wmswfs.php
@@ -398,6 +398,7 @@ function listaLayersWMS()
 	include_once("../admin/php/admin.php");
 	include_once("../admin/php/webservices.php");
 	error_reporting(0);
+	
 	if($nivel < 2){
 		if($wms_service_request == "erro") {
 			//registra a tentativa de acesso
@@ -430,12 +431,13 @@ function listaLayersWMS()
 		foreach ($layersanteriores as $layeranterior)
 		{
 			$r1 = pegaTag($layeranterior);
-			if($r1["nome"] == $nomelayer)
+			if($r1["nome"] == $nomelayer || $r1["titulo"] == $nomelayer)
 			{
 				$layers = $xpath->query('Layer',$layeranterior);
 				foreach ($layers as $layer)
 				{
 					$r = pegaTag($layer);
+					if(!$r["nome"]){$r["nome"] = $r["titulo"];}
 					$res[] = array("nome"=>$r["nome"],"titulo"=>$r["titulo"],"estilos"=>$r["estilos"],"srs"=>wms_srs($dom),"formats"=>wms_formats($dom),"version"=>wms_version($dom),"formatsinfo"=>wms_formatsinfo($dom));
 				}
 				if($layers->length == 0)
@@ -457,6 +459,7 @@ function listaLayersWMS()
 		{
 			$r = pegaTag($layer);
 			//echo $r["nome"]."\n";
+			if(!$r["nome"]){$r["nome"] = $r["titulo"];}
 			if(array_search("Style",$r["tags"]) || array_search("Layer",$r["tags"]))
 			{$res[] = array("nome"=>$r["nome"],"titulo"=>$r["titulo"],"estilos"=>$r["estilos"],"srs"=>wms_srs($dom),"formats"=>wms_formats($dom),"version"=>wms_version($dom),"formatsinfo"=>wms_formatsinfo($dom));}
 		}
--
libgit2 0.21.2