From 78745a022cc160db1c162cefc5f35668e9dbfe7b Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Fri, 26 Aug 2016 19:58:37 -0300 Subject: [PATCH] Correção na opção que lista os WMS cadastrados e as camadas do WMS escolhido --- admin/admin.db | Bin 340992 -> 0 bytes admin/php/webservices.php | 13 +++++-------- admin/php/xml.php | 17 ++++++++++------- classesphp/mapa_controle.php | 5 +++++ classesphp/wmswfs.php | 8 ++++++-- classesphp/wscliente.php | 38 +++++++++++++++----------------------- 6 files changed, 41 insertions(+), 40 deletions(-) diff --git a/admin/admin.db b/admin/admin.db index 9738605..b7a2dab 100755 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/admin/php/webservices.php b/admin/php/webservices.php index 89aa81e..fce93f0 100755 --- a/admin/php/webservices.php +++ b/admin/php/webservices.php @@ -40,21 +40,18 @@ Cada operação possuí seus próprios parâmetros, que de */ error_reporting(0); -// -//não sei pq mas ob_start e clean são necessários no Linux para não gerar erro indesejado -// -include_once(dirname(__FILE__)."/login.php"); -$id_ws = $_GET["id_ws"]; -$id = $_GET["id"]; - -testaSafeNumerico([$id,$id_ws]); +//a funcao PEGAWS pode ser executada por outros programas $funcoesEdicao = array( "ALTERARWS", "EXCLUIR" ); if(in_array(strtoupper($funcao),$funcoesEdicao)){ + include_once(dirname(__FILE__)."/login.php"); + $id_ws = $_GET["id_ws"]; + $id = $_GET["id"]; + testaSafeNumerico([$id,$id_ws]); if(verificaOperacaoSessao("admin/html/webservices") == false){ retornaJSON("Vc nao pode realizar essa operacao.");exit; } diff --git a/admin/php/xml.php b/admin/php/xml.php index 2d0bcf8..75a441f 100755 --- a/admin/php/xml.php +++ b/admin/php/xml.php @@ -487,13 +487,17 @@ RSS function geraXmlRSS($locaplic,$sql,$descricao,$output="xml") { global $esquemaadmin; + if(empty($output)){ + $output = "xml"; + } //var_dump($_SERVER);exit; $dbh = ""; include($locaplic."/admin/php/conexao.php"); - if($convUTF) - $xml = "<"."\x3F"."xml version='1.0' encoding='UTF-8' "."\x3F".">"; - else - $xml = "<"."\x3F"."xml version='1.0' encoding='ISO-8859-1' "."\x3F".">"; + if($convUTF){ + $xml = "<"."\x3F"."xml version='1.0' encoding='UTF-8' "."\x3F".">"; + } else { + $xml = "<"."\x3F"."xml version='1.0' encoding='ISO-8859-1' "."\x3F".">"; + } $xml .= ""; $xml .= "\n"; $xml .= "RSS\n"; @@ -510,8 +514,7 @@ function geraXmlRSS($locaplic,$sql,$descricao,$output="xml") ); $jsonItems = array(); $qatlas = $dbh->query($sql); - foreach($qatlas as $row) - { + foreach($qatlas as $row) { $xml .= "\n"; $xml .= "\n"; $xml .= "".entity_decode($row["nome_ws"])."\n"; @@ -541,7 +544,7 @@ function geraXmlRSS($locaplic,$sql,$descricao,$output="xml") $xml .= "\n"; $dbh = null; $dbhw = null; - if($output=="xml"){ + if($output == "xml"){ return $xml; } else{ diff --git a/classesphp/mapa_controle.php b/classesphp/mapa_controle.php index cad98b3..ad77ecb 100755 --- a/classesphp/mapa_controle.php +++ b/classesphp/mapa_controle.php @@ -1821,6 +1821,11 @@ switch (strtoupper($funcao)) */ case "LISTALAYERSWMS": include_once("wmswfs.php"); + $servico = $_pg["servico"]; + $nivel = $_pg["nivel"]; + $id_ws = $_pg["id_ws"]; + $nomelayer = $_pg["nomelayer"]; + $tipo_ws = $_pg["tipo_ws"]; $retorno = listaLayersWMS(); break; /* diff --git a/classesphp/wmswfs.php b/classesphp/wmswfs.php index a672704..8ab47ff 100755 --- a/classesphp/wmswfs.php +++ b/classesphp/wmswfs.php @@ -54,8 +54,9 @@ Return: function gravaCacheWMS($servico) { global $dir_tmp; - if($dir_tmp == "") - {include(dirname(__FILE__)."/../ms_configura.php");} + if($dir_tmp == ""){ + include(dirname(__FILE__)."/../ms_configura.php"); + } error_reporting(0); try{ $teste = explode("=",$servico); @@ -476,10 +477,12 @@ function listaLayersWMS() if(!isset($nomelayer)){ $nomelayer = "undefined"; } + //para o caso do sistema de metadados estatisticos $wms_service_request = gravaCacheWMS($servico); include_once(dirname(__FILE__)."/../admin/php/admin.php"); include_once(dirname(__FILE__)."/../admin/php/webservices.php"); + error_reporting(0); if($tipo_ws != "WMSMETAESTAT" && $nivel < 2){ if($wms_service_request == "erro") { @@ -494,6 +497,7 @@ function listaLayersWMS() adicionaAcesso($id_ws,true); } } + $handle = fopen ($wms_service_request, "r"); $wms_capabilities = fread ($handle, filesize ($wms_service_request)); fclose ($handle); diff --git a/classesphp/wscliente.php b/classesphp/wscliente.php index 8d5614b..1322c05 100755 --- a/classesphp/wscliente.php +++ b/classesphp/wscliente.php @@ -498,58 +498,50 @@ function listaRSSwsARRAY() include_once("$locaplic/admin/php/xml.php"); include_once("$locaplic/ms_configura.php"); $rsss = explode("|",$rss); - if(count($rsss) == 0){$rsss = array(" ");} + if(count($rsss) == 0){ + $rsss = array(" "); + } $erro = "Erro. Nao foi possivel ler o arquivo"; $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); $urli3geo = strtolower($protocolo[0])."://".$_SERVER['HTTP_HOST']."/".basename($locaplic); - foreach ($rsss as $r) - { - if($r == "" || $r == " ") - { + foreach ($rsss as $r){ + if($r == "" || $r == " "){ - if($tipo == "GEORSS") - { + if($tipo == "GEORSS"){ $canali = simplexml_load_string(geraXmlGeorss($locaplic)); $linkrss = $urli3geo."/admin/xmlgeorss.php"; } - if($tipo == "KML") - { + if($tipo == "KML"){ $canali = simplexml_load_string(geraXmlKmlrss($locaplic)); $linkrss = $urli3geo."/admin/xmlkmlrss.php"; } - if($tipo == "WMS" || $tipo == "WMS-Tile") - { + if($tipo == "WMS" || $tipo == "WMS-Tile"){ $canali = simplexml_load_string(geraXmlWMS($locaplic)); $linkrss = $urli3geo."/admin/xmlservicoswms.php"; } - if($tipo == "WMSMETAESTAT") - { + if($tipo == "WMSMETAESTAT") { $canali = simplexml_load_string(geraXmlWMSmetaestat($locaplic)); $linkrss = $urli3geo."/admin/xmlservicoswms.php"; } - if($tipo == "WS") - { + if($tipo == "WS"){ $canali = simplexml_load_string(geraXmlWS($locaplic)); $linkrss = $urli3geo."/admin/xmlservicosws.php"; } - if($tipo == "DOWNLOAD") - { + if($tipo == "DOWNLOAD"){ $canali = simplexml_load_string(geraXmlDownload($locaplic)); $linkrss = $urli3geo."/admin/xmllinksdownload.php"; } + } else { + $canali = simplexml_load_file($rss); } - else - {$canali = simplexml_load_file($rss);} if($r != "") $linhas["rss"] = ""; - else - { + else{ $linhas["rss"] = ""; } //var_dump($canali); $canais = array(); - foreach ($canali->channel->item as $item) - { + foreach ($canali->channel->item as $item){ $canais[] = array("id_ws"=>(ixml($item,"id")),"title"=>(ixml($item,"title")),"description"=>(ixml($item,"description")),"link"=>(ixml($item,"link")),"author"=>(ixml($item,"author")),"nacessos"=>(ixml($item,"nacessos")),"nacessosok"=>(ixml($item,"nacessosok")),"tipo_ws"=>(ixml($item,"tipo"))); } $linhas["canais"] = $canais; -- libgit2 0.21.2