diff --git a/mashups/openlayers.php b/mashups/openlayers.php index 4e611e4..610c668 100755 --- a/mashups/openlayers.php +++ b/mashups/openlayers.php @@ -9,19 +9,6 @@ include_once(dirname(__FILE__)."/../classesphp/sani_request.php"); include_once(dirname(__FILE__)."/../classesphp/carrega_ext.php"); include_once(dirname(__FILE__)."/../classesphp/funcoes_gerais.php"); error_reporting(0); -//cria as pastas temporarias caso nao existam -if (! file_exists ( $dir_tmp )) { - @mkdir ( $dir_tmp, 0744 ); -} -if (file_exists ( $dir_tmp )) { - @mkdir ( $dir_tmp . "/comum", 0744 ); - @mkdir ( $dir_tmp . "/saiku-datasources", 0744 ); - chmod ( $dir_tmp . "/saiku-datasources", 0744 ); - @mkdir ( $dir_tmp . "/cache", 0744 ); - chmod ( $dir_tmp . "/cache", 0744 ); - @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 ); - chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); -} //variaveis utilizadas $parurl = array_merge($_GET,$_POST); $desligacache = $parurl["desligacache"]; @@ -52,6 +39,20 @@ $ativalayerswicther = $parurl["ativalayerswicther"]; $ativarodadomouse = $parurl["ativarodadomouse"]; $legendahtml = $parurl["legendahtml"]; $nocache = $parurl["nocache"]; + +//cria as pastas temporarias caso nao existam +if (! file_exists ( $dir_tmp )) { + @mkdir ( $dir_tmp, 0744 ); +} +if (file_exists ( $dir_tmp )) { + @mkdir ( $dir_tmp . "/comum", 0744 ); + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 ); + chmod ( $dir_tmp . "/saiku-datasources", 0744 ); + @mkdir ( $dir_tmp . "/cache", 0744 ); + chmod ( $dir_tmp . "/cache", 0744 ); + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 ); + chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); +} if(!empty($desligacache)){ $DESLIGACACHE = $desligacache; } @@ -312,8 +313,7 @@ if($temas != ""){ //ferramentas customizaveis e que seraco incluidas na propriedade do layer // $listaFerramentas = array("tme","storymap","animagif"); - $dadosTemas = pegaDadosAdminKey("SELECT codigo_tema,link_tema FROM __esq__i3geoadmin_temas WHERE codigo_tema IN('".implode($temas,',')."')","__esq__"); - + $dadosTemas = pegaDadosAdminKey("SELECT codigo_tema,link_tema FROM __esq__i3geoadmin_temas WHERE codigo_tema IN('".implode($temas,',')."')","__esq__"); foreach($temas as $tema){ // //utilzado para obter os parametros de ferramentas especificas indicadas nos metadados do LAYER @@ -436,7 +436,8 @@ if($temas != ""){ $link_tema = $dadosTemas[$nomeLayer]; $link_tema = $link_tema["link_tema"]; $visivel = "false"; - if($l->status == MS_DEFAULT || in_array($tema,$visiveis)){ + //if($l->status == MS_DEFAULT || in_array($tema,$visiveis)){ + if(in_array($tema,$visiveis)){ $visivel = "true"; } if($l->type != 2 && $l->type != 3){ diff --git a/mashups/osm.php b/mashups/osm.php index 609f532..9a7fc8b 100755 --- a/mashups/osm.php +++ b/mashups/osm.php @@ -9,19 +9,6 @@ include_once(dirname(__FILE__)."/../classesphp/sani_request.php"); include_once(dirname(__FILE__)."/../classesphp/carrega_ext.php"); include_once(dirname(__FILE__)."/../classesphp/funcoes_gerais.php"); error_reporting(0); -//cria as pastas temporarias caso nao existam -if (! file_exists ( $dir_tmp )) { - @mkdir ( $dir_tmp, 0744 ); -} -if (file_exists ( $dir_tmp )) { - @mkdir ( $dir_tmp . "/comum", 0744 ); - @mkdir ( $dir_tmp . "/saiku-datasources", 0744 ); - chmod ( $dir_tmp . "/saiku-datasources", 0744 ); - @mkdir ( $dir_tmp . "/cache", 0744 ); - chmod ( $dir_tmp . "/cache", 0744 ); - @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 ); - chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); -} //variaveis utilizadas $parurl = array_merge($_GET,$_POST); $desligacache = $parurl["desligacache"]; @@ -52,6 +39,20 @@ $ativalayerswicther = $parurl["ativalayerswicther"]; $ativarodadomouse = $parurl["ativarodadomouse"]; $legendahtml = $parurl["legendahtml"]; $nocache = $parurl["nocache"]; + +//cria as pastas temporarias caso nao existam +if (! file_exists ( $dir_tmp )) { + @mkdir ( $dir_tmp, 0744 ); +} +if (file_exists ( $dir_tmp )) { + @mkdir ( $dir_tmp . "/comum", 0744 ); + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 ); + chmod ( $dir_tmp . "/saiku-datasources", 0744 ); + @mkdir ( $dir_tmp . "/cache", 0744 ); + chmod ( $dir_tmp . "/cache", 0744 ); + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 ); + chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); +} if(!empty($desligacache)){ $DESLIGACACHE = $desligacache; } @@ -267,6 +268,9 @@ if(isset($botoes)){ if(in_array("texto",$botoes)){ $objBotoes[] = "'texto':true"; } + if(in_array("novaaba",$botoes)){ + $objBotoes[] = "'novaaba':true"; + } $botoes = "{".implode(",",$objBotoes)."}"; } @@ -310,7 +314,6 @@ if($temas != ""){ // $listaFerramentas = array("tme","storymap","animagif"); $dadosTemas = pegaDadosAdminKey("SELECT codigo_tema,link_tema FROM __esq__i3geoadmin_temas WHERE codigo_tema IN('".implode($temas,',')."')","__esq__"); - foreach($temas as $tema){ // //utilzado para obter os parametros de ferramentas especificas indicadas nos metadados do LAYER @@ -430,7 +433,8 @@ if($temas != ""){ $link_tema = $dadosTemas[$nomeLayer]; $link_tema = $link_tema["link_tema"]; $visivel = "false"; - if($l->status == MS_DEFAULT || in_array($tema,$visiveis)){ + //if($l->status == MS_DEFAULT || in_array($tema,$visiveis)){ + if(in_array($tema,$visiveis)){ $visivel = "true"; } if($l->type != 2 && $l->type != 3){ @@ -560,6 +564,7 @@ function ajuda(){ fecha corta legenda + novaaba Para ver a lista de códigos de temas, que podem ser utilizados no parâmetro 'temas', acesse: lista de temas. Os códigos são mostrados em vermelho. -- libgit2 0.21.2