Download as
Browse Code »

Commit c0e4147778971a5de801f7d815a227c34f13d09e

Authored by Edmar Moretti
1 parent ab540284
Exists in master

Permite ligar e desligar camadas nos mashups mesmo que o sattus do LAYER seja DEFAULT

Showing 2 changed files with 37 additions and 31 deletions   Show diff stats
mashups/openlayers.php
  Diff comments   View file @c0e4147
... ... @@ -9,19 +9,6 @@ include_once(dirname(__FILE__)."/../classesphp/sani_request.php");
9 9 include_once(dirname(__FILE__)."/../classesphp/carrega_ext.php");
10 10 include_once(dirname(__FILE__)."/../classesphp/funcoes_gerais.php");
11 11 error_reporting(0);
12   -//cria as pastas temporarias caso nao existam
13   -if (! file_exists ( $dir_tmp )) {
14   - @mkdir ( $dir_tmp, 0744 );
15   -}
16   -if (file_exists ( $dir_tmp )) {
17   - @mkdir ( $dir_tmp . "/comum", 0744 );
18   - @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );
19   - chmod ( $dir_tmp . "/saiku-datasources", 0744 );
20   - @mkdir ( $dir_tmp . "/cache", 0744 );
21   - chmod ( $dir_tmp . "/cache", 0744 );
22   - @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );
23   - chmod ( $dir_tmp . "/cache/googlemaps", 0744 );
24   -}
25 12 //variaveis utilizadas
26 13 $parurl = array_merge($_GET,$_POST);
27 14 $desligacache = $parurl["desligacache"];
... ... @@ -52,6 +39,20 @@ $ativalayerswicther = $parurl["ativalayerswicther"];
52 39 $ativarodadomouse = $parurl["ativarodadomouse"];
53 40 $legendahtml = $parurl["legendahtml"];
54 41 $nocache = $parurl["nocache"];
  42 +
  43 +//cria as pastas temporarias caso nao existam
  44 +if (! file_exists ( $dir_tmp )) {
  45 + @mkdir ( $dir_tmp, 0744 );
  46 +}
  47 +if (file_exists ( $dir_tmp )) {
  48 + @mkdir ( $dir_tmp . "/comum", 0744 );
  49 + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );
  50 + chmod ( $dir_tmp . "/saiku-datasources", 0744 );
  51 + @mkdir ( $dir_tmp . "/cache", 0744 );
  52 + chmod ( $dir_tmp . "/cache", 0744 );
  53 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );
  54 + chmod ( $dir_tmp . "/cache/googlemaps", 0744 );
  55 +}
55 56 if(!empty($desligacache)){
56 57 $DESLIGACACHE = $desligacache;
57 58 }
... ... @@ -312,8 +313,7 @@ if($temas != ""){
312 313 //ferramentas customizaveis e que seraco incluidas na propriedade do layer
313 314 //
314 315 $listaFerramentas = array("tme","storymap","animagif");
315   - $dadosTemas = pegaDadosAdminKey("SELECT codigo_tema,link_tema FROM __esq__i3geoadmin_temas WHERE codigo_tema IN('".implode($temas,',')."')","__esq__");
316   -
  316 + $dadosTemas = pegaDadosAdminKey("SELECT codigo_tema,link_tema FROM __esq__i3geoadmin_temas WHERE codigo_tema IN('".implode($temas,',')."')","__esq__");
317 317 foreach($temas as $tema){
318 318 //
319 319 //utilzado para obter os parametros de ferramentas especificas indicadas nos metadados do LAYER
... ... @@ -436,7 +436,8 @@ if($temas != ""){
436 436 $link_tema = $dadosTemas[$nomeLayer];
437 437 $link_tema = $link_tema["link_tema"];
438 438 $visivel = "false";
439   - if($l->status == MS_DEFAULT || in_array($tema,$visiveis)){
  439 + //if($l->status == MS_DEFAULT || in_array($tema,$visiveis)){
  440 + if(in_array($tema,$visiveis)){
440 441 $visivel = "true";
441 442 }
442 443 if($l->type != 2 && $l->type != 3){
... ...
mashups/osm.php
  Diff comments   View file @c0e4147
... ... @@ -9,19 +9,6 @@ include_once(dirname(__FILE__)."/../classesphp/sani_request.php");
9 9 include_once(dirname(__FILE__)."/../classesphp/carrega_ext.php");
10 10 include_once(dirname(__FILE__)."/../classesphp/funcoes_gerais.php");
11 11 error_reporting(0);
12   -//cria as pastas temporarias caso nao existam
13   -if (! file_exists ( $dir_tmp )) {
14   - @mkdir ( $dir_tmp, 0744 );
15   -}
16   -if (file_exists ( $dir_tmp )) {
17   - @mkdir ( $dir_tmp . "/comum", 0744 );
18   - @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );
19   - chmod ( $dir_tmp . "/saiku-datasources", 0744 );
20   - @mkdir ( $dir_tmp . "/cache", 0744 );
21   - chmod ( $dir_tmp . "/cache", 0744 );
22   - @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );
23   - chmod ( $dir_tmp . "/cache/googlemaps", 0744 );
24   -}
25 12 //variaveis utilizadas
26 13 $parurl = array_merge($_GET,$_POST);
27 14 $desligacache = $parurl["desligacache"];
... ... @@ -52,6 +39,20 @@ $ativalayerswicther = $parurl["ativalayerswicther"];
52 39 $ativarodadomouse = $parurl["ativarodadomouse"];
53 40 $legendahtml = $parurl["legendahtml"];
54 41 $nocache = $parurl["nocache"];
  42 +
  43 +//cria as pastas temporarias caso nao existam
  44 +if (! file_exists ( $dir_tmp )) {
  45 + @mkdir ( $dir_tmp, 0744 );
  46 +}
  47 +if (file_exists ( $dir_tmp )) {
  48 + @mkdir ( $dir_tmp . "/comum", 0744 );
  49 + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );
  50 + chmod ( $dir_tmp . "/saiku-datasources", 0744 );
  51 + @mkdir ( $dir_tmp . "/cache", 0744 );
  52 + chmod ( $dir_tmp . "/cache", 0744 );
  53 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );
  54 + chmod ( $dir_tmp . "/cache/googlemaps", 0744 );
  55 +}
55 56 if(!empty($desligacache)){
56 57 $DESLIGACACHE = $desligacache;
57 58 }
... ... @@ -267,6 +268,9 @@ if(isset($botoes)){
267 268 if(in_array("texto",$botoes)){
268 269 $objBotoes[] = "'texto':true";
269 270 }
  271 + if(in_array("novaaba",$botoes)){
  272 + $objBotoes[] = "'novaaba':true";
  273 + }
270 274 $botoes = "{".implode(",",$objBotoes)."}";
271 275 }
272 276  
... ... @@ -310,7 +314,6 @@ if($temas != ""){
310 314 //
311 315 $listaFerramentas = array("tme","storymap","animagif");
312 316 $dadosTemas = pegaDadosAdminKey("SELECT codigo_tema,link_tema FROM __esq__i3geoadmin_temas WHERE codigo_tema IN('".implode($temas,',')."')","__esq__");
313   -
314 317 foreach($temas as $tema){
315 318 //
316 319 //utilzado para obter os parametros de ferramentas especificas indicadas nos metadados do LAYER
... ... @@ -430,7 +433,8 @@ if($temas != ""){
430 433 $link_tema = $dadosTemas[$nomeLayer];
431 434 $link_tema = $link_tema["link_tema"];
432 435 $visivel = "false";
433   - if($l->status == MS_DEFAULT || in_array($tema,$visiveis)){
  436 + //if($l->status == MS_DEFAULT || in_array($tema,$visiveis)){
  437 + if(in_array($tema,$visiveis)){
434 438 $visivel = "true";
435 439 }
436 440 if($l->type != 2 && $l->type != 3){
... ... @@ -560,6 +564,7 @@ function ajuda(){
560 564 fecha
561 565 corta
562 566 legenda
  567 + novaaba
563 568  
564 569 Para ver a lista de códigos de temas, que podem ser utilizados no parâmetro 'temas', acesse:
565 570 <a href='../ogc.php?lista=temas' >lista de temas</a>. Os c&oacute;digos s&atilde;o mostrados em vermelho.
... ...