diff --git a/admin/php/login.php b/admin/php/login.php index d39d18e..c5c3053 100755 --- a/admin/php/login.php +++ b/admin/php/login.php @@ -73,6 +73,7 @@ if(!empty($_POST["usuario"]) && !empty($_POST["senha"])){ session_regenerate_id(); $_SESSION = array(); session_start(); + $funcao = "login"; } else{//se nao, verifica se o login ja existe realmente if(!empty($_COOKIE["i3geocodigologin"])){ @@ -80,10 +81,12 @@ else{//se nao, verifica se o login ja existe realmente session_start(); if($_SESSION["usuario"] != $_COOKIE["i3geousuariologin"]){ logoutUsuario(); + cpjson("logout"); } } else{//caso nao exista, retorna um erro - $retorno = "erro"; + logoutUsuario(); + cpjson("erro"); } } //var_dump($_SESSION);exit; diff --git a/init/index.js b/init/index.js index c9c84b2..0be6262 100755 --- a/init/index.js +++ b/init/index.js @@ -1,21 +1,21 @@ botoesIni = [ { "img":"openlayers", - "href": location.href.replace("init/index.php","") + customDir + "/black_ol.htm", + "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/black_ol.htm", "titulo":$trad(4,g_traducao_init), "subtitulo": $trad("4a",g_traducao_init), "fa": "map-o", "target": "_blank" },{ "img":"osm", - "href": location.href.replace("init/index.php","") + customDir + "/black_osm.htm", + "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/black_osm.htm", "titulo":$trad(23,g_traducao_init), "subtitulo": $trad("23a",g_traducao_init), "fa": "map-o", "target": "_blank" },{ "img":"googlemaps", - "href": location.href.replace("init/index.php","") + customDir + "/black_gm.phtml", + "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/black_gm.phtml", "titulo":$trad(6,g_traducao_init), "subtitulo": $trad("6a",g_traducao_init), "fa": "map-o", @@ -29,14 +29,14 @@ botoesIni = [ "target": "_self" },{ "img":"googleearth", - "href": location.href.replace("init/index.php","") + customDir + "/googleearth.phtml", + "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/googleearth.phtml", "titulo":$trad(7,g_traducao_init), "subtitulo": $trad("7a",g_traducao_init), "fa": "map-o", "target": "_blank" },{ "img":"cartogramas", - "href": location.href.replace("init/index.php","") + customDir + "/black_carto_ol.htm", + "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/black_carto_ol.htm", "titulo":$trad(8,g_traducao_init), "subtitulo": $trad("8a",g_traducao_init), "fa": "map-o", @@ -85,7 +85,7 @@ botoesIni = [ "target": "_self" },{ "img":"openlayersdebug", - "href": location.href.replace("init/index.php","") + customDir + "/openlayersdebug.htm", + "href": location.href.replace("init/index.php"+window.location.search,"") + customDir + "/openlayersdebug.htm", "titulo":$trad(5,g_traducao_init), "subtitulo": $trad("5a",g_traducao_init), "fa": "cogs", diff --git a/ms_criamapa.php b/ms_criamapa.php index 81611fe..2175368 100755 --- a/ms_criamapa.php +++ b/ms_criamapa.php @@ -287,7 +287,7 @@ if(!isset($dir_tmp)){ include_once (dirname(__FILE__)."/ms_configura.php"); } if(isset($logExec) && $logExec["init"] == true){ - i3GeoLog("ms_criamapa ".implode("&",array_merge($_GET,$_POST)),$_SESSION["dir_tmp"]); + i3GeoLog("prog: ms_criamapa url: ".implode("&",array_merge($_GET,$_POST)),$dir_tmp); } if(!empty($restauramapa)){ $base = restauraMapaAdmin($restauramapa,$dir_tmp); @@ -438,6 +438,7 @@ $_SESSION["expoeMapfile"] = $expoeMapfile; $_SESSION["googleApiKey"] = $googleApiKey_; $_SESSION["mensagemInicia"] = $mensagemInicia_; $_SESSION["interfacePadrao"] = $interfacePadrao_; +$_SESSION["logExec"] = $logExec_; if(isset($interface_)){ $_SESSION["interface"] = $interface_; } -- libgit2 0.21.2