Download as
Browse Code »

Commit 60ac62e8f2ac15b14d385fb86b45ecc09d9ea658

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

Atualização do código

Showing 22 changed files with 133 additions and 61 deletions   Show diff stats
ferramentas/animagif/exec.php
  Diff comments   View file @60ac62e
... ... @@ -15,7 +15,7 @@ if(empty($_GET)){
15 15 &legenda = sim|nao<br>
16 16 &transparente = sim|nao<br>
17 17 &operador = operador que ser&aacute; utilizado no filtro. Por default utilza-se 'igual a'. Pode ser ainda lt (menor que) ou gt (maior que)<br>
18   - &nulos = lista de valores, separados por ',' que não serão considerados ao aplicar o filtro, por exemplo &nulos=-, ,0<br>
  18 + &nulos = lista de valores, separados por ',' que n&atilde;o ser&atilde;o considerados ao aplicar o filtro, por exemplo &nulos=-, ,0<br>
19 19 &tipocolunat = string|numero tipo de dados existentes na coluna que cont&eacute;m os valores para o filtro<br>
20 20 O tema pode ter par&acirc;metros j&aacute; armazenados no METADATA animagif, criado pelo formul&aacute;rio do i3Geo.
21 21 Para for&ccedil;ar o uso desses par&acirc;metros, basta passar &colunat como vazio.
... ... @@ -28,6 +28,8 @@ if(empty($_GET)){
28 28 include("../../ms_configura.php");
29 29 include("../../classesphp/funcoes_gerais.php");
30 30 include("../../classesphp/carrega_ext.php");
  31 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  32 +$_GET = array_merge($_GET,$_POST);
31 33 //
32 34 //verifica se existem parametros definidos no proprio mapfile
33 35 //
... ... @@ -50,8 +52,19 @@ if(empty($_GET[&quot;colunat&quot;])){
50 52 $_GET["nulos"] = $animagif["nulos"];
51 53 $_GET["tipocolunat"] = $animagif["tipocolunat"];
52 54 }
53   -
54   -include("../../classesphp/pega_variaveis.php");
  55 +//podem vir da url tbm
  56 +$tema = $_GET["tema"];
  57 +$colunat = $_GET["colunat"];
  58 +$tempo = $_GET["tempo"];
  59 +$w = $_GET["w"];
  60 +$h = $_GET["h"];
  61 +$cache = $_GET["cache"];
  62 +$mapext = $_GET["mapext"];
  63 +$legenda = $_GET["legenda"];
  64 +$transparente = $_GET["transparente"];
  65 +$operador = $_GET["operador"];
  66 +$nulos = $_GET["nulos"];
  67 +$tipocolunat = $_GET["tipocolunat"];
55 68  
56 69 $v = versao();
57 70 $vi = $v["inteiro"];
... ... @@ -62,6 +75,7 @@ if($cache == &quot;nao&quot;){
62 75 } else {
63 76 $nometemp = md5(implode("",$_GET));
64 77 }
  78 +$nometemp = "animagif".$nometemp;
65 79 if(empty($tempo)){
66 80 $tempo = 40;
67 81 }
... ... @@ -83,11 +97,13 @@ if(empty($operador)){
83 97 else{
84 98 if($operador == "lt"){
85 99 $operador = "<";
86   - }
87   - if($operador == "gt"){
  100 + } elseif ($operador == "gt"){
88 101 $operador = ">";
89 102 }
90 103 }
  104 +if(!in_array($operador,array("=","<",">"))){
  105 + exit;
  106 +}
91 107  
92 108 $nulos = explode(",",$nulos);
93 109 $arqtemp = $dir_tmp."/".$nometemp;
... ... @@ -115,6 +131,7 @@ $versao = versao();
115 131 $versao = $versao["principal"];
116 132  
117 133 //cria um mapa temporario
  134 +//base vem de ms_configura
118 135 if($base == "" or !isset($base)){
119 136 $base = "";
120 137 if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')){
... ... @@ -202,7 +219,6 @@ for ($i=0;$i &lt; $numlayers;$i++){
202 219 }
203 220  
204 221 $mapa->save($arqtemp.".map");
205   -
206 222 //aplica a extensao geografica
207 223 $layer = $mapa->getlayerbyname($tema);
208 224  
... ... @@ -257,7 +273,7 @@ if($transparente == &quot;sim&quot;){
257 273  
258 274 $mapa->save($arqtemp.".map");
259 275 $mapa = ms_newMapObj($arqtemp.".map");
260   -restauraCon($arqtemp,$postgis_mapa);
  276 +restauraCon($arqtemp.".map",$postgis_mapa);
261 277  
262 278 /*
263 279 if(validaAcessoTemas($arqtemp.".map",false) == true){
... ...
ferramentas/aplicarsld/upload.php
  Diff comments   View file @60ac62e
1 1 <?php
2   -require_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  2 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
3 3 require_once(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php");
4 4 include_once (dirname(__FILE__)."/../../classesphp/carrega_ext.php");
5 5 error_reporting(0);
  6 +$_GET = array_merge($_GET,$_POST);
6 7 session_name("i3GeoPHP");
7   -if (isset($g_sid))
8   -{session_id($g_sid);}
  8 +if (isset($_GET["g_sid"]))
  9 +{session_id($_GET["g_sid"]);}
9 10 session_start();
10 11 $map_file = $_SESSION["map_file"];
11 12 $postgis_mapa = $_SESSION["postgis_mapa"];
12 13 require_once (dirname(__FILE__)."/../../ms_configura.php");
  14 +$tema = $_GET["tema"];
13 15 ?>
14 16 <html>
15 17 <head>
... ... @@ -42,7 +44,7 @@ if (isset($_FILES[&#39;i3GEOaplicarsld&#39;][&#39;name&#39;]))
42 44 {
43 45 echo "<p class='paragrafo' >Arquivo enviado. Aplicando SLD...$tema</p>";
44 46 $layer = $mapa->getlayerbyname($tema);
45   - $arq = $dirmap."/".$_FILES['i3GEOaplicarsld']['name'];
  47 + $arq = $dirmap."/".$ArquivoDest;
46 48 $abre = fopen($arq, "r");
47 49 $buffer = fread($abre, filesize($arq));
48 50 fclose($abre);
... ...
ferramentas/buscafotos/funcoes.php
  Diff comments   View file @60ac62e
1 1 <?php
2 2 error_reporting(0);
3   -require_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  3 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  4 +$_GET = array_merge($_GET,$_POST);
4 5 require_once(dirname(__FILE__)."/../../pacotes/cpaint/cpaint2.inc.php");
5 6 require_once(dirname(__FILE__)."/../../ms_configura.php");
6 7 require_once(dirname(__FILE__)."/../../pacotes/phpflickr/phpFlickr.php");
7 8 error_reporting(0);
  9 +
  10 +
  11 +$funcao = $_GET["funcao"];
  12 +$key = $_GET["key"];
  13 +$texto = $_GET["texto"];
  14 +$page = $_GET["page"];
  15 +$ret = $_GET["ret"];
  16 +$ai = $_GET["ai"];
  17 +$af = $_GET["af"];
  18 +
8 19 $cp = new cpaint();
9 20 if($funcao == "listafotosflickr")
10 21 {$cp->register('listafotosflickr');}
... ...
ferramentas/buscarapida/gadget.php
  Diff comments   View file @60ac62e
1 1 <?php
  2 +return;
2 3 include_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
3 4 include_once(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php");
4 5 $projecao = pegaProjecaoDefault("epsg");
... ...
ferramentas/carregamapa/upload.php
  Diff comments   View file @60ac62e
... ... @@ -72,6 +72,7 @@ if (isset($_FILES[&#39;i3GEOcarregamapafilemap&#39;][&#39;name&#39;]))
72 72 $layertemp->setmetadata("download","nao");
73 73 $layertemp->setmetadata("permitekml","nao");
74 74 $layertemp->setmetadata("permiteogc","nao");
  75 + $layertemp->setmetadata("animagif","");
75 76 $layertemp->setmetadata("editorsql","nao");
76 77 $layertemp->setmetadata("EDITAVEL","nao");
77 78 $layertemp->setmetadata("PLUGINI3GEO","");
... ...
ferramentas/cesium/kml3d.php
  Diff comments   View file @60ac62e
1 1 <?php
2 2 include("../../ms_configura.php");
3   -include("../../classesphp/pega_variaveis.php");
  3 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  4 +$_GET = array_merge($_GET,$_POST);
4 5 include("../../classesphp/funcoes_gerais.php");
  6 +$kmlurl = $_GET ["kmlurl"];
  7 +$legenda = $_GET ["legenda"];
5 8 //define o centro, pegando as coordenadas do mapa de inicializacao
6 9 $versao = versao();
7 10 $versao = $versao["principal"];
8 11 $centroX = -55;
9 12 $centroY = -13;
10 13 $extensao = "-180,-90,180,90";
11   -if(!isset($mapext)){
  14 +if(!isset($_GET["mapext"])){
12 15 if(isset($base) && $base != ""){
13 16 if(file_exists($base)){
14 17 $f = $base;
... ... @@ -49,10 +52,10 @@ if(!isset($mapext)){
49 52 }
50 53 }
51 54 else{
52   - $c = explode(" ",$mapext);
  55 + $c = explode(" ",$_GET["mapext"]);
53 56 $centroX = $c[2] - ($c[2] - $c[0]) / 2;
54 57 $centroY = $c[3] - ($c[3] - $c[1]) / 2;
55   - $extensao = $c[0].",".$c[1].",".$c[2].",".$c[3];
  58 + $extensao = $c[0].",".$c[1].",".$c[2].",".$c[3];
56 59 }
57 60 ?>
58 61 <!DOCTYPE html>
... ... @@ -127,13 +130,7 @@ body {
127 130 if('<?php echo $kmlurl;?>' != ''){
128 131 viewer.dataSources.add(Cesium.KmlDataSource.load('<?php echo strip_tags($kmlurl);?>'))
129 132 }
130   - /*
131   - var center = Cesium.Cartesian3.fromDegrees(<?php echo $centroX.",".$centroY;?>);
132   - var transform = Cesium.Transforms.eastNorthUpToFixedFrame(center);
133   - var camera = viewer.camera;
134   - camera.constrainedAxis = Cesium.Cartesian3.UNIT_Z;
135   - camera.lookAtTransform(transform, new Cesium.Cartesian3(0,0, 12000000.0));
136   - */
  133 +
137 134 </script>
138 135 </body>
139 136 </html>
... ...
ferramentas/colourramp/index.php
  Diff comments   View file @60ac62e
1 1 <?php
2   - include_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  2 + include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  3 + $_GET = array_merge($_GET,$_POST);
3 4 include_once(dirname(__FILE__)."/../../classesphp/class.palette.php");
4 5 $m = new palette();
5 6 $lista = implode(",",($m->listaColourRamps(dirname(__FILE__)."/../..")));
6 7 if(!isset($ncores))
7 8 {$ncores = 10;}
8   - if(empty($locaplic)){
  9 + if(empty($_GET["locaplic"])){
9 10 $locaplic = "../..";
10 11 }
11 12 ?>
... ... @@ -106,7 +107,7 @@ p .boom {
106 107 </head>
107 108 <body class=" yui-skin-sam" style="margin:0px;width:253px;" >
108 109 <p class=paragrafo style="position:relative;left:6px;width:100%;" >
109   -Quantas cores voc&ecirc; quer gerar? <input id=ncores type=text size=3 value=<?php echo $ncores; ?> /><br>
  110 +Quantas cores voc&ecirc; quer gerar? <input id=ncores type=text size=3 value=<?php echo $_GET["ncores"]; ?> /><br>
110 111 Clique para escolher o modelo de cores
111 112 </p>
112 113 <div id="imagens" ></div>
... ... @@ -129,7 +130,7 @@ new YAHOO.widget.Button(
129 130 {onclick:{fn: function(){aplicarCores();}}}
130 131 );
131 132 $i("voltar-button").style.width = "250px"
132   -var lista = "<?php echo $lista;?>";
  133 +var lista = "<?php echo $_GET["lista"];?>";
133 134 lista = lista.split(",");
134 135 var n = lista.length;
135 136 var ins = "";
... ...
ferramentas/googlemaps1/endereco.php
  Diff comments   View file @60ac62e
1 1 <?php
  2 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
2 3 include(dirname(__FILE__)."/../../ms_configura.php");
3   -include_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  4 +$_GET = array_merge($_GET,$_POST);
  5 +$x = $_GET["x"];
  6 +$y = $_GET["y"];
  7 +
4 8 ?>
5 9 <html>
6 10 <head>
... ...
ferramentas/imprimir/a4lpaisagempdf.php
  Diff comments   View file @60ac62e
... ... @@ -2,11 +2,13 @@
2 2 //
3 3 //escrito por Luis Henrique Weirich de Matos
4 4 //
5   -require_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  5 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  6 +$_GET = array_merge($_GET,$_POST);
  7 +$mapexten = $_GET["mapexten"];
6 8 error_reporting(0);
7 9 session_name("i3GeoPHP");
8   -if (isset($g_sid))
9   -{session_id($g_sid);}
  10 +if (isset($_GET["g_sid"]))
  11 +{session_id($_GET["g_sid"]);}
10 12 session_start();
11 13 $map_file = $_SESSION["map_file"];
12 14 $postgis_mapa = $_SESSION["postgis_mapa"];
... ... @@ -125,7 +127,9 @@ $nomer = ($imgo-&gt;imagepath).&quot;leg&quot;.$nomeImagem.&quot;.PNG&quot;;
125 127 $imgo->saveImage($nomer);
126 128 $pathlegenda = $dir_tmp."/".basename($imgo->imageurl)."/".basename($nomer);
127 129 $titulo = $_GET['titulo'];
  130 +
128 131 substituiCon($map_file,$postgis_mapa);
  132 +
129 133 require(dirname(__FILE__).'/../../pacotes/fpdf/fpdf.php');
130 134 $pdf = new FPDF("L","mm","A4");
131 135 $pdf->SetAutoPageBreak(false);
... ...
ferramentas/imprimir/aggpng.php
  Diff comments   View file @60ac62e
... ... @@ -29,11 +29,13 @@ GNU junto com este programa; se n&amp;atilde;o, escreva para a
29 29 Free Software Foundation, Inc., no endere&ccedil;o
30 30 59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
31 31 */
32   -require_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  32 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  33 +$_GET = array_merge($_GET,$_POST);
  34 +$mapexten = $_GET["mapexten"];
33 35 error_reporting(0);
34 36 session_name("i3GeoPHP");
35   -if (isset($g_sid))
36   -{session_id($g_sid);}
  37 +if (isset($_GET["g_sid"]))
  38 +{session_id($_GET["g_sid"]);}
37 39 session_start();
38 40 $map_file = $_SESSION["map_file"];
39 41 $postgis_mapa = $_SESSION["postgis_mapa"];
... ...
ferramentas/imprimir/geotif.php
  Diff comments   View file @60ac62e
... ... @@ -29,11 +29,14 @@ GNU junto com este programa; se n&amp;atilde;o, escreva para a
29 29 Free Software Foundation, Inc., no endere&ccedil;o
30 30 59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
31 31 */
32   -require_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  32 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  33 +$_GET = array_merge($_GET,$_POST);
  34 +$mapexten = $_GET["mapexten"];
33 35 error_reporting(0);
34 36 session_name("i3GeoPHP");
35   -if (isset($g_sid))
36   -{session_id($g_sid);}
  37 +if (isset($_GET["g_sid"]))
  38 +{session_id($_GET["g_sid"]);}
  39 +
37 40 session_start();
38 41 $map_file = $_SESSION["map_file"];
39 42 $postgis_mapa = $_SESSION["postgis_mapa"];
... ...
ferramentas/imprimir/geraimagens.php
  Diff comments   View file @60ac62e
1 1 <?php
2   -require_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  2 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  3 +$_GET = array_merge($_GET,$_POST);
  4 +$mapexten = $_GET["mapexten"];
3 5 error_reporting(0);
4 6 session_name("i3GeoPHP");
5   -if (isset($g_sid))
6   -{session_id($g_sid);}
  7 +if (isset($_GET["g_sid"]))
  8 +{session_id($_GET["g_sid"]);}
  9 +
7 10 session_start();
8 11 $map_file = $_SESSION["map_file"];
9 12 $postgis_mapa = $_SESSION["postgis_mapa"];
... ...
ferramentas/imprimir/jpeg.php
  Diff comments   View file @60ac62e
... ... @@ -29,11 +29,13 @@ GNU junto com este programa; se n&amp;atilde;o, escreva para a
29 29 Free Software Foundation, Inc., no endere&ccedil;o
30 30 59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
31 31 */
32   -require_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  32 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  33 +$_GET = array_merge($_GET,$_POST);
  34 +$mapexten = $_GET["mapexten"];
33 35 error_reporting(0);
34 36 session_name("i3GeoPHP");
35   -if (isset($g_sid))
36   -{session_id($g_sid);}
  37 +if (isset($_GET["g_sid"]))
  38 +{session_id($_GET["g_sid"]);}
37 39 session_start();
38 40 $map_file = $_SESSION["map_file"];
39 41 $postgis_mapa = $_SESSION["postgis_mapa"];
... ...
ferramentas/imprimir/svg.php
  Diff comments   View file @60ac62e
... ... @@ -29,11 +29,13 @@ GNU junto com este programa; se n&amp;atilde;o, escreva para a
29 29 Free Software Foundation, Inc., no endere&ccedil;o
30 30 59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
31 31 */
32   -require_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  32 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  33 +$_GET = array_merge($_GET,$_POST);
  34 +$mapexten = $_GET["mapexten"];
33 35 error_reporting(0);
34 36 session_name("i3GeoPHP");
35   -if (isset($g_sid))
36   -{session_id($g_sid);}
  37 +if (isset($_GET["g_sid"]))
  38 +{session_id($_GET["g_sid"]);}
37 39 session_start();
38 40 $map_file = $_SESSION["map_file"];
39 41 $postgis_mapa = $_SESSION["postgis_mapa"];
... ...
ferramentas/imprimir/swf.php
  Diff comments   View file @60ac62e
1 1 <?php
2   -require_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  2 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  3 +$_GET = array_merge($_GET,$_POST);
3 4 error_reporting(0);
4 5 session_name("i3GeoPHP");
5   -if (isset($g_sid))
6   -{session_id($g_sid);}
  6 +if (isset($_GET["g_sid"]))
  7 +{session_id($_GET["g_sid"]);}
7 8 session_start();
8 9  
9 10 $map_file = $_SESSION["map_file"];
... ...
ferramentas/metar/metarextensao.php
  Diff comments   View file @60ac62e
... ... @@ -36,10 +36,11 @@ Return:
36 36 */
37 37 //set_time_limit(600);
38 38 require_once(dirname(__FILE__)."/../../pacotes/cpaint/cpaint2.inc.php");
39   -require_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  39 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  40 +$_GET = array_merge($_GET,$_POST);
40 41 require_once(dirname(__FILE__)."/../../classesphp/carrega_ext.php");
41 42 error_reporting(0);
42   -$e = explode(" ",$ret);
  43 +$e = explode(" ",$_GET["ret"]);
43 44 $url = "http://ws.geonames.org/weatherJSON?username=i3geo&lang=pt&north=".$e[3]."&south=".$e[1]."&east=".$e[2]."&west=".$e[0]."&maxRows=10";
44 45 $s = file($url);
45 46 header("Content-type: text/ascii; charset=UTF-8");
... ...
ferramentas/metar/metarproxima.php
  Diff comments   View file @60ac62e
... ... @@ -45,7 +45,10 @@ echo &quot;&lt;html&gt;&lt;style&gt;
45 45 P
46 46 {padding-top:1px;COLOR: #2F4632;text-align: justify;font-size: 12px;font-family: Verdana, Arial, Helvetica, sans-serif;}
47 47 </style>";
48   -require_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  48 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  49 +$_GET = array_merge($_GET,$_POST);
  50 +$y = $_GET["y"];
  51 +$x = $_GET["x"];
49 52 error_reporting(0);
50 53 $url = "http://ws.geonames.org/findNearByWeatherXML?username=i3geo&lat=$y&lng=$x&lang=pt";
51 54  
... ...
ferramentas/recline/default.php
  Diff comments   View file @60ac62e
1 1 <?php
2 2 //pega a extensao geografica da camada
  3 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  4 +$_GET = array_merge($_GET,$_POST);
3 5 include("../../ms_configura.php");
4   -include("../../classesphp/pega_variaveis.php");
5 6 include("../../classesphp/funcoes_gerais.php");
6 7 $versao = versao();
7 8 $versao = $versao["principal"];
... ...
ferramentas/recline/tabela.php
  Diff comments   View file @60ac62e
... ... @@ -5,8 +5,9 @@
5 5 //
6 6  
7 7 //pega a extensao geografica da camada
  8 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  9 +$_GET = array_merge($_GET,$_POST);
8 10 include("../../ms_configura.php");
9   -include("../../classesphp/pega_variaveis.php");
10 11 ?>
11 12 <!DOCTYPE html>
12 13 <html lang="en">
... ...
ferramentas/scielo/funcoes.php
  Diff comments   View file @60ac62e
1 1 <?php
2 2 error_reporting(0);
3   -require_once("../../classesphp/pega_variaveis.php");
  3 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  4 +$_GET = array_merge($_GET,$_POST);
  5 +$ret = $_GET["ret"];
  6 +$servico = $_GET["servico"];
4 7 require_once("../../pacotes/cpaint/cpaint2.inc.php");
5 8 require_once("../../ms_configura.php");
6 9 require_once("../../pacotes/phpxbase/api_conversion.php");
... ...
ferramentas/tabela/relatorio.php
  Diff comments   View file @60ac62e
... ... @@ -7,18 +7,28 @@
7 7 </head>
8 8 <?php
9 9 session_name("i3GeoPHP");
10   -if (isset($g_sid))
11   -{session_id($g_sid);}
  10 +
  11 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  12 +$_GET = array_merge($_GET,$_POST);
  13 +
  14 +$nomesrel = $_GET["nomesrel"];
  15 +$ordemrel = $_GET["ordemrel"];
  16 +$itensrel = $_GET["itensrel"];
  17 +$itemagruparel = $_GET["itemagruparel"];
  18 +
  19 +if (isset($_GET["g_sid"]))
  20 +{session_id($_GET["g_sid"]);}
12 21 session_start();
13   -include(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  22 +
14 23 $map_file = $_SESSION["map_file"];
15 24 $postgis_mapa = $_SESSION["postgis_mapa"];
  25 +
16 26 include (dirname(__FILE__)."/../../ms_configura.php");
17 27 include(dirname(__FILE__)."/../../classesphp/carrega_ext.php");
18 28 include(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php");
19 29 $versao = versao();
20 30 $versao = $versao["principal"];
21   -substituiCon($map_file,$postgis_mapa);
  31 +
22 32 $temp = explode(",",$nomesrel);
23 33 $colunasTemp = array();
24 34 foreach($temp as $t){
... ... @@ -61,8 +71,9 @@ foreach($temp as $t)
61 71 }
62 72 if($itemagruparel != "" && !in_array($itemagruparel,$itensrel))
63 73 {$itensrel[] = $itemagruparel;}
  74 +
64 75 $mapa = ms_newMapObj($map_file);
65   -substituiCon($temp,$postgis_mapa);
  76 +substituiConObj($temp,$postgis_mapa);
66 77 if($ext && $ext != ""){
67 78 $e = explode(" ",$ext);
68 79 $extatual = $mapa->extent;
... ...
ferramentas/wiki/funcoes.php
  Diff comments   View file @60ac62e
... ... @@ -2,7 +2,9 @@
2 2 $usuarioGeonames = "i3geo";
3 3 //set_time_limit(600);
4 4 require_once(dirname(__FILE__)."/../../pacotes/cpaint/cpaint2.inc.php");
5   -require_once(dirname(__FILE__)."/../../classesphp/pega_variaveis.php");
  5 +include_once (dirname(__FILE__)."/../../classesphp/sani_request.php");
  6 +$_GET = array_merge($_GET,$_POST);
  7 +$ret = $_GET["ret"];
6 8 require_once(dirname(__FILE__)."/../../classesphp/carrega_ext.php");
7 9 error_reporting(0);
8 10 $cp = new cpaint();
... ...