Download as
Browse Code »

Commit eb8ea972c3b37e6400b2eba86c27b901597bcffa

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

Correção na abertura do SAIKU quando fora do mapa do i3Geo

Showing 3 changed files with 13 additions and 10 deletions   Show diff stats
ferramentas/saiku/esquemaxml.php
  Diff comments   View file @eb8ea97
1 <?php 1 <?php
  2 +//quando o saiku e iniciado de fora do i3geo, e necessario inicializar um mapfile para uso como base dos mapas
  3 +if(empty($_GET["g_sid"])){
  4 + include(dirname(__FILE__)."/../../ms_criamapa.php");
  5 + //reinicia a url
  6 + $urln = "?g_sid=".session_id()."&locaplic=".$_GET["locaplic"]."&mapext=".$mapext;
  7 + header("Location:".$urln);
  8 + exit;
  9 +}
2 10
3 include(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php"); 11 include(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php");
4 include(dirname(__FILE__)."/../../admin/php/classe_metaestat.php"); 12 include(dirname(__FILE__)."/../../admin/php/classe_metaestat.php");
@@ -8,15 +16,6 @@ if(!isset($dir_tmp)){ @@ -8,15 +16,6 @@ if(!isset($dir_tmp)){
8 $nomeConexao = nomeRandomico(); 16 $nomeConexao = nomeRandomico();
9 $nomeDatasource = $dir_tmp."/saiku-datasources/".$nomeConexao; 17 $nomeDatasource = $dir_tmp."/saiku-datasources/".$nomeConexao;
10 18
11 -//quando o saiku e iniciado de fora do i3geo, e necessario inicializar um mapfile para uso como base dos mapas  
12 -if(empty($_GET["g_sid"])){  
13 - include(dirname(__FILE__)."/../../ms_criamapa.php");  
14 - //reinicia a url  
15 - $urln = "?g_sid=".session_id();  
16 - header("Location:".$urln);  
17 - exit;  
18 -}  
19 -  
20 //pega a sessao PHP aberta pelo i3Geo ou ms_criamapa.php 19 //pega a sessao PHP aberta pelo i3Geo ou ms_criamapa.php
21 session_name("i3GeoPHP"); 20 session_name("i3GeoPHP");
22 session_id($_GET["g_sid"]); 21 session_id($_GET["g_sid"]);
init/index.php
  Diff comments   View file @eb8ea97
@@ -177,7 +177,7 @@ botoesIni.push({ @@ -177,7 +177,7 @@ botoesIni.push({
177 "titulo":$trad(12,g_traducao_init) 177 "titulo":$trad(12,g_traducao_init)
178 },{ 178 },{
179 "img":"../imagens/saiku_free_small.png", 179 "img":"../imagens/saiku_free_small.png",
180 - "href":"../ferramentas/saiku/esquemaxml.php", 180 + "href":"../ferramentas/saiku/esquemaxml.php?locaplic="+window.location.href.replace("/init/index.php",""),
181 "titulo":$trad(25,g_traducao_init) 181 "titulo":$trad(25,g_traducao_init)
182 },{ 182 },{
183 "img":"../imagens/gvsig.jpg", 183 "img":"../imagens/gvsig.jpg",
ms_criamapa.php
  Diff comments   View file @eb8ea97
@@ -446,6 +446,10 @@ if ((isset($mapext)) &amp;&amp; ($mapext != &quot;&quot;)) @@ -446,6 +446,10 @@ if ((isset($mapext)) &amp;&amp; ($mapext != &quot;&quot;))
446 if (count($newext) == 4) 446 if (count($newext) == 4)
447 {$ext->setextent($newext[0], $newext[1], $newext[2], $newext[3]);} 447 {$ext->setextent($newext[0], $newext[1], $newext[2], $newext[3]);}
448 } 448 }
  449 +else{
  450 + //algumas aplicacoes usam essa variavel (SAIKU)
  451 + $mapext = $ext->minx." ".$ext->miny." ".$ext->maxx." ".$ext->maxy;
  452 +}
449 /* 453 /*
450 Configura os endere&ccedil;os corretos no mapfile. 454 Configura os endere&ccedil;os corretos no mapfile.
451 455