diff --git a/admin/admin.db b/admin/admin.db index b4b93c1..e42f2c4 100755 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/classesphp/mapa_googleearth.php b/classesphp/mapa_googleearth.php index dbf55b7..710a83f 100755 --- a/classesphp/mapa_googleearth.php +++ b/classesphp/mapa_googleearth.php @@ -62,6 +62,9 @@ if(!isset($_SESSION["map_file"])) // $map_fileX = $_SESSION["map_file"]; $postgis_mapa = $_SESSION["postgis_mapa"]; +//por seguranca +include_once("funcoes_gerais.php"); +restauraCon($map_fileX,$postgis_mapa); if($_GET["REQUEST"] == "GetKml") {retornaKml();} diff --git a/classesphp/mapa_googlemaps.php b/classesphp/mapa_googlemaps.php index f627d01..a99b7cb 100755 --- a/classesphp/mapa_googlemaps.php +++ b/classesphp/mapa_googlemaps.php @@ -89,7 +89,6 @@ else{ if(!isset($_SESSION["map_file"])){ exit; } - $map_fileX = $_SESSION["map_file"]; $postgis_mapa = $_SESSION["postgis_mapa"]; $cachedir = $_SESSION["cachedir"]; @@ -144,6 +143,9 @@ elseif ($_GET["X"] != ""){ elseif(isset($_GET["BBOX"])){ $_GET["mapext"] = str_replace(","," ",$_GET["BBOX"]); } +//por seguranca +include_once("funcoes_gerais.php"); +restauraCon($map_fileX,$postgis_mapa); $mapa = ms_newMapObj($map_fileX); $ret = $mapa->extent; @@ -196,9 +198,6 @@ if(!isset($_GET["telaR"])){ $l->set("minscaledenom",$l->minscaledenom * 100000); $l->set("symbolscaledenom",$l->symbolscaledenom * 100000); if ($l->getmetadata("classesnome") != ""){ - if(!function_exists("autoClasses")){ - include_once("funcoes_gerais.php"); - } autoClasses($l,$mapa); } if(!empty($postgis_mapa)){ diff --git a/classesphp/mapa_openlayers.php b/classesphp/mapa_openlayers.php index 0194845..fc7ad3f 100755 --- a/classesphp/mapa_openlayers.php +++ b/classesphp/mapa_openlayers.php @@ -155,7 +155,6 @@ else{ carregaCacheImagem($_SESSION["cachedir"],$_SESSION["map_file"],$_GET["tms"],$_SESSION["i3georendermode"]); } } - // //map_fileX e para o caso register_globals = On no PHP.INI // @@ -163,6 +162,11 @@ if(isset($_GET["tipolayer"]) && $_GET["tipolayer"] == "fundo"){ $map_fileX = str_replace(".map","fundo.map",$map_fileX); } $postgis_mapa = $_SESSION["postgis_mapa"]; + +//por seguranca +include_once("funcoes_gerais.php"); +restauraCon($map_fileX,$postgis_mapa); + $cachedir = $_SESSION["cachedir"]; if(isset($_GET["BBOX"])){ $_GET["mapext"] = str_replace(","," ",$_GET["BBOX"]); -- libgit2 0.21.2