Commit fee0af0ed2e4b91d7f5a7128403b90753e68c4d9

Authored by Edmar Moretti
1 parent 63640e5f
Exists in master

ajustes de validação de variáveis

admin/php/admin.php
... ... @@ -38,8 +38,8 @@ if(!isset($locaplic) || !isset($dir_tmp)){
38 38 include(dirname(__FILE__)."/../../ms_configura.php");
39 39 }
40 40 if(!file_exists($dir_tmp)){
41   - @mkdir ($dir_tmp,0777);
42   - chmod($dir_tmp,0777);
  41 + @mkdir ($dir_tmp,0774);
  42 + chmod($dir_tmp,0774);
43 43 }
44 44 include_once($locaplic."/classesphp/pega_variaveis.php");
45 45 error_reporting(0);
... ...
admin/php/conexao.php
... ... @@ -65,7 +65,7 @@ if(!isset($logTransacoes)){
65 65 $convUTF = true;
66 66 if($conexaoadmin == ""){
67 67 $arquivosqlite = $locaplic."/admin/admin.db";
68   - chmod($arquivosqlite,0777);
  68 + chmod($arquivosqlite,0774);
69 69 //echo $arquivosqlite;exit;
70 70 if(!file_exists($arquivosqlite)){
71 71 echo "O arquivo admin.db não existe. Utilize i3geo/admin/criabanco.php para criar o banco de dados SQLITE.";
... ...
admin/php/editormapfile.php
... ... @@ -2466,7 +2466,7 @@ function removeCabecalho($arq,$symbolset=true)
2466 2466 $nomeMapfileTmp = $dir_tmp."/ogc_".md5($arq).".map";
2467 2467 $nomeMapfileTmp = str_replace(",","",$nomeMapfileTmp);
2468 2468 $nomeMapfileTmp = str_replace(" ","",$nomeMapfileTmp);
2469   - chmod($nomeMapfileTmp,0777);
  2469 + chmod($nomeMapfileTmp,0774);
2470 2470 unlink($nomeMapfileTmp);
2471 2471 //echo $nomeMapfileTmp;exit;
2472 2472 //remove o cache OGC
... ... @@ -2537,11 +2537,11 @@ function removeCabecalho($arq,$symbolset=true)
2537 2537 }
2538 2538 function rrmdir($dir) {
2539 2539 if (is_dir($dir)) {
2540   - chmod($dir,0777);
  2540 + chmod($dir,0774);
2541 2541 $objects = scandir($dir);
2542 2542 foreach ($objects as $object) {
2543 2543 if ($object != "." && $object != "..") {
2544   - chmod($dir."/".$object,0777);
  2544 + chmod($dir."/".$object,0774);
2545 2545 if (filetype($dir."/".$object) == "dir") rrmdir($dir."/".$object); else unlink($dir."/".$object);
2546 2546 }
2547 2547 }
... ...
admin/php/estat_mapa_upload.php
... ... @@ -33,7 +33,7 @@ if (isset($_FILES['uploadimagem']['name'])){
33 33 {echo "<p class='paragrafo' >Ocorreu um erro no envio do arquivo. Verifique as permissoes de escrita";exit;}
34 34 if($status == 1){
35 35 echo "<p class='paragrafo' >Arquivo enviado.</p>";
36   - chmod($arq,0777);
  36 + chmod($arq,0774);
37 37 }
38 38 else{
39 39 echo "<p class='paragrafo' >Erro ao enviar o arquivo.</p>";
... ... @@ -56,4 +56,4 @@ function verificaNome($nome)
56 56 }
57 57 ?>
58 58 </body>
59   -</html>
60 59 \ No newline at end of file
  60 +</html>
... ...
classesjs/compactajs.php
... ... @@ -365,7 +365,7 @@ function packer($src,$out,$tipo=&quot;None&quot;)
365 365 $time = sprintf('%.4f', ($t2 - $t1) );
366 366 echo 'script ', $src, ' packed in ' , $out, ', in ', $time, ' s.', "\n";
367 367 file_put_contents($out, $packed);
368   - chmod($out,0777);
  368 + chmod($out,0774);
369 369 }
370 370 function salvatudojs($jsfiles,$buffer,$final,$tipo)
371 371 {
... ... @@ -409,7 +409,7 @@ function salvatudojs($jsfiles,$buffer,$final,$tipo)
409 409 $fecha = fclose ($abre);
410 410  
411 411  
412   - chmod($final,0777);
  412 + chmod($final,0774);
413 413 //gzip
414 414 $abre = fopen($final, "r");
415 415 if ($tipo == "js")
... ... @@ -424,7 +424,7 @@ function salvatudojs($jsfiles,$buffer,$final,$tipo)
424 424 $abre = fopen($final.".php", "wt");
425 425 $escreve = fwrite ($abre,$buffer);
426 426 $fecha = fclose ($abre);
427   - chmod($final.".php",0777);
  427 + chmod($final.".php",0774);
428 428 }
429 429 ?>
430 430 <p>Notas importantes:</p>
... ...
classesjs/compactajs_closurecompiler.php
... ... @@ -106,7 +106,7 @@ foreach($lista as $l){
106 106 $saida = shell_exec("java -jar {$java} --warning_level DEFAULT --js {$input} --js_output_file {$output}");
107 107 echo "<pre>".$saida."</pre>";
108 108 unlink($input);
109   - chmod($output,0777);
  109 + chmod($output,0774);
110 110 }
111 111  
112 112  
... ... @@ -235,7 +235,7 @@ foreach ($cssfiles as $f)
235 235 $abre = fopen("../css/i3geo_ferramentas6.css", "wt");
236 236 $escreve = fwrite ($abre,$buffer);
237 237 $fecha = fclose ($abre);
238   -chmod("../css/i3geo_ferramentas6.css",0777);
  238 +chmod("../css/i3geo_ferramentas6.css",0774);
239 239 //
240 240 //compacta os codigos para o Mashup do OpenLayers
241 241 //
... ... @@ -322,7 +322,7 @@ function packer($src,$out,$tipo=&quot;None&quot;)
322 322 $time = sprintf('%.4f', ($t2 - $t1) );
323 323 echo 'script ', $src, ' packed in ' , $out, ', in ', $time, ' s.', "\n";
324 324 file_put_contents($out, $packed);
325   - chmod($out,0777);
  325 + chmod($out,0774);
326 326 }
327 327 function removeconsole($src,$out,$tipo="None")
328 328 {
... ... @@ -372,7 +372,7 @@ function salvatudojs($jsfiles,$buffer,$final,$tipo)
372 372 $fecha = fclose ($abre);
373 373  
374 374  
375   - chmod($final,0777);
  375 + chmod($final,0774);
376 376 //gzip
377 377 $abre = fopen($final, "r");
378 378 if ($tipo == "js")
... ... @@ -387,6 +387,6 @@ function salvatudojs($jsfiles,$buffer,$final,$tipo)
387 387 $abre = fopen($final.".php", "wt");
388 388 $escreve = fwrite ($abre,$buffer);
389 389 $fecha = fclose ($abre);
390   - chmod($final.".php",0777);
  390 + chmod($final.".php",0774);
391 391 }
392 392 ?>
... ...
classesphp/mapa_googlemaps.php
... ... @@ -482,7 +482,7 @@ function salvaCacheImagem(){
482 482 }
483 483 $c = $cachedir."/googlemaps/$layer/$z/$x";
484 484 if(!file_exists($c."/$y.png")){
485   - mkdir($cachedir."/googlemaps/$layer/$z/$x",0777,true);
  485 + mkdir($cachedir."/googlemaps/$layer/$z/$x",0774,true);
486 486 $img->saveImage($c."/$y.png");
487 487 //
488 488 //corta a imagem gerada para voltar ao tamanho normal
... ... @@ -491,8 +491,8 @@ function salvaCacheImagem(){
491 491 $img = cortaImagemDisco($c."/$y.png",$cortePixels,256);
492 492 }
493 493  
494   - chmod($cachedir."/googlemaps/$layer/$z/$x",0777);
495   - chmod($c."/$y.png",0777);
  494 + chmod($cachedir."/googlemaps/$layer/$z/$x",0774);
  495 + chmod($c."/$y.png",0774);
496 496 }
497 497 return $c."/$y.png";
498 498 }
... ...
classesphp/mapa_googlemaps_alternativo.php
... ... @@ -323,9 +323,9 @@ function salvaCacheImagem(){
323 323 }
324 324 $c = $cachedir."/googlemaps/$layer/$z/$x";
325 325 if(!file_exists($c."/$y.png")){
326   - mkdir($cachedir."/googlemaps/$layer/$z/$x",0777,true);
  326 + mkdir($cachedir."/googlemaps/$layer/$z/$x",0774,true);
327 327 $img->saveImage($c."/$y.png");
328   - chmod($c."/$y.png",0777);
  328 + chmod($c."/$y.png",0774);
329 329 }
330 330 return $nome;
331 331 }
... ... @@ -444,4 +444,4 @@ function versaoMS()
444 444 $versao["principal"] = $v[0];
445 445 return $versao;
446 446 }
447   -?>
448 447 \ No newline at end of file
  448 +?>
... ...
classesphp/mapa_openlayers.php
... ... @@ -494,8 +494,8 @@ function salvaCacheImagem($cachedir,$map,$tms){
494 494 $nome = $cachedir.$tms;
495 495 }
496 496 if(!file_exists($nome)){
497   - @mkdir(dirname($nome),0777,true);
498   - chmod(dirname($nome),0777);
  497 + @mkdir(dirname($nome),0774,true);
  498 + chmod(dirname($nome),0774);
499 499 $img->saveImage($nome);
500 500 //
501 501 //corta a imagem gerada para voltar ao tamanho normal
... ... @@ -503,7 +503,7 @@ function salvaCacheImagem($cachedir,$map,$tms){
503 503 if($cortePixels > 0){
504 504 $img = cortaImagemDisco($nome,$cortePixels,256);
505 505 }
506   - chmod($nome,0777);
  506 + chmod($nome,0774);
507 507 }
508 508 return $nome;
509 509 }
... ...
ferramentas/congelamapa/openlayers.php
... ... @@ -15,7 +15,7 @@ $base = basename($map_file);
15 15 $dir = dirname($map_file);
16 16 $novo_mapfile = $dir."/".nomeRandomico(5).$base;
17 17 copy($map_file,$novo_mapfile);
18   -chmod($novo_mapfile,0777);
  18 +chmod($novo_mapfile,0774);
19 19 $mapa = ms_newMapObj($novo_mapfile);
20 20 $mapa->setProjection(pegaProjecaoDefault("proj4"));
21 21 $numlayers = $mapa->numlayers;
... ... @@ -95,4 +95,4 @@ for(i=0;i&lt;ncontroles;i++){
95 95 mapa.addControl(controles[i]);
96 96 }
97 97 </script>
98   -</body>
99 98 \ No newline at end of file
  99 +</body>
... ...
ferramentas/congelamapa/openlayers3.php
... ... @@ -15,7 +15,7 @@ $base = basename($map_file);
15 15 $dir = dirname($map_file);
16 16 $novo_mapfile = $dir."/".nomeRandomico(5).$base;
17 17 copy($map_file,$novo_mapfile);
18   -chmod($novo_mapfile,0777);
  18 +chmod($novo_mapfile,0774);
19 19 $mapa = ms_newMapObj($novo_mapfile);
20 20 $mapa->setProjection(pegaProjecaoDefault("proj4"));
21 21 $numlayers = $mapa->numlayers;
... ... @@ -83,4 +83,4 @@ var v = mapa.getView();
83 83 v.fit([<?php echo $mapext; ?>], mapa.getSize());
84 84  
85 85 </script>
86   -</body>
87 86 \ No newline at end of file
  87 +</body>
... ...
ferramentas/melhorcaminho/exec.php
... ... @@ -50,7 +50,7 @@ switch (strtoupper($funcao))
50 50 if(file_exists($cost_surface_path)){
51 51 $pathresult = $dir_tmp."/melhorcaminho_".nomeRandomico();
52 52 //cria a pasta onde os resultados serao armazenados
53   - mkdir ($pathresult,0777);
  53 + mkdir ($pathresult,0774);
54 54  
55 55 //parametros para o calculo de melhor caminho e linha reta
56 56 $best = array(
... ... @@ -238,4 +238,4 @@ if (!connection_aborted()){
238 238 else{
239 239 exit();
240 240 }
241   -?>
242 241 \ No newline at end of file
  242 +?>
... ...
ferramentas/parametrossql/ogc.php
... ... @@ -537,8 +537,8 @@ function salvaCacheImagem($cachedir,$map,$tms, $plugin, $tema){
537 537 else{
538 538 $nome = $cachedir.$tms;
539 539 }
540   - @mkdir(dirname($nome),0777,true);
541   - chmod(dirname($nome),0777);
  540 + @mkdir(dirname($nome),0774,true);
  541 + chmod(dirname($nome),0774);
542 542 $img->saveImage($nome);
543 543 //
544 544 //corta a imagem gerada para voltar ao tamanho normal
... ... @@ -555,7 +555,7 @@ function salvaCacheImagem($cachedir,$map,$tms, $plugin, $tema){
555 555 imagecopy($imgc, $img, 0 , 0 , $cortePixels , $cortePixels , 256, 256);
556 556 imagepng($imgc,$nome);
557 557 }
558   - chmod($nome,0777);
  558 + chmod($nome,0774);
559 559 header('Content-Length: '.filesize($nome));
560 560 header('Content-Type: image/png');
561 561 header('Cache-Control: max-age=3600, must-revalidate');
... ...
init/index.php
... ... @@ -21,16 +21,16 @@ if (! empty ( $_GET [&quot;customDir&quot;] )) {
21 21 $customDir = "interface";
22 22 }
23 23 if (! file_exists ( $dir_tmp )) {
24   - @mkdir ( $dir_tmp, 0777 );
  24 + @mkdir ( $dir_tmp, 0774 );
25 25 }
26 26 if (file_exists ( $dir_tmp )) {
27   - @mkdir ( $dir_tmp . "/comum", 0777 );
28   - @mkdir ( $dir_tmp . "/saiku-datasources", 0777 );
29   - chmod ( $dir_tmp . "/saiku-datasources", 0777 );
30   - @mkdir ( $dir_tmp . "/cache", 0777 );
31   - chmod ( $dir_tmp . "/cache", 0777 );
32   - @mkdir ( $dir_tmp . "/cache/googlemaps", 0777 );
33   - chmod ( $dir_tmp . "/cache/googlemaps", 0777 );
  27 + @mkdir ( $dir_tmp . "/comum", 0774 );
  28 + @mkdir ( $dir_tmp . "/saiku-datasources", 0774 );
  29 + chmod ( $dir_tmp . "/saiku-datasources", 0774 );
  30 + @mkdir ( $dir_tmp . "/cache", 0774 );
  31 + chmod ( $dir_tmp . "/cache", 0774 );
  32 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0774 );
  33 + chmod ( $dir_tmp . "/cache/googlemaps", 0774 );
34 34 }
35 35 error_reporting ( 0 );
36 36 include "head.php";
... ...
init/remover.php
... ... @@ -36,8 +36,8 @@ if(file_exists(&quot;../index.htm&quot;) || file_exists(&quot;../index.html&quot;)){
36 36 }
37 37 copy("_index.htm","../index.htm");
38 38 copy("_index.html","../index.html");
39   -chmod("../index.htm",0777);
40   -chmod("../index.html",0777);
  39 +chmod("../index.htm",0774);
  40 +chmod("../index.html",0774);
41 41 echo "<br><b>OK. Removido. Voce pode utilizar o init digitando i3geo/init no navegador";
42 42 ?>
43 43 </div>
... ...
mapas/index.php
... ... @@ -7,16 +7,16 @@ if (! empty ( $_GET [&quot;customDir&quot;] )) {
7 7 $customDir = "interface";
8 8 }
9 9 if (! file_exists ( $dir_tmp )) {
10   - @mkdir ( $dir_tmp, 0777 );
  10 + @mkdir ( $dir_tmp, 0774 );
11 11 }
12 12 if (file_exists ( $dir_tmp )) {
13   - @mkdir ( $dir_tmp . "/comum", 0777 );
14   - @mkdir ( $dir_tmp . "/saiku-datasources", 0777 );
15   - chmod ( $dir_tmp . "/saiku-datasources", 0777 );
16   - @mkdir ( $dir_tmp . "/cache", 0777 );
17   - chmod ( $dir_tmp . "/cache", 0777 );
18   - @mkdir ( $dir_tmp . "/cache/googlemaps", 0777 );
19   - chmod ( $dir_tmp . "/cache/googlemaps", 0777 );
  13 + @mkdir ( $dir_tmp . "/comum", 0774 );
  14 + @mkdir ( $dir_tmp . "/saiku-datasources", 0774 );
  15 + chmod ( $dir_tmp . "/saiku-datasources", 0774 );
  16 + @mkdir ( $dir_tmp . "/cache", 0774 );
  17 + chmod ( $dir_tmp . "/cache", 0774 );
  18 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0774 );
  19 + chmod ( $dir_tmp . "/cache/googlemaps", 0774 );
20 20 }
21 21 error_reporting ( 0 );
22 22 include "../init/head.php";
... ...
mashups/openlayers.php
... ... @@ -11,16 +11,16 @@ include_once(dirname(__FILE__).&quot;/../classesphp/funcoes_gerais.php&quot;);
11 11 error_reporting(0);
12 12 //cria as pastas temporarias caso nao existam
13 13 if (! file_exists ( $dir_tmp )) {
14   - @mkdir ( $dir_tmp, 0777 );
  14 + @mkdir ( $dir_tmp, 0774 );
15 15 }
16 16 if (file_exists ( $dir_tmp )) {
17   - @mkdir ( $dir_tmp . "/comum", 0777 );
18   - @mkdir ( $dir_tmp . "/saiku-datasources", 0777 );
19   - chmod ( $dir_tmp . "/saiku-datasources", 0777 );
20   - @mkdir ( $dir_tmp . "/cache", 0777 );
21   - chmod ( $dir_tmp . "/cache", 0777 );
22   - @mkdir ( $dir_tmp . "/cache/googlemaps", 0777 );
23   - chmod ( $dir_tmp . "/cache/googlemaps", 0777 );
  17 + @mkdir ( $dir_tmp . "/comum", 0774 );
  18 + @mkdir ( $dir_tmp . "/saiku-datasources", 0774 );
  19 + chmod ( $dir_tmp . "/saiku-datasources", 0774 );
  20 + @mkdir ( $dir_tmp . "/cache", 0774 );
  21 + chmod ( $dir_tmp . "/cache", 0774 );
  22 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0774 );
  23 + chmod ( $dir_tmp . "/cache/googlemaps", 0774 );
24 24 }
25 25 //variaveis utilizadas
26 26 $parurl = array_merge($_GET,$_POST);
... ...
mashups/osm.php
... ... @@ -11,16 +11,16 @@ include_once(dirname(__FILE__).&quot;/../classesphp/funcoes_gerais.php&quot;);
11 11 error_reporting(0);
12 12 //cria as pastas temporarias caso nao existam
13 13 if (! file_exists ( $dir_tmp )) {
14   - @mkdir ( $dir_tmp, 0777 );
  14 + @mkdir ( $dir_tmp, 0774 );
15 15 }
16 16 if (file_exists ( $dir_tmp )) {
17   - @mkdir ( $dir_tmp . "/comum", 0777 );
18   - @mkdir ( $dir_tmp . "/saiku-datasources", 0777 );
19   - chmod ( $dir_tmp . "/saiku-datasources", 0777 );
20   - @mkdir ( $dir_tmp . "/cache", 0777 );
21   - chmod ( $dir_tmp . "/cache", 0777 );
22   - @mkdir ( $dir_tmp . "/cache/googlemaps", 0777 );
23   - chmod ( $dir_tmp . "/cache/googlemaps", 0777 );
  17 + @mkdir ( $dir_tmp . "/comum", 0774 );
  18 + @mkdir ( $dir_tmp . "/saiku-datasources", 0774 );
  19 + chmod ( $dir_tmp . "/saiku-datasources", 0774 );
  20 + @mkdir ( $dir_tmp . "/cache", 0774 );
  21 + chmod ( $dir_tmp . "/cache", 0774 );
  22 + @mkdir ( $dir_tmp . "/cache/googlemaps", 0774 );
  23 + chmod ( $dir_tmp . "/cache/googlemaps", 0774 );
24 24 }
25 25 //variaveis utilizadas
26 26 $parurl = array_merge($_GET,$_POST);
... ...
ms_criamapa.php
... ... @@ -1366,33 +1366,33 @@ Retorno:
1366 1366 function criaDirMapa($dir_tmp,$cachedir="")
1367 1367 {
1368 1368 if(!file_exists($dir_tmp)){
1369   - @mkdir ($dir_tmp,0777);
  1369 + @mkdir ($dir_tmp,0774);
1370 1370 }
1371 1371 if(file_exists($dir_tmp))
1372 1372 {
1373 1373 $tmpdirname = nomeRandomico();
1374   - $crdir = @mkdir ($dir_tmp."/".$tmpdirname,0777);
1375   - chmod($dir_tmp."/".$tmpdirname,0777);
1376   - $crdiri = @mkdir ($dir_tmp."/img".$tmpdirname,0777);
1377   - chmod($dir_tmp."/img".$tmpdirname,0777);
  1374 + $crdir = @mkdir ($dir_tmp."/".$tmpdirname,0774);
  1375 + chmod($dir_tmp."/".$tmpdirname,0774);
  1376 + $crdiri = @mkdir ($dir_tmp."/img".$tmpdirname,0774);
  1377 + chmod($dir_tmp."/img".$tmpdirname,0774);
1378 1378 $mapfile = $dir_tmp."/".$tmpdirname."/".$tmpdirname.".map";
1379 1379 $tmpimgname = "img".$tmpdirname;
1380   - @mkdir($dir_tmp."/comum",0777);
  1380 + @mkdir($dir_tmp."/comum",0774);
1381 1381 //utilizado para armazenar os arquivos de fonte de dados do SAIKU
1382   - @mkdir($dir_tmp."/saiku-datasources",0777);
1383   - chmod($dir_tmp."/saiku-datasources",0777);
  1382 + @mkdir($dir_tmp."/saiku-datasources",0774);
  1383 + chmod($dir_tmp."/saiku-datasources",0774);
1384 1384 //
1385 1385 if($cachedir == ""){
1386   - @mkdir($dir_tmp."/cache",0777);
1387   - chmod($dir_tmp."/cache",0777);
1388   - @mkdir($dir_tmp."/cache/googlemaps",0777);
1389   - chmod($dir_tmp."/cache/googlemaps",0777);
  1386 + @mkdir($dir_tmp."/cache",0774);
  1387 + chmod($dir_tmp."/cache",0774);
  1388 + @mkdir($dir_tmp."/cache/googlemaps",0774);
  1389 + chmod($dir_tmp."/cache/googlemaps",0774);
1390 1390 }
1391 1391 else{
1392   - @mkdir($cachedir,0777);
1393   - chmod($cachedir,0777);
1394   - @mkdir($cachedir."/googlemaps",0777);
1395   - chmod($cachedir."/googlemaps",0777);
  1392 + @mkdir($cachedir,0774);
  1393 + chmod($cachedir,0774);
  1394 + @mkdir($cachedir."/googlemaps",0774);
  1395 + chmod($cachedir."/googlemaps",0774);
1396 1396 }
1397 1397 if(file_exists($dir_tmp."/".$tmpdirname))
1398 1398 return array($mapfile,$tmpdirname,$tmpimgname);
... ...