From fca8ce392c89ceacf4500daae3c4b597649f0fed Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Thu, 4 Aug 2016 15:05:59 -0300
Subject: [PATCH] remocão de arquivos desnecessarios

---
 admin/admin.db                          | Bin 340992 -> 0 bytes
 admin/php/admin.php                     |  4 ++--
 classesphp/mapa_googlemaps.php          |  6 +++---
 classesphp/mapa_openlayers.php          |  6 +++---
 ferramentas/congelamapa/openlayers.php  |  2 +-
 ferramentas/congelamapa/openlayers3.php |  2 +-
 ferramentas/melhorcaminho/exec.php      |  2 +-
 ferramentas/parametrossql/ogc.php       |  6 +++---
 init/index.php                          | 17 +++++++++--------
 mapas/index.php                         | 16 ++++++++--------
 mashups/openlayers.php                  | 16 ++++++++--------
 mashups/openlayers3.php                 | 16 ++++++++--------
 mashups/osm.php                         | 16 ++++++++--------
 ms_criamapa.php                         | 32 ++++++++++++++++----------------
 ogc.php                                 |  8 ++++----
 permlinks/index.php                     | 16 ++++++++--------
 testainstal/index.php                   | 14 +++++++-------
 17 files changed, 90 insertions(+), 89 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index 03a4346..60ceb7f 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/php/admin.php b/admin/php/admin.php
index 3a96f2b..ac8bf36 100755
--- a/admin/php/admin.php
+++ b/admin/php/admin.php
@@ -38,8 +38,8 @@ if(!isset($locaplic) || !isset($dir_tmp)){
 	include(dirname(__FILE__)."/../../ms_configura.php");
 }
 if(!file_exists($dir_tmp)){
-	@mkdir ($dir_tmp,0774);
-	chmod($dir_tmp,0774);
+	@mkdir ($dir_tmp,0744);
+	chmod($dir_tmp,0744);
 }
 include_once($locaplic."/classesphp/pega_variaveis.php");
 error_reporting(0);
diff --git a/classesphp/mapa_googlemaps.php b/classesphp/mapa_googlemaps.php
index 1573a3c..45c2d95 100755
--- a/classesphp/mapa_googlemaps.php
+++ b/classesphp/mapa_googlemaps.php
@@ -483,7 +483,7 @@ function salvaCacheImagem(){
 	}
 	$c = $cachedir."/googlemaps/$layer/$z/$x";
 	if(!file_exists($c."/$y.png")){
-		mkdir($cachedir."/googlemaps/$layer/$z/$x",0774,true);
+		mkdir($cachedir."/googlemaps/$layer/$z/$x",0744,true);
 		$img->saveImage($c."/$y.png");
 		//
 		//corta a imagem gerada para voltar ao tamanho normal
@@ -492,8 +492,8 @@ function salvaCacheImagem(){
 			$img = cortaImagemDisco($c."/$y.png",$cortePixels,256);
 		}
 
-		chmod($cachedir."/googlemaps/$layer/$z/$x",0774);
-		chmod($c."/$y.png",0774);
+		chmod($cachedir."/googlemaps/$layer/$z/$x",0744);
+		chmod($c."/$y.png",0744);
 	}
 	return $c."/$y.png";
 }
diff --git a/classesphp/mapa_openlayers.php b/classesphp/mapa_openlayers.php
index dd51b8a..c64975e 100755
--- a/classesphp/mapa_openlayers.php
+++ b/classesphp/mapa_openlayers.php
@@ -496,8 +496,8 @@ function salvaCacheImagem($cachedir,$map,$tms){
 	}
 	$nome = $nome.".png";
 	if(!file_exists($nome)){
-		@mkdir(dirname($nome),0774,true);
-		chmod(dirname($nome),0774);
+		@mkdir(dirname($nome),0744,true);
+		chmod(dirname($nome),0744);
 		$img->saveImage($nome);
 		//
 		//corta a imagem gerada para voltar ao tamanho normal
@@ -505,7 +505,7 @@ function salvaCacheImagem($cachedir,$map,$tms){
 		if($cortePixels > 0){
 			$img = cortaImagemDisco($nome,$cortePixels,256);
 		}
-		chmod($nome,0774);
+		chmod($nome,0744);
 	}
 	return $nome;
 }
diff --git a/ferramentas/congelamapa/openlayers.php b/ferramentas/congelamapa/openlayers.php
index 95e4017..925e21f 100755
--- a/ferramentas/congelamapa/openlayers.php
+++ b/ferramentas/congelamapa/openlayers.php
@@ -15,7 +15,7 @@ $base = basename($map_file);
 $dir = dirname($map_file);
 $novo_mapfile = $dir."/".nomeRandomico(5).$base;
 copy($map_file,$novo_mapfile);
-chmod($novo_mapfile,0774);
+chmod($novo_mapfile,0744);
 $mapa = ms_newMapObj($novo_mapfile);
 $mapa->setProjection(pegaProjecaoDefault("proj4"));
 $numlayers = $mapa->numlayers;
diff --git a/ferramentas/congelamapa/openlayers3.php b/ferramentas/congelamapa/openlayers3.php
index 2a6b313..3a3bd15 100755
--- a/ferramentas/congelamapa/openlayers3.php
+++ b/ferramentas/congelamapa/openlayers3.php
@@ -15,7 +15,7 @@ $base = basename($map_file);
 $dir = dirname($map_file);
 $novo_mapfile = $dir."/".nomeRandomico(5).$base;
 copy($map_file,$novo_mapfile);
-chmod($novo_mapfile,0774);
+chmod($novo_mapfile,0744);
 $mapa = ms_newMapObj($novo_mapfile);
 $mapa->setProjection(pegaProjecaoDefault("proj4"));
 $numlayers = $mapa->numlayers;
diff --git a/ferramentas/melhorcaminho/exec.php b/ferramentas/melhorcaminho/exec.php
index 945034f..dca7e5a 100755
--- a/ferramentas/melhorcaminho/exec.php
+++ b/ferramentas/melhorcaminho/exec.php
@@ -50,7 +50,7 @@ switch (strtoupper($funcao))
 		if(file_exists($cost_surface_path)){
 			$pathresult = $dir_tmp."/melhorcaminho_".nomeRandomico();
 			//cria a pasta onde os resultados serao armazenados
-			mkdir ($pathresult,0774);
+			mkdir ($pathresult,0744);
 
 			//parametros para o calculo de melhor caminho e linha reta
 			$best = array(
diff --git a/ferramentas/parametrossql/ogc.php b/ferramentas/parametrossql/ogc.php
index 7878316..598f1c0 100755
--- a/ferramentas/parametrossql/ogc.php
+++ b/ferramentas/parametrossql/ogc.php
@@ -538,8 +538,8 @@ function salvaCacheImagem($cachedir,$map,$tms, $plugin, $tema){
 	else{
 		$nome = $cachedir.$tms;
 	}
-	@mkdir(dirname($nome),0774,true);
-	chmod(dirname($nome),0774);
+	@mkdir(dirname($nome),0744,true);
+	chmod(dirname($nome),0744);
 	$img->saveImage($nome);
 	//
 	//corta a imagem gerada para voltar ao tamanho normal
@@ -556,7 +556,7 @@ function salvaCacheImagem($cachedir,$map,$tms, $plugin, $tema){
 		imagecopy($imgc, $img, 0 , 0 , $cortePixels , $cortePixels , 256, 256);
 		imagepng($imgc,$nome);
 	}
-	chmod($nome,0774);
+	chmod($nome,0744);
 	header('Content-Length: '.filesize($nome));
 	header('Content-Type: image/png');
 	header('Cache-Control: max-age=3600, must-revalidate');
diff --git a/init/index.php b/init/index.php
index 1c6f035..045de81 100755
--- a/init/index.php
+++ b/init/index.php
@@ -21,16 +21,17 @@ if (! empty ( $_GET ["customDir"] )) {
 	$customDir = "interface";
 }
 if (! file_exists ( $dir_tmp )) {
-	@mkdir ( $dir_tmp, 0774 );
+	@mkdir ( $dir_tmp, 0744 );
 }
 if (file_exists ( $dir_tmp )) {
-	@mkdir ( $dir_tmp . "/comum", 0774 );
-	@mkdir ( $dir_tmp . "/saiku-datasources", 0774 );
-	chmod ( $dir_tmp . "/saiku-datasources", 0774 );
-	@mkdir ( $dir_tmp . "/cache", 0774 );
-	chmod ( $dir_tmp . "/cache", 0774 );
-	@mkdir ( $dir_tmp . "/cache/googlemaps", 0774 );
-	chmod ( $dir_tmp . "/cache/googlemaps", 0774 );
+	@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 );
 }
 error_reporting ( 0 );
 include "head.php";
diff --git a/mapas/index.php b/mapas/index.php
index 1b12ac4..ae592e2 100755
--- a/mapas/index.php
+++ b/mapas/index.php
@@ -7,16 +7,16 @@ if (! empty ( $_GET ["customDir"] )) {
 	$customDir = "interface";
 }
 if (! file_exists ( $dir_tmp )) {
-	@mkdir ( $dir_tmp, 0774 );
+	@mkdir ( $dir_tmp, 0744 );
 }
 if (file_exists ( $dir_tmp )) {
-	@mkdir ( $dir_tmp . "/comum", 0774 );
-	@mkdir ( $dir_tmp . "/saiku-datasources", 0774 );
-	chmod ( $dir_tmp . "/saiku-datasources", 0774 );
-	@mkdir ( $dir_tmp . "/cache", 0774 );
-	chmod ( $dir_tmp . "/cache", 0774 );
-	@mkdir ( $dir_tmp . "/cache/googlemaps", 0774 );
-	chmod ( $dir_tmp . "/cache/googlemaps", 0774 );
+	@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 );
 }
 error_reporting ( 0 );
 include "../init/head.php";
diff --git a/mashups/openlayers.php b/mashups/openlayers.php
index 75aed60..d14422c 100755
--- a/mashups/openlayers.php
+++ b/mashups/openlayers.php
@@ -41,16 +41,16 @@ $nocache = $parurl["nocache"];
 
 //cria as pastas temporarias caso nao existam
 if (! file_exists ( $dir_tmp )) {
-	@mkdir ( $dir_tmp, 0774 );
+	@mkdir ( $dir_tmp, 0744 );
 }
 if (file_exists ( $dir_tmp )) {
-	@mkdir ( $dir_tmp . "/comum", 0774 );
-	@mkdir ( $dir_tmp . "/saiku-datasources", 0774 );
-	chmod ( $dir_tmp . "/saiku-datasources", 0774 );
-	@mkdir ( $dir_tmp . "/cache", 0774 );
-	chmod ( $dir_tmp . "/cache", 0774 );
-	@mkdir ( $dir_tmp . "/cache/googlemaps", 0774 );
-	chmod ( $dir_tmp . "/cache/googlemaps", 0774 );
+	@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;
diff --git a/mashups/openlayers3.php b/mashups/openlayers3.php
index 2463cc3..eb9ab54 100755
--- a/mashups/openlayers3.php
+++ b/mashups/openlayers3.php
@@ -40,16 +40,16 @@ $legendahtml = $parurl["legendahtml"];
 $nocache = $parurl["nocache"];
 //cria as pastas temporarias caso nao existam
 if (! file_exists ( $dir_tmp )) {
-	@mkdir ( $dir_tmp, 0774 );
+	@mkdir ( $dir_tmp, 0744 );
 }
 if (file_exists ( $dir_tmp )) {
-	@mkdir ( $dir_tmp . "/comum", 0774 );
-	@mkdir ( $dir_tmp . "/saiku-datasources", 0774 );
-	chmod ( $dir_tmp . "/saiku-datasources", 0774 );
-	@mkdir ( $dir_tmp . "/cache", 0774 );
-	chmod ( $dir_tmp . "/cache", 0774 );
-	@mkdir ( $dir_tmp . "/cache/googlemaps", 0774 );
-	chmod ( $dir_tmp . "/cache/googlemaps", 0774 );
+	@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;
diff --git a/mashups/osm.php b/mashups/osm.php
index 3441454..e65b8dc 100755
--- a/mashups/osm.php
+++ b/mashups/osm.php
@@ -11,16 +11,16 @@ 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, 0774 );
+	@mkdir ( $dir_tmp, 0744 );
 }
 if (file_exists ( $dir_tmp )) {
-	@mkdir ( $dir_tmp . "/comum", 0774 );
-	@mkdir ( $dir_tmp . "/saiku-datasources", 0774 );
-	chmod ( $dir_tmp . "/saiku-datasources", 0774 );
-	@mkdir ( $dir_tmp . "/cache", 0774 );
-	chmod ( $dir_tmp . "/cache", 0774 );
-	@mkdir ( $dir_tmp . "/cache/googlemaps", 0774 );
-	chmod ( $dir_tmp . "/cache/googlemaps", 0774 );
+	@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);
diff --git a/ms_criamapa.php b/ms_criamapa.php
index eb92c05..7741848 100755
--- a/ms_criamapa.php
+++ b/ms_criamapa.php
@@ -1366,33 +1366,33 @@ Retorno:
 function criaDirMapa($dir_tmp,$cachedir="")
 {
 	if(!file_exists($dir_tmp)){
-		@mkdir ($dir_tmp,0774);
+		@mkdir ($dir_tmp,0744);
 	}
 	if(file_exists($dir_tmp))
 	{
 		$tmpdirname = nomeRandomico();
-		$crdir = @mkdir ($dir_tmp."/".$tmpdirname,0774);
-		chmod($dir_tmp."/".$tmpdirname,0774);
-		$crdiri = @mkdir ($dir_tmp."/img".$tmpdirname,0774);
-		chmod($dir_tmp."/img".$tmpdirname,0774);
+		$crdir = @mkdir ($dir_tmp."/".$tmpdirname,0744);
+		chmod($dir_tmp."/".$tmpdirname,0744);
+		$crdiri = @mkdir ($dir_tmp."/img".$tmpdirname,0744);
+		chmod($dir_tmp."/img".$tmpdirname,0744);
 		$mapfile = $dir_tmp."/".$tmpdirname."/".$tmpdirname.".map";
 		$tmpimgname = "img".$tmpdirname;
-		@mkdir($dir_tmp."/comum",0774);
+		@mkdir($dir_tmp."/comum",0744);
 		//utilizado para armazenar os arquivos de fonte de dados do SAIKU
-		@mkdir($dir_tmp."/saiku-datasources",0774);
-		chmod($dir_tmp."/saiku-datasources",0774);
+		@mkdir($dir_tmp."/saiku-datasources",0744);
+		chmod($dir_tmp."/saiku-datasources",0744);
 		//
 		if($cachedir == ""){
-			@mkdir($dir_tmp."/cache",0774);
-			chmod($dir_tmp."/cache",0774);
-			@mkdir($dir_tmp."/cache/googlemaps",0774);
-			chmod($dir_tmp."/cache/googlemaps",0774);
+			@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,0774);
-			chmod($cachedir,0774);
-			@mkdir($cachedir."/googlemaps",0774);
-			chmod($cachedir."/googlemaps",0774);
+			@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);
diff --git a/ogc.php b/ogc.php
index d459e17..ddbde8f 100755
--- a/ogc.php
+++ b/ogc.php
@@ -510,7 +510,7 @@ else{
 						$l->setmetadata("wms_extent",$extensao);
 						if (!empty($postgis_mapa)){
 							if ($l->connectiontype == MS_POSTGIS){
-								
+
 								$lcon = $l->connection;
 								if (($lcon == " ") || ($lcon == "") || (in_array($lcon,array_keys($postgis_mapa)))){
 									//
@@ -1173,8 +1173,8 @@ function salvaCacheImagem($cachedir,$map,$tms){
 		$nome = $cachedir.$tms;
 	}
 	$nome = str_replace(".png","",$nome).".png";
-	@mkdir(dirname($nome),0774,true);
-	chmod(dirname($nome),0774);
+	@mkdir(dirname($nome),0744,true);
+	chmod(dirname($nome),0744);
 
 	$img->saveImage($nome);
 	//
@@ -1192,7 +1192,7 @@ function salvaCacheImagem($cachedir,$map,$tms){
 		imagecopy($imgc, $img, 0 , 0 , $cortePixels , $cortePixels , 256, 256);
 		imagepng($imgc,$nome);
 	}
-	chmod($nome,0774);
+	chmod($nome,0744);
 	header('Content-Length: '.filesize($nome));
 	header('Content-Type: image/png');
 	header('Cache-Control: max-age=3600, must-revalidate');
diff --git a/permlinks/index.php b/permlinks/index.php
index 63a6496..afa0288 100755
--- a/permlinks/index.php
+++ b/permlinks/index.php
@@ -7,16 +7,16 @@ if (! empty ( $_GET ["customDir"] )) {
 	$customDir = "interface";
 }
 if (! file_exists ( $dir_tmp )) {
-	@mkdir ( $dir_tmp, 0774 );
+	@mkdir ( $dir_tmp, 0744 );
 }
 if (file_exists ( $dir_tmp )) {
-	@mkdir ( $dir_tmp . "/comum", 0774 );
-	@mkdir ( $dir_tmp . "/saiku-datasources", 0774 );
-	chmod ( $dir_tmp . "/saiku-datasources", 0774 );
-	@mkdir ( $dir_tmp . "/cache", 0774 );
-	chmod ( $dir_tmp . "/cache", 0774 );
-	@mkdir ( $dir_tmp . "/cache/googlemaps", 0774 );
-	chmod ( $dir_tmp . "/cache/googlemaps", 0774 );
+	@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 );
 }
 error_reporting ( 0 );
 include "../init/head.php";
diff --git a/testainstal/index.php b/testainstal/index.php
index 2e517d2..1c38bcc 100755
--- a/testainstal/index.php
+++ b/testainstal/index.php
@@ -221,10 +221,10 @@ HTML;
 		if(!empty($_POST["criaPastaMstmp"]) && $_POST["criaPastaMstmp"] == "on"){
 			echo "Criando a pasta $dir_tmp";
 			if(!file_exists($dir_tmp)){
-				@mkdir ($dir_tmp,0774);
+				@mkdir ($dir_tmp,0744);
 			}
 			else{
-				chmod($dir_tmp,0774);
+				chmod($dir_tmp,0744);
 			}
 			if(!file_exists($dir_tmp)){
 				echo "<span style=color:red >Arquivo $dir_tmp n&atilde;o pode ser criado";
@@ -243,7 +243,7 @@ HTML;
 				@symlink($dir_tmp,$d);
 			}
 			else{
-				chmod($d,0774);
+				chmod($d,0744);
 			}
 			if(!file_exists($d)){
 				echo "<span style=color:red >Link $d n&atilde;o pode ser criado\n";
@@ -258,10 +258,10 @@ HTML;
 		if(!empty($_POST["criaPastaMstmp"]) && $_POST["permPastaI3geo"] == "on"){
 			echo "Alterando permiss&otilde;es i3geo i3geo/temas i3geo/admin i3geo/admin/admin.db\n";
 			if(file_exists($locaplic)){
-				chmod($locaplic,0774);
-				chmod($locaplic."/temas",0774);
-				chmod($locaplic."/admin",0774);
-				chmod($locaplic."/admin/admin.db",0774);
+				chmod($locaplic,0744);
+				chmod($locaplic."/temas",0744);
+				chmod($locaplic."/admin",0744);
+				chmod($locaplic."/admin/admin.db",0744);
 				echo "...OK\n";
 			}
 		}
--
libgit2 0.21.2