Correção na opção que lista os WMS cadastrados e as camadas do WMS escolhido

Edmar Moretti
1 parent d14e62fd
Showing 6 changed files with 41 additions and 40 deletions Show diff stats
admin/admin.db
admin/php/webservices.php
admin/php/xml.php
classesphp/mapa_controle.php
classesphp/wmswfs.php
classesphp/wscliente.php
@@ -40,21 +40,18 @@ Cada opera&amp;ccedil;&amp;atilde;o possu&amp;iacute; seus próprios par&amp;acirc;metros, que de
 */
 error_reporting(0);
-//
-//n&atilde;o sei pq mas ob_start e clean s&atilde;o necess&aacute;rios no Linux para n&atilde;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;
 	}
@@ -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 .= "<rss version='2.0'>";
 	$xml .= "<channel>\n";
 	$xml .= "<title>RSS</title>\n";
@@ -510,8 +514,7 @@ function geraXmlRSS($locaplic,$sql,$descricao,$output=&quot;xml&quot;)
 	);
 	$jsonItems = array();
 	$qatlas = $dbh->query($sql);
-	foreach($qatlas as $row)
-	{
+	foreach($qatlas as $row) {
 		$xml .= "<item>\n";
 		$xml .= "<category/>\n";
 		$xml .= "<title>".entity_decode($row["nome_ws"])."</title>\n";
@@ -541,7 +544,7 @@ function geraXmlRSS($locaplic,$sql,$descricao,$output=&quot;xml&quot;)
 	$xml .= "</channel></rss>\n";
 	$dbh = null;
 	$dbhw = null;
-	if($output=="xml"){
+	if($output == "xml"){
 		return $xml;
 	}
 	else{
@@ -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;
 		/*
@@ -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);
@@ -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"] = "<a href='".$r."' target=blank ><img style='border:0px solid white;' src='../../imagens/rss.gif' /></a>";
-		else
-		{
+		else{
 			$linhas["rss"] = "<a href='".$linkrss."' target=blank ><img style='border:0px solid white;' src='../../imagens/rss.gif' /></a>";
 		}
 		//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;