Download as
Browse Code »

Commit 42c7bb86fa1f65c7b4fe1defdf0bd70ab2ad7cdb

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

atualizacao do classesphp

Showing 4 changed files with 11 additions and 5 deletions   Show diff stats
admin/admin.db
View file @42c7bb8
No preview for this file type
classesphp/mapa_googleearth.php
  Diff comments   View file @42c7bb8
@@ -62,6 +62,9 @@ if(!isset($_SESSION["map_file"])) @@ -62,6 +62,9 @@ if(!isset($_SESSION["map_file"]))
62 // 62 //
63 $map_fileX = $_SESSION["map_file"]; 63 $map_fileX = $_SESSION["map_file"];
64 $postgis_mapa = $_SESSION["postgis_mapa"]; 64 $postgis_mapa = $_SESSION["postgis_mapa"];
  65 +//por seguranca
  66 +include_once("funcoes_gerais.php");
  67 +restauraCon($map_fileX,$postgis_mapa);
65 68
66 if($_GET["REQUEST"] == "GetKml") 69 if($_GET["REQUEST"] == "GetKml")
67 {retornaKml();} 70 {retornaKml();}
classesphp/mapa_googlemaps.php
  Diff comments   View file @42c7bb8
@@ -89,7 +89,6 @@ else{ @@ -89,7 +89,6 @@ else{
89 if(!isset($_SESSION["map_file"])){ 89 if(!isset($_SESSION["map_file"])){
90 exit; 90 exit;
91 } 91 }
92 -  
93 $map_fileX = $_SESSION["map_file"]; 92 $map_fileX = $_SESSION["map_file"];
94 $postgis_mapa = $_SESSION["postgis_mapa"]; 93 $postgis_mapa = $_SESSION["postgis_mapa"];
95 $cachedir = $_SESSION["cachedir"]; 94 $cachedir = $_SESSION["cachedir"];
@@ -144,6 +143,9 @@ elseif ($_GET["X"] != ""){ @@ -144,6 +143,9 @@ elseif ($_GET["X"] != ""){
144 elseif(isset($_GET["BBOX"])){ 143 elseif(isset($_GET["BBOX"])){
145 $_GET["mapext"] = str_replace(","," ",$_GET["BBOX"]); 144 $_GET["mapext"] = str_replace(","," ",$_GET["BBOX"]);
146 } 145 }
  146 +//por seguranca
  147 +include_once("funcoes_gerais.php");
  148 +restauraCon($map_fileX,$postgis_mapa);
147 149
148 $mapa = ms_newMapObj($map_fileX); 150 $mapa = ms_newMapObj($map_fileX);
149 $ret = $mapa->extent; 151 $ret = $mapa->extent;
@@ -196,9 +198,6 @@ if(!isset($_GET["telaR"])){ @@ -196,9 +198,6 @@ if(!isset($_GET["telaR"])){
196 $l->set("minscaledenom",$l->minscaledenom * 100000); 198 $l->set("minscaledenom",$l->minscaledenom * 100000);
197 $l->set("symbolscaledenom",$l->symbolscaledenom * 100000); 199 $l->set("symbolscaledenom",$l->symbolscaledenom * 100000);
198 if ($l->getmetadata("classesnome") != ""){ 200 if ($l->getmetadata("classesnome") != ""){
199 - if(!function_exists("autoClasses")){  
200 - include_once("funcoes_gerais.php");  
201 - }  
202 autoClasses($l,$mapa); 201 autoClasses($l,$mapa);
203 } 202 }
204 if(!empty($postgis_mapa)){ 203 if(!empty($postgis_mapa)){
classesphp/mapa_openlayers.php
  Diff comments   View file @42c7bb8
@@ -155,7 +155,6 @@ else{ @@ -155,7 +155,6 @@ else{
155 carregaCacheImagem($_SESSION["cachedir"],$_SESSION["map_file"],$_GET["tms"],$_SESSION["i3georendermode"]); 155 carregaCacheImagem($_SESSION["cachedir"],$_SESSION["map_file"],$_GET["tms"],$_SESSION["i3georendermode"]);
156 } 156 }
157 } 157 }
158 -  
159 // 158 //
160 //map_fileX e para o caso register_globals = On no PHP.INI 159 //map_fileX e para o caso register_globals = On no PHP.INI
161 // 160 //
@@ -163,6 +162,11 @@ if(isset($_GET["tipolayer"]) && $_GET["tipolayer"] == "fundo"){ @@ -163,6 +162,11 @@ if(isset($_GET["tipolayer"]) && $_GET["tipolayer"] == "fundo"){
163 $map_fileX = str_replace(".map","fundo.map",$map_fileX); 162 $map_fileX = str_replace(".map","fundo.map",$map_fileX);
164 } 163 }
165 $postgis_mapa = $_SESSION["postgis_mapa"]; 164 $postgis_mapa = $_SESSION["postgis_mapa"];
  165 +
  166 +//por seguranca
  167 +include_once("funcoes_gerais.php");
  168 +restauraCon($map_fileX,$postgis_mapa);
  169 +
166 $cachedir = $_SESSION["cachedir"]; 170 $cachedir = $_SESSION["cachedir"];
167 if(isset($_GET["BBOX"])){ 171 if(isset($_GET["BBOX"])){
168 $_GET["mapext"] = str_replace(","," ",$_GET["BBOX"]); 172 $_GET["mapext"] = str_replace(","," ",$_GET["BBOX"]);