Download as
Browse Code »

Commit 8dfa2d49d5ac025fd995820c445a2084e56c44ad

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

Mudança das rotinas que criam a pasta ms_tmp para evitar criá-la quando já exist… 

…ir ou quando subpastas existirem
Showing 9 changed files with 149 additions and 76 deletions   Show diff stats
init/index.php
  Diff comments   View file @8dfa2d4
@@ -15,6 +15,9 @@ @@ -15,6 +15,9 @@
15 */ 15 */
16 define ( ONDEI3GEO, ".." ); 16 define ( ONDEI3GEO, ".." );
17 include (dirname ( __FILE__ ) . "/../ms_configura.php"); 17 include (dirname ( __FILE__ ) . "/../ms_configura.php");
  18 +if(empty($dir_tmp)){
  19 + exit;
  20 +}
18 if (! empty ( $_GET ["customDir"] )) { 21 if (! empty ( $_GET ["customDir"] )) {
19 $customDir = strip_tags ( $_GET ["customDir"] ); 22 $customDir = strip_tags ( $_GET ["customDir"] );
20 } else if (empty ( $customDir )) { 23 } else if (empty ( $customDir )) {
@@ -25,14 +28,25 @@ if (! file_exists ( $dir_tmp )) { @@ -25,14 +28,25 @@ if (! file_exists ( $dir_tmp )) {
25 @mkdir ( $dir_tmp, 0744 ); 28 @mkdir ( $dir_tmp, 0744 );
26 } 29 }
27 if (file_exists ( $dir_tmp )) { 30 if (file_exists ( $dir_tmp )) {
28 - @mkdir ( $dir_tmp . "/comum", 0744 );  
29 - chmod ( $dir_tmp . "/comum", 0744 );  
30 - @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );  
31 - chmod ( $dir_tmp . "/saiku-datasources", 0744 );  
32 - @mkdir ( $dir_tmp . "/cache", 0744 );  
33 - chmod ( $dir_tmp . "/cache", 0744 );  
34 - @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );  
35 - chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); 31 + if(!file_exists($dir_tmp . "/comum")){
  32 + @mkdir ( $dir_tmp . "/comum", 0744 );
  33 + chmod ( $dir_tmp . "/comum", 0744 );
  34 + }
  35 + if(!file_exists($dir_tmp . "/saiku-datasources")){
  36 + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );
  37 + chmod ( $dir_tmp . "/saiku-datasources", 0744 );
  38 + }
  39 + if(!file_exists($dir_tmp . "/cache")){
  40 + @mkdir ( $dir_tmp . "/cache", 0744 );
  41 + chmod ( $dir_tmp . "/cache", 0744 );
  42 + }
  43 + if(!file_exists($dir_tmp . "/cache/googlemaps")){
  44 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );
  45 + chmod ( $dir_tmp . "/cache/googlemaps", 0744 );
  46 + }
  47 + foreach(glob($dir_tmp . '/{,.}*.php', GLOB_BRACE) as $f) {
  48 + unlink ($f);
  49 + }
36 } 50 }
37 error_reporting ( 0 ); 51 error_reporting ( 0 );
38 include "head.php"; 52 include "head.php";
mapas/index.php
  Diff comments   View file @8dfa2d4
@@ -10,13 +10,21 @@ if (! file_exists ( $dir_tmp )) { @@ -10,13 +10,21 @@ if (! file_exists ( $dir_tmp )) {
10 @mkdir ( $dir_tmp, 0744 ); 10 @mkdir ( $dir_tmp, 0744 );
11 } 11 }
12 if (file_exists ( $dir_tmp )) { 12 if (file_exists ( $dir_tmp )) {
13 - @mkdir ( $dir_tmp . "/comum", 0744 );  
14 - @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );  
15 - chmod ( $dir_tmp . "/saiku-datasources", 0744 );  
16 - @mkdir ( $dir_tmp . "/cache", 0744 );  
17 - chmod ( $dir_tmp . "/cache", 0744 );  
18 - @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );  
19 - chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); 13 + if (! file_exists ( $dir_tmp . "/comum" )) {
  14 + @mkdir ( $dir_tmp . "/comum", 0744 );
  15 + }
  16 + if (! file_exists ( $dir_tmp . "/saiku-datasources" )) {
  17 + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );
  18 + chmod ( $dir_tmp . "/saiku-datasources", 0744 );
  19 + }
  20 + if (! file_exists ( $dir_tmp . "/cache" )) {
  21 + @mkdir ( $dir_tmp . "/cache", 0744 );
  22 + chmod ( $dir_tmp . "/cache", 0744 );
  23 + }
  24 + if (! file_exists ( $dir_tmp . "/cache/googlemaps" )) {
  25 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );
  26 + chmod ( $dir_tmp . "/cache/googlemaps", 0744 );
  27 + }
20 } 28 }
21 error_reporting ( 0 ); 29 error_reporting ( 0 );
22 include "../init/head.php"; 30 include "../init/head.php";
mashups/openlayers.php
  Diff comments   View file @8dfa2d4
@@ -45,13 +45,21 @@ if (! file_exists ( $dir_tmp )) { @@ -45,13 +45,21 @@ if (! file_exists ( $dir_tmp )) {
45 @mkdir ( $dir_tmp, 0744 ); 45 @mkdir ( $dir_tmp, 0744 );
46 } 46 }
47 if (file_exists ( $dir_tmp )) { 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 ); 48 + if (! file_exists ( $dir_tmp . "/comum" )) {
  49 + @mkdir ( $dir_tmp . "/comum", 0744 );
  50 + }
  51 + if (! file_exists ( $dir_tmp . "/saiku-datasources" )) {
  52 + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );
  53 + chmod ( $dir_tmp . "/saiku-datasources", 0744 );
  54 + }
  55 + if (! file_exists ( $dir_tmp . "/cache" )) {
  56 + @mkdir ( $dir_tmp . "/cache", 0744 );
  57 + chmod ( $dir_tmp . "/cache", 0744 );
  58 + }
  59 + if (! file_exists ( $dir_tmp . "/cache/googlemaps" )) {
  60 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );
  61 + chmod ( $dir_tmp . "/cache/googlemaps", 0744 );
  62 + }
55 } 63 }
56 if(!empty($desligacache)){ 64 if(!empty($desligacache)){
57 $DESLIGACACHE = $desligacache; 65 $DESLIGACACHE = $desligacache;
mashups/openlayers3.php
  Diff comments   View file @8dfa2d4
@@ -44,13 +44,21 @@ if (! file_exists ( $dir_tmp )) { @@ -44,13 +44,21 @@ if (! file_exists ( $dir_tmp )) {
44 @mkdir ( $dir_tmp, 0744 ); 44 @mkdir ( $dir_tmp, 0744 );
45 } 45 }
46 if (file_exists ( $dir_tmp )) { 46 if (file_exists ( $dir_tmp )) {
47 - @mkdir ( $dir_tmp . "/comum", 0744 );  
48 - @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );  
49 - chmod ( $dir_tmp . "/saiku-datasources", 0744 );  
50 - @mkdir ( $dir_tmp . "/cache", 0744 );  
51 - chmod ( $dir_tmp . "/cache", 0744 );  
52 - @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );  
53 - chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); 47 + if (! file_exists ( $dir_tmp . "/comum" )) {
  48 + @mkdir ( $dir_tmp . "/comum", 0744 );
  49 + }
  50 + if (! file_exists ( $dir_tmp . "/saiku-datasources" )) {
  51 + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );
  52 + chmod ( $dir_tmp . "/saiku-datasources", 0744 );
  53 + }
  54 + if (! file_exists ( $dir_tmp . "/cache" )) {
  55 + @mkdir ( $dir_tmp . "/cache", 0744 );
  56 + chmod ( $dir_tmp . "/cache", 0744 );
  57 + }
  58 + if (! file_exists ( $dir_tmp . "/cache/googlemaps" )) {
  59 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );
  60 + chmod ( $dir_tmp . "/cache/googlemaps", 0744 );
  61 + }
54 } 62 }
55 if(!empty($desligacache)){ 63 if(!empty($desligacache)){
56 $DESLIGACACHE = $desligacache; 64 $DESLIGACACHE = $desligacache;
mashups/openlayersdebug.php
  Diff comments   View file @8dfa2d4
@@ -45,13 +45,21 @@ if (! file_exists ( $dir_tmp )) { @@ -45,13 +45,21 @@ if (! file_exists ( $dir_tmp )) {
45 @mkdir ( $dir_tmp, 0744 ); 45 @mkdir ( $dir_tmp, 0744 );
46 } 46 }
47 if (file_exists ( $dir_tmp )) { 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 ); 48 + if (! file_exists ( $dir_tmp . "/comum" )) {
  49 + @mkdir ( $dir_tmp . "/comum", 0744 );
  50 + }
  51 + if (! file_exists ( $dir_tmp . "/saiku-datasources" )) {
  52 + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );
  53 + chmod ( $dir_tmp . "/saiku-datasources", 0744 );
  54 + }
  55 + if (! file_exists ( $dir_tmp . "/cache" )) {
  56 + @mkdir ( $dir_tmp . "/cache", 0744 );
  57 + chmod ( $dir_tmp . "/cache", 0744 );
  58 + }
  59 + if (! file_exists ( $dir_tmp . "/cache/googlemaps" )) {
  60 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );
  61 + chmod ( $dir_tmp . "/cache/googlemaps", 0744 );
  62 + }
55 } 63 }
56 if(!empty($desligacache)){ 64 if(!empty($desligacache)){
57 $DESLIGACACHE = $desligacache; 65 $DESLIGACACHE = $desligacache;
mashups/osm.php
  Diff comments   View file @8dfa2d4
@@ -45,13 +45,21 @@ if (! file_exists ( $dir_tmp )) { @@ -45,13 +45,21 @@ if (! file_exists ( $dir_tmp )) {
45 @mkdir ( $dir_tmp, 0744 ); 45 @mkdir ( $dir_tmp, 0744 );
46 } 46 }
47 if (file_exists ( $dir_tmp )) { 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 ); 48 + if (! file_exists ( $dir_tmp . "/comum" )) {
  49 + @mkdir ( $dir_tmp . "/comum", 0744 );
  50 + }
  51 + if (! file_exists ( $dir_tmp . "/saiku-datasources" )) {
  52 + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );
  53 + chmod ( $dir_tmp . "/saiku-datasources", 0744 );
  54 + }
  55 + if (! file_exists ( $dir_tmp . "/cache" )) {
  56 + @mkdir ( $dir_tmp . "/cache", 0744 );
  57 + chmod ( $dir_tmp . "/cache", 0744 );
  58 + }
  59 + if (! file_exists ( $dir_tmp . "/cache/googlemaps" )) {
  60 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );
  61 + chmod ( $dir_tmp . "/cache/googlemaps", 0744 );
  62 + }
55 } 63 }
56 if(!empty($desligacache)){ 64 if(!empty($desligacache)){
57 $DESLIGACACHE = $desligacache; 65 $DESLIGACACHE = $desligacache;
ms_criamapa.php
  Diff comments   View file @8dfa2d4
@@ -1398,13 +1398,17 @@ Retorno: @@ -1398,13 +1398,17 @@ Retorno:
1398 1398
1399 {boleano} 1399 {boleano}
1400 */ 1400 */
1401 -function criaDirMapa($dir_tmp,$cachedir="")  
1402 -{ 1401 +function criaDirMapa($dir_tmp,$cachedir=""){
  1402 + if(empty($dir_tmp)){
  1403 + return false;
  1404 + }
1403 if(!file_exists($dir_tmp)){ 1405 if(!file_exists($dir_tmp)){
1404 @mkdir ($dir_tmp,0744); 1406 @mkdir ($dir_tmp,0744);
1405 } 1407 }
1406 - if(file_exists($dir_tmp))  
1407 - { 1408 + if(file_exists($dir_tmp)){
  1409 + foreach(glob($dir_tmp . '/{,.}*.php', GLOB_BRACE) as $f) {
  1410 + unlink ($f);
  1411 + }
1408 $tmpdirname = nomeRandomico(); 1412 $tmpdirname = nomeRandomico();
1409 $crdir = @mkdir ($dir_tmp."/".$tmpdirname,0744); 1413 $crdir = @mkdir ($dir_tmp."/".$tmpdirname,0744);
1410 chmod($dir_tmp."/".$tmpdirname,0744); 1414 chmod($dir_tmp."/".$tmpdirname,0744);
@@ -1412,29 +1416,40 @@ function criaDirMapa($dir_tmp,$cachedir="") @@ -1412,29 +1416,40 @@ function criaDirMapa($dir_tmp,$cachedir="")
1412 chmod($dir_tmp."/img".$tmpdirname,0744); 1416 chmod($dir_tmp."/img".$tmpdirname,0744);
1413 $mapfile = $dir_tmp."/".$tmpdirname."/".$tmpdirname.".map"; 1417 $mapfile = $dir_tmp."/".$tmpdirname."/".$tmpdirname.".map";
1414 $tmpimgname = "img".$tmpdirname; 1418 $tmpimgname = "img".$tmpdirname;
1415 - @mkdir($dir_tmp."/comum",0744);  
1416 - //utilizado para armazenar os arquivos de fonte de dados do SAIKU  
1417 - @mkdir($dir_tmp."/saiku-datasources",0744);  
1418 - chmod($dir_tmp."/saiku-datasources",0744); 1419 + if(!file_exists($dir_tmp."/comum")){
  1420 + @mkdir($dir_tmp."/comum",0744);
  1421 + }
  1422 + if(!file_exists($dir_tmp."/saiku-datasources")){
  1423 + //utilizado para armazenar os arquivos de fonte de dados do SAIKU
  1424 + @mkdir($dir_tmp."/saiku-datasources",0744);
  1425 + chmod($dir_tmp."/saiku-datasources",0744);
  1426 + }
1419 // 1427 //
1420 if($cachedir == ""){ 1428 if($cachedir == ""){
1421 - @mkdir($dir_tmp."/cache",0744);  
1422 - chmod($dir_tmp."/cache",0744);  
1423 - @mkdir($dir_tmp."/cache/googlemaps",0744);  
1424 - chmod($dir_tmp."/cache/googlemaps",0744); 1429 + if(!file_exists($dir_tmp."/cache")){
  1430 + @mkdir($dir_tmp."/cache",0744);
  1431 + chmod($dir_tmp."/cache",0744);
  1432 + @mkdir($dir_tmp."/cache/googlemaps",0744);
  1433 + chmod($dir_tmp."/cache/googlemaps",0744);
  1434 + }
1425 } 1435 }
1426 else{ 1436 else{
1427 - @mkdir($cachedir,0744);  
1428 - chmod($cachedir,0744);  
1429 - @mkdir($cachedir."/googlemaps",0744);  
1430 - chmod($cachedir."/googlemaps",0744); 1437 + if(!file_exists($cachedir)){
  1438 + @mkdir($cachedir,0744);
  1439 + chmod($cachedir,0744);
  1440 + @mkdir($cachedir."/googlemaps",0744);
  1441 + chmod($cachedir."/googlemaps",0744);
  1442 + }
  1443 + }
  1444 + if(file_exists($dir_tmp."/".$tmpdirname)){
  1445 + return array($mapfile,$tmpdirname,$tmpimgname);
  1446 + }
  1447 + else{
  1448 + return false;
1431 } 1449 }
1432 - if(file_exists($dir_tmp."/".$tmpdirname))  
1433 - return array($mapfile,$tmpdirname,$tmpimgname);  
1434 - else  
1435 - {return false;}  
1436 } 1450 }
1437 - else  
1438 - {return false;} 1451 + else{
  1452 + return false;
  1453 + }
1439 } 1454 }
1440 ?> 1455 ?>
permlinks/index.php
  Diff comments   View file @8dfa2d4
@@ -11,13 +11,21 @@ if (! file_exists ( $dir_tmp )) { @@ -11,13 +11,21 @@ if (! file_exists ( $dir_tmp )) {
11 @mkdir ( $dir_tmp, 0744 ); 11 @mkdir ( $dir_tmp, 0744 );
12 } 12 }
13 if (file_exists ( $dir_tmp )) { 13 if (file_exists ( $dir_tmp )) {
14 - @mkdir ( $dir_tmp . "/comum", 0744 );  
15 - @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );  
16 - chmod ( $dir_tmp . "/saiku-datasources", 0744 );  
17 - @mkdir ( $dir_tmp . "/cache", 0744 );  
18 - chmod ( $dir_tmp . "/cache", 0744 );  
19 - @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );  
20 - chmod ( $dir_tmp . "/cache/googlemaps", 0744 ); 14 + if (! file_exists ( $dir_tmp . "/comum" )) {
  15 + @mkdir ( $dir_tmp . "/comum", 0744 );
  16 + }
  17 + if (! file_exists ( $dir_tmp . "/saiku-datasources" )) {
  18 + @mkdir ( $dir_tmp . "/saiku-datasources", 0744 );
  19 + chmod ( $dir_tmp . "/saiku-datasources", 0744 );
  20 + }
  21 + if (! file_exists ( $dir_tmp . "/cache" )) {
  22 + @mkdir ( $dir_tmp . "/cache", 0744 );
  23 + chmod ( $dir_tmp . "/cache", 0744 );
  24 + }
  25 + if (! file_exists ( $dir_tmp . "/cache/googlemaps" )) {
  26 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0744 );
  27 + chmod ( $dir_tmp . "/cache/googlemaps", 0744 );
  28 + }
21 } 29 }
22 error_reporting ( 0 ); 30 error_reporting ( 0 );
23 include "../init/head.php"; 31 include "../init/head.php";
testainstal/index.php
  Diff comments   View file @8dfa2d4
@@ -229,8 +229,6 @@ HTML; @@ -229,8 +229,6 @@ HTML;
229 echo "Criando a pasta $dir_tmp"; 229 echo "Criando a pasta $dir_tmp";
230 if(!file_exists($dir_tmp)){ 230 if(!file_exists($dir_tmp)){
231 @mkdir ($dir_tmp,0744); 231 @mkdir ($dir_tmp,0744);
232 - }  
233 - else{  
234 chmod($dir_tmp,0744); 232 chmod($dir_tmp,0744);
235 } 233 }
236 if(!file_exists($dir_tmp)){ 234 if(!file_exists($dir_tmp)){
@@ -248,8 +246,6 @@ HTML; @@ -248,8 +246,6 @@ HTML;
248 echo "Criando o link simbólico $d\n"; 246 echo "Criando o link simbólico $d\n";
249 if(!file_exists($d)){ 247 if(!file_exists($d)){
250 @symlink($dir_tmp,$d); 248 @symlink($dir_tmp,$d);
251 - }  
252 - else{  
253 chmod($d,0744); 249 chmod($d,0744);
254 } 250 }
255 if(!file_exists($d)){ 251 if(!file_exists($d)){