Download as
Browse Code »

Commit 137273442a879ad4320b7b78c9a73a1a8e8a4c2f

Authored by Edmar Moretti
1 parent 3534c362
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

atualização do código

Showing 2 changed files with 16 additions and 8 deletions   Show diff stats
ferramentas/parametrossql/exec.php
  Diff comments   View file @1372734
1 1 <?php
  2 +exit;
2 3 include_once(dirname(__FILE__)."/../inicia.php");
3 4 //
4 5 //faz a busca da fun&ccedil;&atilde;o que deve ser executada
... ... @@ -130,8 +131,8 @@ switch (strtoupper($funcao))
130 131 */
131 132 case "INCLUDEPROG":
132 133 //evita redirecoina o programa para algum lugar indevido
133   - $prog = str_replace(".","",$prog);
134   - $prog = $prog.".php";
  134 + $prog = str_replace(".php","",$prog);
  135 + $prog = str_replace(".","",$prog).".php";
135 136 if(file_exists($locaplic."/".$prog)){
136 137 include($locaplic."/".$prog);
137 138 }
... ... @@ -144,4 +145,4 @@ else{
144 145 exit();
145 146 }
146 147  
147   -?>
148 148 \ No newline at end of file
  149 +?>
... ...
ferramentas/parametrossql/ogc.php
  Diff comments   View file @1372734
... ... @@ -9,13 +9,16 @@ A diferenca e que esse servico processa o parametro &quot;plugin&quot;, aplicando os filtr
9 9 no plugin parametrossql
10 10 */
11 11 $cache = true;
12   -require_once(dirname(__FILE__)."/../../classesphp/carrega_ext.php");
  12 +include(dirname(__FILE__)."/classesphp/sani_request.php");
13 13 include(dirname(__FILE__)."/../../ms_configura.php");
14   -include(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
15 14 include(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php");
  15 +$_GET = array_merge($_GET,$_POST);
16 16 $projDefault = pegaProjecaoDefault();
17 17  
18   -$temas = $tema;
  18 +$tema = basename($_GET["tema"]);
  19 +if($tema == ""){
  20 + exit;
  21 +}
19 22 if(isset($_GET["sld"]) || isset($_GET["filter"])){
20 23 $cache = false;
21 24 }
... ... @@ -41,7 +44,7 @@ if($_GET[&quot;SRS&quot;] == &quot;EPSG:900913&quot;){
41 44 $_GET["SRS"] = "EPSG:3857";
42 45 }
43 46 $req = ms_newowsrequestobj();
44   -$_GET = array_merge($_GET,$_POST);
  47 +
45 48 if(!isset($_GET["srs"]) && !isset($_GET["SRS"])){
46 49 $_GET["srs"] = "EPSG:".$projDefault["epsg"];
47 50 }
... ... @@ -72,7 +75,7 @@ $agora = intval(time() / 1000);
72 75 if(isset($_GET["Z"]) && isset($_GET["X"])){
73 76 $agora .= "google";
74 77 }
75   -$nomeMapfileTmp = $dir_tmp."/ogc_".md5($tema.$plugin.($req->getValueByName("SRS")))."_".$agora.".map";
  78 +$nomeMapfileTmp = $dir_tmp."/ogcpsql_".md5($tema.$plugin.($req->getValueByName("SRS")))."_".$agora.".map";
76 79 $nomeMapfileTmp = str_replace(",","",$nomeMapfileTmp);
77 80 $nomeMapfileTmp = str_replace(" ","",$nomeMapfileTmp);
78 81 //essa variavel e usada para definir se a imagem final gerada devera ser cortada ou nao
... ... @@ -218,7 +221,9 @@ else{
218 221  
219 222 $oMap->setSymbolSet($locaplic."/symbols/".basename($oMap->symbolsetfilename));
220 223 $oMap->setFontSet($locaplic."/symbols/".basename($oMap->fontsetfilename));
  224 + $nomeMapfileTmp = str_replace(".map","",$nomeMapfileTmp).".map";
221 225 $oMap->save($nomeMapfileTmp);
  226 +
222 227 $oMap = ms_newMapobj($nomeMapfileTmp);
223 228 }
224 229 if(ob_get_contents ()){
... ... @@ -570,6 +575,8 @@ function salvaCacheImagem($cachedir,$map,$tms, $plugin, $tema){
570 575 exit;
571 576 }
572 577 function execProg($prog){
  578 + $prog = str_replace(".php","",$prog);
  579 + $prog = str_replace(".","",$prog).".php";
573 580 include($prog);
574 581 //$retorno variavel deve ser retornada pelo programa $prog
575 582 //veja como exemplo i3geo/aplicmap/daods/listaano.php
... ...