Download as
Browse Code »

Commit 6572fc2cd3786807e52cf25d988ece5ff6afbd6d

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

Correção na validação da blacklist nas ferramentas. No caso da variável de confi… 

…guração estar vazia, o include do ms_configura não estava ocorrendo
Showing 79 changed files with 10 additions and 6 deletions   Show diff stats
admin1/cadastros/identifica/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/identifica/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/identifica/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/identifica/templates/templateOpcoesTarget.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/perfis/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/perfis/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/perfis/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/servicos/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/servicos/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/servicos/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/servicos/templates/templateOpcoesTipo.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/sistemas/funcoes/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/sistemas/funcoes/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/sistemas/funcoes/templates/templateOpcoesPerfil.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/sistemas/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/sistemas/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/sistemas/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/sistemas/templates/templateOpcoesPerfil.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/tags/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/tags/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/cadastros/tags/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/atlas/pranchas/temas/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/atlas/pranchas/temas/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/atlas/pranchas/temas/templates/templateTemas.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/atlas/pranchas/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/atlas/pranchas/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/atlas/pranchas/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/atlas/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/atlas/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/atlas/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/atlas/templates/templateOpcoesTipoGuia.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/mapas/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/mapas/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/mapas/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/mapas/templates/templateOpcoesPerfil.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/mapas/templates/templateTemas.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/listadegrupos/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/listadegrupos/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesNo.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesPerfil.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesTema.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateTemas.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/templates/templateNos.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesNo.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesPerfil.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesTema.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/subgrupos/templates/templateRaiz.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/templates/templateFormNos.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/templates/templateFormRaiz.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/templates/templateNos.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/templates/templateOpcoesNo.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/templates/templateOpcoesPerfil.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/templates/templateOpcoesTema.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/grupos/templates/templateRaiz.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/templates/templateFiltro.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/templates/templateFormLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/templates/templateLista.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/catalogo/menus/templates/templateOpcoesPerfil.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/templates/templateOpcoesAberto.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/templates/templateOpcoesLigado.php 100644 → 100755
  Diff comments   View file @6572fc2
admin1/templates/templateOpcoesPublicado.php 100644 → 100755
  Diff comments   View file @6572fc2
@@ -481,7 +481,7 @@ Menu superior de opcoes @@ -481,7 +481,7 @@ Menu superior de opcoes
481 } 481 }
482 482
483 .yuimenubaritemlabel, .yuimenuitemlabel { 483 .yuimenubaritemlabel, .yuimenuitemlabel {
484 - font-size: 14px; 484 + font-size: 12px;
485 } 485 }
486 486
487 /* itens dos submenus quando o mouse passa*/ 487 /* itens dos submenus quando o mouse passa*/
@@ -701,7 +701,7 @@ td { @@ -701,7 +701,7 @@ td {
701 color: #2F4632; 701 color: #2F4632;
702 margin: 0px; 702 margin: 0px;
703 text-align: center; 703 text-align: center;
704 - font-size: 12pt !Important; 704 + font-size: 10pt !Important;
705 font-family: Verdana, Arial, Helvetica, sans-serif; 705 font-family: Verdana, Arial, Helvetica, sans-serif;
706 } 706 }
707 707
css/i3geo7.css
  Diff comments   View file @6572fc2
@@ -892,7 +892,7 @@ padding: 0px; @@ -892,7 +892,7 @@ padding: 0px;
892 color: #2F4632; 892 color: #2F4632;
893 margin: 0px; 893 margin: 0px;
894 text-align: center; 894 text-align: center;
895 -font-size: 12pt !Important; 895 +font-size: 10pt !Important;
896 font-family: Verdana, Arial, Helvetica, sans-serif; 896 font-family: Verdana, Arial, Helvetica, sans-serif;
897 } 897 }
898 .ajuda_usuario { 898 .ajuda_usuario {
css/i3geo7.css.php
  Diff comments   View file @6572fc2
@@ -892,7 +892,7 @@ padding: 0px; @@ -892,7 +892,7 @@ padding: 0px;
892 color: #2F4632; 892 color: #2F4632;
893 margin: 0px; 893 margin: 0px;
894 text-align: center; 894 text-align: center;
895 -font-size: 12pt !Important; 895 +font-size: 10pt !Important;
896 font-family: Verdana, Arial, Helvetica, sans-serif; 896 font-family: Verdana, Arial, Helvetica, sans-serif;
897 } 897 }
898 .ajuda_usuario { 898 .ajuda_usuario {
css/i3geo_ferramentas7.css
  Diff comments   View file @6572fc2
@@ -991,7 +991,7 @@ td { @@ -991,7 +991,7 @@ td {
991 color: #2F4632; 991 color: #2F4632;
992 margin: 0px; 992 margin: 0px;
993 text-align: center; 993 text-align: center;
994 - font-size: 12pt !Important; 994 + font-size: 10pt !Important;
995 font-family: Verdana, Arial, Helvetica, sans-serif; 995 font-family: Verdana, Arial, Helvetica, sans-serif;
996 } 996 }
997 997
ferramentas/blacklist.php
  Diff comments   View file @6572fc2
@@ -5,7 +5,11 @@ @@ -5,7 +5,11 @@
5 // 5 //
6 function verificaBlFerramentas($dir,$i3geoBlFerramentas="",$js=true){ 6 function verificaBlFerramentas($dir,$i3geoBlFerramentas="",$js=true){
7 if($i3geoBlFerramentas == ""){ 7 if($i3geoBlFerramentas == ""){
8 - include_once(dirname(__FILE__)."/../ms_configura.php"); 8 + if(file_exists(dirname(__FILE__)."/../ms_configura.php")){
  9 + include_once(dirname(__FILE__)."/../ms_configura.php");
  10 + } else {
  11 + include_once(dirname(__FILE__)."/../../ms_configura.php");
  12 + }
9 } 13 }
10 if(!empty($i3geoBlFerramentas)){ 14 if(!empty($i3geoBlFerramentas)){
11 if(in_array($dir,$i3geoBlFerramentas) == true){ 15 if(in_array($dir,$i3geoBlFerramentas) == true){