From 2c3a6d40e3a9434a1bd21299a1869c6304fbd9f3 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Thu, 4 Aug 2016 14:13:41 -0300 Subject: [PATCH] correção no código --- classesphp/pega_variaveis.php | 2 +- classesphp/sani_request.php | 2 +- ferramentas/vinde/wmsindejson.php | 51 ++------------------------------------------------- 3 files changed, 4 insertions(+), 51 deletions(-) diff --git a/classesphp/pega_variaveis.php b/classesphp/pega_variaveis.php index 05b90e3..1db46f7 100755 --- a/classesphp/pega_variaveis.php +++ b/classesphp/pega_variaveis.php @@ -60,7 +60,7 @@ if (basename(__FILE__) == basename($_SERVER['SCRIPT_FILENAME'])){ } error_reporting(0); -$bl = array("_decode","php","eval","passthru","shell_exec","escapeshellarg","escapeshellcmd","proc_close","proc_open","dl","popen","contents","delete","drop","update","insert","exec","system",";"); +$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",";"); if (isset($_GET)) { foreach(array_keys($_GET) as $k) diff --git a/classesphp/sani_request.php b/classesphp/sani_request.php index 5423ccb..9bd0511 100755 --- a/classesphp/sani_request.php +++ b/classesphp/sani_request.php @@ -3,7 +3,7 @@ if (basename(__FILE__) == basename($_SERVER['SCRIPT_FILENAME'])){ exit; } error_reporting(0); -$bl = array("_decode","php","eval","passthru","shell_exec","escapeshellarg","escapeshellcmd","proc_close","proc_open","dl","popen","contents","delete","drop","update","insert","exec","system",";"); +$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",";"); if (isset($_GET)){ foreach(array_keys($_GET) as $k) { $k = str_ireplace($bl,"",$k); diff --git a/ferramentas/vinde/wmsindejson.php b/ferramentas/vinde/wmsindejson.php index 232716e..7619483 100755 --- a/ferramentas/vinde/wmsindejson.php +++ b/ferramentas/vinde/wmsindejson.php @@ -1,22 +1,4 @@ "; - //var_dump($matches);exit; $nomeLayer = $matches[2][0];////converte($matches[2][0]); $layer[] = $nomeLayer; $parametros = array(); @@ -110,18 +82,11 @@ for ($i=0;$i<$n;$i++){ $layers[$i] = $layer; } } - -//separa os grupos -//echo "
";
-//var_dump($grupos);exit;
 $chaves = array_keys($grupos);
 sort($chaves);
-//echo count($chaves);exit;
 $arvore = array();
 foreach($chaves as $chave){
-	//echo $chave."\n";
 	$hs = explode("/",$chave);
-	//echo count($hs);
 	$d = $hs;
 	array_shift($d);
 	if(array_key_exists(0,$hs) && array_key_exists($hs[0],$arvore)){
@@ -131,8 +96,6 @@ foreach($chaves as $chave){
 		$arvore[$hs[0]] = noi($d,array());
 	}
 }
-//var_dump($arvore);
-//exit;
 $final = array(
 		"layers"=>$layers,
 		"arvore"=>$arvore
@@ -147,16 +110,10 @@ echo json_encode($final,true);
 if(extension_loaded('zlib')){
 	ob_end_flush();
 }
-
-//echo json_encode($novalinha,true);
-//echo "{".implode($novalinha,",")."}";
-//echo "[".$novalinha[0]."]";
 function noi($n,$l){
 	global $layers;
-	//var_dump($n);
 	$d = $n;
 	array_shift($d);
-	//echo count($n);
 	if(count($n) > 1){
 		if(array_key_exists(0,$n) && array_key_exists($n[0],$l)){
 			if(is_array($n[1])){
@@ -172,15 +129,11 @@ function noi($n,$l){
 		$l[$n[0]] = noi($d,$l);
 		return $l;
 	}
-	//$n[1] = $layers[$n[0]];
 	return $n;
 }
 function converte($texto)
 {
-	//if (!mb_detect_encoding($texto,"UTF-8",false))
-	//{
-		$texto = mb_convert_encoding($texto,"ISO-8859-1","AUTO");
-	//}
+	$texto = mb_convert_encoding($texto,"ISO-8859-1","AUTO");
 	return $texto;
 }
 ?>
--
libgit2 0.21.2