Ativacao da funcao parametrossql passando a usar libcurl para obtenção dos dados…

… utilizados nos parâmetros

Ativacao da funcao parametrossql passando a usar libcurl para obtenção dos dados…
… utilizados nos parâmetros
Edmar Moretti
1 parent 76f1ce06
Showing 6 changed files with 39 additions and 32 deletions Show diff stats
classesphp/funcoes_gerais.php
classesphp/sani_request.php
ferramentas/parametrossql/exec.php
ferramentas/parametrossql/ogc.php
ogc.php
testamapfile.php
@@ -2879,7 +2879,7 @@ mapa - objeto mapa destino do simbolo clonado
 function cloneInlineSymbol($layern,$nmapa,$mapa){
 	$versao = versao();
 	if($versao["principal"] > 5){
-		$numclasses = $layern->numclasses;
+		$numclasses = $layern->numclasses;
 		for($ci=0;$ci < $numclasses;$ci++){
 			$classe = $layern->getclass($ci);
 			$numestilos = $classe->numstyles;
@@ -2891,13 +2891,15 @@ function cloneInlineSymbol($layern,$nmapa,$mapa){
 					if($simbolo->inmapfile == MS_TRUE || file_exists($nomesimbolo)){
 						$simbolon = new symbolObj($mapa, $nomesimbolo);
 						$simbolon->set("inmapfile",MS_TRUE);
+
 						$simbolon->setImagePath($simbolo->imagepath);
 						$simbolon->setPoints($simbolo->getPointsArray());
 						//$simbolon->setPattern($simbolo->getPatternArray());
 						$simbolon->set("type",$simbolo->type);
-						$simbolon->set("antialias",$simbolo->antialias);
+						//$simbolon->set("antialias",$simbolo->antialias);
 						$simbolon->set("character",$simbolo->character);
 						$simbolon->set("filled",$simbolo->filled);
+
 						//$simbolon->set("font",$simbolo->font);
 						//$simbolon->set("position",$simbolo->position);
 						$simbolon->set("sizex",$simbolo->sizex);
@@ -3,7 +3,7 @@ if (basename(__FILE__) == basename($_SERVER[&#39;SCRIPT_FILENAME&#39;])){
 	exit;
 }
 error_reporting(0);
-$bl = array("password","select","_decode","php","eval","passthru","shell_exec","escapeshellarg","escapeshellcmd","proc_close","proc_open","dl","popen","contents","delete","drop","update","insert","exec","system",";");
+$bl = array("exec ","exec(","password","select","_decode","passthru","shell_exec","escapeshellarg","escapeshellcmd","proc_close","proc_open","dl","popen","contents","delete","drop","update","insert","system",";");
 if (isset($_GET)){
 	foreach(array_keys($_GET) as $k)	{
 		$k = str_ireplace($bl,"",$k);
@@ -16,7 +16,6 @@ if (isset($_GET)){
 	}
 }
 //array(3) { ["cpaint_function"]=> string(8) "criaMapa" ["cpaint_argument"]=> array(1) { [0]=> string(54) ""funcao=criaMapa&&desligar=mundo&interface=openlayers"" } ["cpaint_response_type"]=> string(4) "JSON" }
-
 if (isset($_POST)){
 	if (isset($_POST["cpaint_argument"]) && $_POST["cpaint_argument"][0] != "")
 	{
@@ -28,7 +27,6 @@ if (isset($_POST)){
 		else{
 			$argumento_ = str_replace("\"","",$argumento_);
 		}
-
 		$argumento_ = explode('"',$argumento_);
 		$argumento_ = implode("&",$argumento_);
 		$parametros_ = explode("&",$argumento_);
 <?php
-exit;
-include_once(dirname(__FILE__)."/../inicia.php");
+include(dirname(__FILE__)."/../safe.php");
+verificaBlFerramentas(basename(dirname(__FILE__)),$i3geoBlFerramentas,false);
+$tema =  basename($_GET["tema"]);
 //
 //faz a busca da fun&ccedil;&atilde;o que deve ser executada
 //
@@ -55,6 +56,7 @@ switch (strtoupper($funcao))
 		Aplica a substituicao de chaves pelos valores enviados no parametro $valores com os valores separados por virgulas na sequencia das chaves
 		*/
 	case "APLICAR":
+		$valores = $_GET["valores"];
 		$map = ms_newMapObj($map_file);
 		//pega o layer
 		$layer = $map->getlayerbyname($tema);
@@ -130,19 +132,19 @@ switch (strtoupper($funcao))
 	 * Utilizado para pegar a lista de valores que sera apresentada ao usuario
 	 */
 	case "INCLUDEPROG":
-		//evita redirecoina o programa para algum lugar indevido
-		$prog = str_replace(".php","",$prog);
-		$prog = str_replace(".","",$prog).".php";
-		if(file_exists($locaplic."/".$prog)){
-			include($locaplic."/".$prog);
-		}
+		$protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']);
+		$protocolo = $protocolo[0];
+		$protocolo1 = strtolower($protocolo) . '://'.$_SERVER['SERVER_NAME'];
+		$protocolo = strtolower($protocolo) . '://'.$_SERVER['SERVER_NAME'] .":". $_SERVER['SERVER_PORT'];
+		$urli3geo = str_replace("/ferramentas/parametrossql/exec.php","",$protocolo.$_SERVER["PHP_SELF"]);
+		$handle = curl_init();
+		curl_setopt( $handle, CURLOPT_URL, $urli3geo."/".$_GET["prog"]);
+		curl_setopt( $handle, CURLOPT_HEADER, false );
+		curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+		$retorno = curl_exec( $handle );
+		curl_close( $handle );
+		$retorno = json_decode($retorno,true);
 		break;
 }
-if (!connection_aborted()){
-	cpjson($retorno);
-}
-else{
-	exit();
-}
-
+cpjson($retorno);
 ?>
 <?php
-exit;
 /**
 Esse programa e uma adaptacao do codigo i3geo/ogc.php
 E utilizado no mashup (i3geo/mashup) nas camadas que sao configuradas cm o plugin parametrossql
@@ -9,10 +8,12 @@ A diferenca e que esse servico processa o parametro &quot;plugin&quot;, aplicando os filtr
 no plugin parametrossql
  */
 $cache = true;
-include(dirname(__FILE__)."/classesphp/sani_request.php");
+include(dirname(__FILE__)."/../../classesphp/sani_request.php");
+include_once (dirname(__FILE__)."/../../classesphp/carrega_ext.php");
 include(dirname(__FILE__)."/../../ms_configura.php");
 include(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php");
 $_GET = array_merge($_GET,$_POST);
+$plugin = $_GET["plugin"];
 $projDefault = pegaProjecaoDefault();
 $tema = basename($_GET["tema"]);
@@ -156,7 +157,7 @@ else{
 		}
 	}
 	//aplica os parametros especificos do plugin
-	$data = $l->data;
+	$data = $l->data;
 	$c = $l->getmetadata("PLUGINI3GEO");
 	if($c != ""){
 		$cs = json_decode($c,true);
@@ -167,7 +168,6 @@ else{
 		}
 		$chaves = implode(",",$chaves);
 		$filtro = $l->getFilterString();
-
 		$chaves = str_ireplace(array(" and ", " or ", "select","from","where","update","delete","insert","--"),"",$chaves);
 		$chaves = explode(",",$chaves);
 		$n = count($chaves);
@@ -185,7 +185,7 @@ else{
 						$plugin[] = $temp[0];
 					}
 					elseif ($c["prog"] != ""){
-						$plugin[] = execProg($locaplic."/".$c["prog"]);
+						$plugin[] = execProg($c["prog"]);
 					}
 				}
 			}
@@ -206,7 +206,6 @@ else{
 		if($filtro != ""){
 			$l->setfilter($filtro);
 		}
-
 		$l->set("data",$data);
 		//acrecenta-se um md5 apos o nome caso seja necessario gerar cache
 		if($cache == true){
@@ -577,11 +576,17 @@ function salvaCacheImagem($cachedir,$map,$tms, $plugin, $tema){
 	exit;
 }
 function execProg($prog){
-	$prog = str_replace(".php","",$prog);
-	$prog = str_replace(".","",$prog).".php";
-	include($prog);
 	//$retorno variavel deve ser retornada pelo programa $prog
 	//veja como exemplo i3geo/aplicmap/daods/listaano.php
+	global $urli3geo;
+	$u = str_replace("/ferramentas/parametrossql","",$urli3geo);
+	$handle = curl_init();
+	curl_setopt( $handle, CURLOPT_URL, $u."/".$prog);
+	curl_setopt( $handle, CURLOPT_HEADER, false );
+	curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+	$str = curl_exec( $handle );
+	curl_close( $handle );
+	$retorno = json_decode($str,true);
 	return $retorno[0]["v"];
 }
 ?>
@@ -1455,7 +1455,7 @@ function exportaCsv(){
 		$linhas[] = implode(",",$items).",wkt";
 	}
 	for ($i = 0; $i < $res_count; $i++){
-		if($versao == 6){
+		if($versao >= 6){
 			$shape = $layer->getShape($layer->getResult($i));
 		}
 		else{
@@ -1497,7 +1497,7 @@ function exportaGeojson(){
 	$features = array();
 	for ($i = 0; $i < $res_count; $i++){
-		if($versao == 6){
+		if($versao >= 6){
 			$shape = $layer->getShape($layer->getResult($i));
 		}
 		else{
@@ -104,7 +104,7 @@ if ($tipo == &quot;&quot;)
 	echo '<script>';
 	echo 'function roda(){window.location.href = "?map="+document.getElementById("nomemap").value;}';
 	echo 'function rodaTabela(){window.location.href = window.location.href+"&tabela";}';
-	echo 'i3GEO.configura.locaplic = i3GEO.util.protocolo() + "://" + window.location.host + "/i3geo";';
+	echo 'i3GEO.configura.locaplic = i3GEO.util.protocolo() + "://" + window.location.host + "/'.basename(dirname(__FILE__)).'";';
 	echo '</script>';
 	echo '<script src="admin/js/core.js"></script>';
 	echo '<script src="admin/dicionario/core.js"></script>';
	@@ -1455,7 +1455,7 @@ function exportaCsv(){		@@ -1455,7 +1455,7 @@ function exportaCsv(){
1455	$linhas[] = implode(",",$items).",wkt";	1455	$linhas[] = implode(",",$items).",wkt";
1456	}	1456	}
1457	for ($i = 0; $i < $res_count; $i++){	1457	for ($i = 0; $i < $res_count; $i++){
1458	- if($versao == 6){	1458	+ if($versao >= 6){
1459	$shape = $layer->getShape($layer->getResult($i));	1459	$shape = $layer->getShape($layer->getResult($i));
1460	}	1460	}
1461	else{	1461	else{
	@@ -1497,7 +1497,7 @@ function exportaGeojson(){		@@ -1497,7 +1497,7 @@ function exportaGeojson(){
1497		1497
1498	$features = array();	1498	$features = array();
1499	for ($i = 0; $i < $res_count; $i++){	1499	for ($i = 0; $i < $res_count; $i++){
1500	- if($versao == 6){	1500	+ if($versao >= 6){
1501	$shape = $layer->getShape($layer->getResult($i));	1501	$shape = $layer->getShape($layer->getResult($i));
1502	}	1502	}
1503	else{	1503	else{
	@@ -104,7 +104,7 @@ if ($tipo == "")		@@ -104,7 +104,7 @@ if ($tipo == "")
104	echo '<script>';	104	echo '<script>';
105	echo 'function roda(){window.location.href = "?map="+document.getElementById("nomemap").value;}';	105	echo 'function roda(){window.location.href = "?map="+document.getElementById("nomemap").value;}';
106	echo 'function rodaTabela(){window.location.href = window.location.href+"&tabela";}';	106	echo 'function rodaTabela(){window.location.href = window.location.href+"&tabela";}';
107	- echo 'i3GEO.configura.locaplic = i3GEO.util.protocolo() + "://" + window.location.host + "/i3geo";';	107	+ echo 'i3GEO.configura.locaplic = i3GEO.util.protocolo() + "://" + window.location.host + "/'.basename(dirname(__FILE__)).'";';
108	echo '</script>';	108	echo '</script>';
109	echo '<script src="admin/js/core.js"></script>';	109	echo '<script src="admin/js/core.js"></script>';
110	echo '<script src="admin/dicionario/core.js"></script>';	110	echo '<script src="admin/dicionario/core.js"></script>';