From 0802446717097618ed3a287277299f166ff8c0a7 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Tue, 8 Nov 2016 15:31:59 -0200 Subject: [PATCH] Mudança das rotinas que criam a pasta ms_tmp para evitar criá-la quando já existir ou quando subpastas existirem --- init/index.php | 30 ++++++++++++++++++++++-------- mapas/index.php | 24 ++++++++++++++++-------- mashups/openlayers.php | 22 +++++++++++++++------- mashups/osm.php | 22 +++++++++++++++------- ms_criamapa.php | 59 +++++++++++++++++++++++++++++++++++++---------------------- permlinks/index.php | 34 +++++++++++++++++++++------------- testainstal/index.php | 16 ++++++---------- 7 files changed, 132 insertions(+), 75 deletions(-) diff --git a/init/index.php b/init/index.php index 3f757ce..757942e 100755 --- a/init/index.php +++ b/init/index.php @@ -15,6 +15,9 @@ */ define ( ONDEI3GEO, ".." ); include (dirname ( __FILE__ ) . "/../ms_configura.php"); +if(empty($dir_tmp)){ + exit; +} if (! empty ( $_GET ["customDir"] )) { $customDir = strip_tags ( $_GET ["customDir"] ); } else if (empty ( $customDir )) { @@ -25,14 +28,25 @@ if (! file_exists ( $dir_tmp )) { @mkdir ( $dir_tmp, 0744 ); } if (file_exists ( $dir_tmp )) { - @mkdir ( $dir_tmp . "/comum", 0744 ); - chmod ( $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(!file_exists($dir_tmp . "/comum")){ + @mkdir ( $dir_tmp . "/comum", 0744 ); + chmod ( $dir_tmp . "/comum", 0744 ); + } + if(!file_exists($dir_tmp . "/saiku-datasources")){ + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 ); + chmod ( $dir_tmp . "/saiku-datasources", 0744 ); + } + if(!file_exists($dir_tmp . "/cache")){ + @mkdir ( $dir_tmp . "/cache", 0744 ); + chmod ( $dir_tmp . "/cache", 0744 ); + } + if(!file_exists($dir_tmp . "/cache/googlemaps")){ + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 ); + chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); + } + foreach(glob($dir_tmp . '/{,.}*.php', GLOB_BRACE) as $f) { + unlink ($f); + } } error_reporting ( 0 ); include "head.php"; diff --git a/mapas/index.php b/mapas/index.php index ce7421a..b89b668 100755 --- a/mapas/index.php +++ b/mapas/index.php @@ -10,13 +10,21 @@ 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 (! file_exists ( $dir_tmp . "/comum" )) { + @mkdir ( $dir_tmp . "/comum", 0744 ); + } + if (! file_exists ( $dir_tmp . "/saiku-datasources" )) { + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 ); + chmod ( $dir_tmp . "/saiku-datasources", 0744 ); + } + if (! file_exists ( $dir_tmp . "/cache" )) { + @mkdir ( $dir_tmp . "/cache", 0744 ); + chmod ( $dir_tmp . "/cache", 0744 ); + } + if (! file_exists ( $dir_tmp . "/cache/googlemaps" )) { + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 ); + chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); + } } error_reporting ( 0 ); include "../init/head.php"; @@ -171,7 +179,7 @@ include "../init/head.php";
    -
  1. i3Geo
    2. +
  2. i3Geo
  3. Mapas de usuários
  4. rss_feed  code diff --git a/mashups/openlayers.php b/mashups/openlayers.php index 610c668..dd0cda3 100755 --- a/mashups/openlayers.php +++ b/mashups/openlayers.php @@ -45,13 +45,21 @@ 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 (! file_exists ( $dir_tmp . "/comum" )) { + @mkdir ( $dir_tmp . "/comum", 0744 ); + } + if (! file_exists ( $dir_tmp . "/saiku-datasources" )) { + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 ); + chmod ( $dir_tmp . "/saiku-datasources", 0744 ); + } + if (! file_exists ( $dir_tmp . "/cache" )) { + @mkdir ( $dir_tmp . "/cache", 0744 ); + chmod ( $dir_tmp . "/cache", 0744 ); + } + if (! file_exists ( $dir_tmp . "/cache/googlemaps" )) { + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 ); + chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); + } } if(!empty($desligacache)){ $DESLIGACACHE = $desligacache; diff --git a/mashups/osm.php b/mashups/osm.php index 9a7fc8b..bece357 100755 --- a/mashups/osm.php +++ b/mashups/osm.php @@ -45,13 +45,21 @@ 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 (! file_exists ( $dir_tmp . "/comum" )) { + @mkdir ( $dir_tmp . "/comum", 0744 ); + } + if (! file_exists ( $dir_tmp . "/saiku-datasources" )) { + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 ); + chmod ( $dir_tmp . "/saiku-datasources", 0744 ); + } + if (! file_exists ( $dir_tmp . "/cache" )) { + @mkdir ( $dir_tmp . "/cache", 0744 ); + chmod ( $dir_tmp . "/cache", 0744 ); + } + if (! file_exists ( $dir_tmp . "/cache/googlemaps" )) { + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 ); + chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); + } } if(!empty($desligacache)){ $DESLIGACACHE = $desligacache; diff --git a/ms_criamapa.php b/ms_criamapa.php index f53402b..77b735c 100755 --- a/ms_criamapa.php +++ b/ms_criamapa.php @@ -1398,13 +1398,17 @@ Retorno: {boleano} */ -function criaDirMapa($dir_tmp,$cachedir="") -{ +function criaDirMapa($dir_tmp,$cachedir=""){ + if(empty($dir_tmp)){ + return false; + } if(!file_exists($dir_tmp)){ @mkdir ($dir_tmp,0744); } - if(file_exists($dir_tmp)) - { + if(file_exists($dir_tmp)){ + foreach(glob($dir_tmp . '/{,.}*.php', GLOB_BRACE) as $f) { + unlink ($f); + } $tmpdirname = nomeRandomico(); $crdir = @mkdir ($dir_tmp."/".$tmpdirname,0744); chmod($dir_tmp."/".$tmpdirname,0744); @@ -1412,29 +1416,40 @@ function criaDirMapa($dir_tmp,$cachedir="") chmod($dir_tmp."/img".$tmpdirname,0744); $mapfile = $dir_tmp."/".$tmpdirname."/".$tmpdirname.".map"; $tmpimgname = "img".$tmpdirname; - @mkdir($dir_tmp."/comum",0744); - //utilizado para armazenar os arquivos de fonte de dados do SAIKU - @mkdir($dir_tmp."/saiku-datasources",0744); - chmod($dir_tmp."/saiku-datasources",0744); + if(!file_exists($dir_tmp."/comum")){ + @mkdir($dir_tmp."/comum",0744); + } + if(!file_exists($dir_tmp."/saiku-datasources")){ + //utilizado para armazenar os arquivos de fonte de dados do SAIKU + @mkdir($dir_tmp."/saiku-datasources",0744); + chmod($dir_tmp."/saiku-datasources",0744); + } // if($cachedir == ""){ - @mkdir($dir_tmp."/cache",0744); - chmod($dir_tmp."/cache",0744); - @mkdir($dir_tmp."/cache/googlemaps",0744); - chmod($dir_tmp."/cache/googlemaps",0744); + if(!file_exists($dir_tmp."/cache")){ + @mkdir($dir_tmp."/cache",0744); + chmod($dir_tmp."/cache",0744); + @mkdir($dir_tmp."/cache/googlemaps",0744); + chmod($dir_tmp."/cache/googlemaps",0744); + } } else{ - @mkdir($cachedir,0744); - chmod($cachedir,0744); - @mkdir($cachedir."/googlemaps",0744); - chmod($cachedir."/googlemaps",0744); + if(!file_exists($cachedir)){ + @mkdir($cachedir,0744); + chmod($cachedir,0744); + @mkdir($cachedir."/googlemaps",0744); + chmod($cachedir."/googlemaps",0744); + } + } + if(file_exists($dir_tmp."/".$tmpdirname)){ + return array($mapfile,$tmpdirname,$tmpimgname); + } + else{ + return false; } - if(file_exists($dir_tmp."/".$tmpdirname)) - return array($mapfile,$tmpdirname,$tmpimgname); - else - {return false;} } - else - {return false;} + else{ + return false; + } } ?> diff --git a/permlinks/index.php b/permlinks/index.php index c6507f0..0253ef6 100755 --- a/permlinks/index.php +++ b/permlinks/index.php @@ -8,16 +8,24 @@ if (! empty ( $_GET ["customDir"] )) { $customDir = "interface"; } if (! file_exists ( $dir_tmp )) { - @mkdir ( $dir_tmp, 0777 ); + @mkdir ( $dir_tmp, 0744 ); } if (file_exists ( $dir_tmp )) { - @mkdir ( $dir_tmp . "/comum", 0777 ); - @mkdir ( $dir_tmp . "/saiku-datasources", 0777 ); - chmod ( $dir_tmp . "/saiku-datasources", 0777 ); - @mkdir ( $dir_tmp . "/cache", 0777 ); - chmod ( $dir_tmp . "/cache", 0777 ); - @mkdir ( $dir_tmp . "/cache/googlemaps", 0777 ); - chmod ( $dir_tmp . "/cache/googlemaps", 0777 ); + if (! file_exists ( $dir_tmp . "/comum" )) { + @mkdir ( $dir_tmp . "/comum", 0744 ); + } + if (! file_exists ( $dir_tmp . "/saiku-datasources" )) { + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 ); + chmod ( $dir_tmp . "/saiku-datasources", 0744 ); + } + if (! file_exists ( $dir_tmp . "/cache" )) { + @mkdir ( $dir_tmp . "/cache", 0744 ); + chmod ( $dir_tmp . "/cache", 0744 ); + } + if (! file_exists ( $dir_tmp . "/cache/googlemaps" )) { + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 ); + chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); + } } error_reporting ( 0 ); include "../init/head.php"; @@ -81,7 +89,7 @@ include "../init/head.php";
      -
    1. i3Geo
      2. +
    2. i3Geo
    3. Perm links
    @@ -101,8 +109,8 @@ include "../init/head.php";
    Escolha das camadas -

    Escolha as camadas que serão incluídas no mapa. As camadas s�o - organizadas em uma hierarquia come�ando em menu.

    +

    Escolha as camadas que serão incluídas no mapa. As camadas são + organizadas em uma hierarquia começando em menu.

    X mínimo (longitude oeste -)
    diff --git a/testainstal/index.php b/testainstal/index.php index b53af1a..87d81fe 100755 --- a/testainstal/index.php +++ b/testainstal/index.php @@ -17,7 +17,7 @@ define ( ONDEI3GEO, ".." ); include "../init/head.php"; ?> -