From 6572fc2cd3786807e52cf25d988ece5ff6afbd6d Mon Sep 17 00:00:00 2001 From: edmarmoretti Date: Tue, 15 Nov 2016 00:04:59 -0200 Subject: [PATCH] Correção na validação da blacklist nas ferramentas. No caso da variável de configuração estar vazia, o include do ms_configura não estava ocorrendo --- admin1/cadastros/identifica/templates/templateFiltro.php | 0 admin1/cadastros/identifica/templates/templateFormLista.php | 0 admin1/cadastros/identifica/templates/templateLista.php | 0 admin1/cadastros/identifica/templates/templateOpcoesTarget.php | 0 admin1/cadastros/perfis/templates/templateFiltro.php | 0 admin1/cadastros/perfis/templates/templateFormLista.php | 0 admin1/cadastros/perfis/templates/templateLista.php | 0 admin1/cadastros/servicos/templates/templateFiltro.php | 0 admin1/cadastros/servicos/templates/templateFormLista.php | 0 admin1/cadastros/servicos/templates/templateLista.php | 0 admin1/cadastros/servicos/templates/templateOpcoesTipo.php | 0 admin1/cadastros/sistemas/funcoes/templates/templateFiltro.php | 0 admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php | 0 admin1/cadastros/sistemas/funcoes/templates/templateLista.php | 0 admin1/cadastros/sistemas/funcoes/templates/templateOpcoesPerfil.php | 0 admin1/cadastros/sistemas/templates/templateFiltro.php | 0 admin1/cadastros/sistemas/templates/templateFormLista.php | 0 admin1/cadastros/sistemas/templates/templateLista.php | 0 admin1/cadastros/sistemas/templates/templateOpcoesPerfil.php | 0 admin1/cadastros/tags/templates/templateFiltro.php | 0 admin1/cadastros/tags/templates/templateFormLista.php | 0 admin1/cadastros/tags/templates/templateLista.php | 0 admin1/catalogo/atlas/pranchas/temas/templates/templateFiltro.php | 0 admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php | 0 admin1/catalogo/atlas/pranchas/temas/templates/templateLista.php | 0 admin1/catalogo/atlas/pranchas/temas/templates/templateTemas.php | 0 admin1/catalogo/atlas/pranchas/templates/templateFiltro.php | 0 admin1/catalogo/atlas/pranchas/templates/templateFormLista.php | 0 admin1/catalogo/atlas/pranchas/templates/templateLista.php | 0 admin1/catalogo/atlas/templates/templateFiltro.php | 0 admin1/catalogo/atlas/templates/templateFormLista.php | 0 admin1/catalogo/atlas/templates/templateLista.php | 0 admin1/catalogo/atlas/templates/templateOpcoesTipoGuia.php | 0 admin1/catalogo/mapas/templates/templateFiltro.php | 0 admin1/catalogo/mapas/templates/templateFormLista.php | 0 admin1/catalogo/mapas/templates/templateLista.php | 0 admin1/catalogo/mapas/templates/templateOpcoesPerfil.php | 0 admin1/catalogo/mapas/templates/templateTemas.php | 0 admin1/catalogo/menus/grupos/listadegrupos/templates/templateFiltro.php | 0 admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php | 0 admin1/catalogo/menus/grupos/listadegrupos/templates/templateLista.php | 0 admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFiltro.php | 0 admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php | 0 admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateLista.php | 0 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateFiltro.php | 0 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php | 0 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesNo.php | 0 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesPerfil.php | 0 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesTema.php | 0 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateTemas.php | 0 admin1/catalogo/menus/grupos/subgrupos/templates/templateFiltro.php | 0 admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php | 0 admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php | 0 admin1/catalogo/menus/grupos/subgrupos/templates/templateNos.php | 0 admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesNo.php | 0 admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesPerfil.php | 0 admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesTema.php | 0 admin1/catalogo/menus/grupos/subgrupos/templates/templateRaiz.php | 0 admin1/catalogo/menus/grupos/templates/templateFiltro.php | 0 admin1/catalogo/menus/grupos/templates/templateFormNos.php | 0 admin1/catalogo/menus/grupos/templates/templateFormRaiz.php | 0 admin1/catalogo/menus/grupos/templates/templateNos.php | 0 admin1/catalogo/menus/grupos/templates/templateOpcoesNo.php | 0 admin1/catalogo/menus/grupos/templates/templateOpcoesPerfil.php | 0 admin1/catalogo/menus/grupos/templates/templateOpcoesTema.php | 0 admin1/catalogo/menus/grupos/templates/templateRaiz.php | 0 admin1/catalogo/menus/templates/templateFiltro.php | 0 admin1/catalogo/menus/templates/templateFormLista.php | 0 admin1/catalogo/menus/templates/templateLista.php | 0 admin1/catalogo/menus/templates/templateOpcoesPerfil.php | 0 admin1/templates/templateOpcoesAberto.php | 0 admin1/templates/templateOpcoesLigado.php | 0 admin1/templates/templateOpcoesPublicado.php | 0 css/black.css | 2 +- css/geral.css | 2 +- css/i3geo7.css | 2 +- css/i3geo7.css.php | 2 +- css/i3geo_ferramentas7.css | 2 +- ferramentas/blacklist.php | 6 +++++- 79 files changed, 10 insertions(+), 6 deletions(-) mode change 100644 => 100755 admin1/cadastros/identifica/templates/templateFiltro.php mode change 100644 => 100755 admin1/cadastros/identifica/templates/templateFormLista.php mode change 100644 => 100755 admin1/cadastros/identifica/templates/templateLista.php mode change 100644 => 100755 admin1/cadastros/identifica/templates/templateOpcoesTarget.php mode change 100644 => 100755 admin1/cadastros/perfis/templates/templateFiltro.php mode change 100644 => 100755 admin1/cadastros/perfis/templates/templateFormLista.php mode change 100644 => 100755 admin1/cadastros/perfis/templates/templateLista.php mode change 100644 => 100755 admin1/cadastros/servicos/templates/templateFiltro.php mode change 100644 => 100755 admin1/cadastros/servicos/templates/templateFormLista.php mode change 100644 => 100755 admin1/cadastros/servicos/templates/templateLista.php mode change 100644 => 100755 admin1/cadastros/servicos/templates/templateOpcoesTipo.php mode change 100644 => 100755 admin1/cadastros/sistemas/funcoes/templates/templateFiltro.php mode change 100644 => 100755 admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php mode change 100644 => 100755 admin1/cadastros/sistemas/funcoes/templates/templateLista.php mode change 100644 => 100755 admin1/cadastros/sistemas/funcoes/templates/templateOpcoesPerfil.php mode change 100644 => 100755 admin1/cadastros/sistemas/templates/templateFiltro.php mode change 100644 => 100755 admin1/cadastros/sistemas/templates/templateFormLista.php mode change 100644 => 100755 admin1/cadastros/sistemas/templates/templateLista.php mode change 100644 => 100755 admin1/cadastros/sistemas/templates/templateOpcoesPerfil.php mode change 100644 => 100755 admin1/cadastros/tags/templates/templateFiltro.php mode change 100644 => 100755 admin1/cadastros/tags/templates/templateFormLista.php mode change 100644 => 100755 admin1/cadastros/tags/templates/templateLista.php mode change 100644 => 100755 admin1/catalogo/atlas/pranchas/temas/templates/templateFiltro.php mode change 100644 => 100755 admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php mode change 100644 => 100755 admin1/catalogo/atlas/pranchas/temas/templates/templateLista.php mode change 100644 => 100755 admin1/catalogo/atlas/pranchas/temas/templates/templateTemas.php mode change 100644 => 100755 admin1/catalogo/atlas/pranchas/templates/templateFiltro.php mode change 100644 => 100755 admin1/catalogo/atlas/pranchas/templates/templateFormLista.php mode change 100644 => 100755 admin1/catalogo/atlas/pranchas/templates/templateLista.php mode change 100644 => 100755 admin1/catalogo/atlas/templates/templateFiltro.php mode change 100644 => 100755 admin1/catalogo/atlas/templates/templateFormLista.php mode change 100644 => 100755 admin1/catalogo/atlas/templates/templateLista.php mode change 100644 => 100755 admin1/catalogo/atlas/templates/templateOpcoesTipoGuia.php mode change 100644 => 100755 admin1/catalogo/mapas/templates/templateFiltro.php mode change 100644 => 100755 admin1/catalogo/mapas/templates/templateFormLista.php mode change 100644 => 100755 admin1/catalogo/mapas/templates/templateLista.php mode change 100644 => 100755 admin1/catalogo/mapas/templates/templateOpcoesPerfil.php mode change 100644 => 100755 admin1/catalogo/mapas/templates/templateTemas.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/listadegrupos/templates/templateFiltro.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/listadegrupos/templates/templateLista.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFiltro.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateLista.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateFiltro.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesNo.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesPerfil.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesTema.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateTemas.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/templates/templateFiltro.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/templates/templateNos.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesNo.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesPerfil.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesTema.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/subgrupos/templates/templateRaiz.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/templates/templateFiltro.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/templates/templateFormNos.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/templates/templateFormRaiz.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/templates/templateNos.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/templates/templateOpcoesNo.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/templates/templateOpcoesPerfil.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/templates/templateOpcoesTema.php mode change 100644 => 100755 admin1/catalogo/menus/grupos/templates/templateRaiz.php mode change 100644 => 100755 admin1/catalogo/menus/templates/templateFiltro.php mode change 100644 => 100755 admin1/catalogo/menus/templates/templateFormLista.php mode change 100644 => 100755 admin1/catalogo/menus/templates/templateLista.php mode change 100644 => 100755 admin1/catalogo/menus/templates/templateOpcoesPerfil.php mode change 100644 => 100755 admin1/templates/templateOpcoesAberto.php mode change 100644 => 100755 admin1/templates/templateOpcoesLigado.php mode change 100644 => 100755 admin1/templates/templateOpcoesPublicado.php diff --git a/admin1/cadastros/identifica/templates/templateFiltro.php b/admin1/cadastros/identifica/templates/templateFiltro.php old mode 100644 new mode 100755 index 12c5691..12c5691 --- a/admin1/cadastros/identifica/templates/templateFiltro.php +++ b/admin1/cadastros/identifica/templates/templateFiltro.php diff --git a/admin1/cadastros/identifica/templates/templateFormLista.php b/admin1/cadastros/identifica/templates/templateFormLista.php old mode 100644 new mode 100755 index c387e89..c387e89 --- a/admin1/cadastros/identifica/templates/templateFormLista.php +++ b/admin1/cadastros/identifica/templates/templateFormLista.php diff --git a/admin1/cadastros/identifica/templates/templateLista.php b/admin1/cadastros/identifica/templates/templateLista.php old mode 100644 new mode 100755 index 24ab9c3..24ab9c3 --- a/admin1/cadastros/identifica/templates/templateLista.php +++ b/admin1/cadastros/identifica/templates/templateLista.php diff --git a/admin1/cadastros/identifica/templates/templateOpcoesTarget.php b/admin1/cadastros/identifica/templates/templateOpcoesTarget.php old mode 100644 new mode 100755 index eb86ad7..eb86ad7 --- a/admin1/cadastros/identifica/templates/templateOpcoesTarget.php +++ b/admin1/cadastros/identifica/templates/templateOpcoesTarget.php diff --git a/admin1/cadastros/perfis/templates/templateFiltro.php b/admin1/cadastros/perfis/templates/templateFiltro.php old mode 100644 new mode 100755 index 7b0fedb..7b0fedb --- a/admin1/cadastros/perfis/templates/templateFiltro.php +++ b/admin1/cadastros/perfis/templates/templateFiltro.php diff --git a/admin1/cadastros/perfis/templates/templateFormLista.php b/admin1/cadastros/perfis/templates/templateFormLista.php old mode 100644 new mode 100755 index 8cd5ac2..8cd5ac2 --- a/admin1/cadastros/perfis/templates/templateFormLista.php +++ b/admin1/cadastros/perfis/templates/templateFormLista.php diff --git a/admin1/cadastros/perfis/templates/templateLista.php b/admin1/cadastros/perfis/templates/templateLista.php old mode 100644 new mode 100755 index 24520cb..24520cb --- a/admin1/cadastros/perfis/templates/templateLista.php +++ b/admin1/cadastros/perfis/templates/templateLista.php diff --git a/admin1/cadastros/servicos/templates/templateFiltro.php b/admin1/cadastros/servicos/templates/templateFiltro.php old mode 100644 new mode 100755 index 32077af..32077af --- a/admin1/cadastros/servicos/templates/templateFiltro.php +++ b/admin1/cadastros/servicos/templates/templateFiltro.php diff --git a/admin1/cadastros/servicos/templates/templateFormLista.php b/admin1/cadastros/servicos/templates/templateFormLista.php old mode 100644 new mode 100755 index 5b4ea8a..5b4ea8a --- a/admin1/cadastros/servicos/templates/templateFormLista.php +++ b/admin1/cadastros/servicos/templates/templateFormLista.php diff --git a/admin1/cadastros/servicos/templates/templateLista.php b/admin1/cadastros/servicos/templates/templateLista.php old mode 100644 new mode 100755 index d760a6e..d760a6e --- a/admin1/cadastros/servicos/templates/templateLista.php +++ b/admin1/cadastros/servicos/templates/templateLista.php diff --git a/admin1/cadastros/servicos/templates/templateOpcoesTipo.php b/admin1/cadastros/servicos/templates/templateOpcoesTipo.php old mode 100644 new mode 100755 index 4898345..4898345 --- a/admin1/cadastros/servicos/templates/templateOpcoesTipo.php +++ b/admin1/cadastros/servicos/templates/templateOpcoesTipo.php diff --git a/admin1/cadastros/sistemas/funcoes/templates/templateFiltro.php b/admin1/cadastros/sistemas/funcoes/templates/templateFiltro.php old mode 100644 new mode 100755 index 3178f21..3178f21 --- a/admin1/cadastros/sistemas/funcoes/templates/templateFiltro.php +++ b/admin1/cadastros/sistemas/funcoes/templates/templateFiltro.php diff --git a/admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php b/admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php old mode 100644 new mode 100755 index 4bacc01..4bacc01 --- a/admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php +++ b/admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php diff --git a/admin1/cadastros/sistemas/funcoes/templates/templateLista.php b/admin1/cadastros/sistemas/funcoes/templates/templateLista.php old mode 100644 new mode 100755 index 3ac817a..3ac817a --- a/admin1/cadastros/sistemas/funcoes/templates/templateLista.php +++ b/admin1/cadastros/sistemas/funcoes/templates/templateLista.php diff --git a/admin1/cadastros/sistemas/funcoes/templates/templateOpcoesPerfil.php b/admin1/cadastros/sistemas/funcoes/templates/templateOpcoesPerfil.php old mode 100644 new mode 100755 index 7889bba..7889bba --- a/admin1/cadastros/sistemas/funcoes/templates/templateOpcoesPerfil.php +++ b/admin1/cadastros/sistemas/funcoes/templates/templateOpcoesPerfil.php diff --git a/admin1/cadastros/sistemas/templates/templateFiltro.php b/admin1/cadastros/sistemas/templates/templateFiltro.php old mode 100644 new mode 100755 index 51bf8db..51bf8db --- a/admin1/cadastros/sistemas/templates/templateFiltro.php +++ b/admin1/cadastros/sistemas/templates/templateFiltro.php diff --git a/admin1/cadastros/sistemas/templates/templateFormLista.php b/admin1/cadastros/sistemas/templates/templateFormLista.php old mode 100644 new mode 100755 index 5061b96..5061b96 --- a/admin1/cadastros/sistemas/templates/templateFormLista.php +++ b/admin1/cadastros/sistemas/templates/templateFormLista.php diff --git a/admin1/cadastros/sistemas/templates/templateLista.php b/admin1/cadastros/sistemas/templates/templateLista.php old mode 100644 new mode 100755 index 0e045bc..0e045bc --- a/admin1/cadastros/sistemas/templates/templateLista.php +++ b/admin1/cadastros/sistemas/templates/templateLista.php diff --git a/admin1/cadastros/sistemas/templates/templateOpcoesPerfil.php b/admin1/cadastros/sistemas/templates/templateOpcoesPerfil.php old mode 100644 new mode 100755 index 7889bba..7889bba --- a/admin1/cadastros/sistemas/templates/templateOpcoesPerfil.php +++ b/admin1/cadastros/sistemas/templates/templateOpcoesPerfil.php diff --git a/admin1/cadastros/tags/templates/templateFiltro.php b/admin1/cadastros/tags/templates/templateFiltro.php old mode 100644 new mode 100755 index 0bdcd8a..0bdcd8a --- a/admin1/cadastros/tags/templates/templateFiltro.php +++ b/admin1/cadastros/tags/templates/templateFiltro.php diff --git a/admin1/cadastros/tags/templates/templateFormLista.php b/admin1/cadastros/tags/templates/templateFormLista.php old mode 100644 new mode 100755 index 3b4debe..3b4debe --- a/admin1/cadastros/tags/templates/templateFormLista.php +++ b/admin1/cadastros/tags/templates/templateFormLista.php diff --git a/admin1/cadastros/tags/templates/templateLista.php b/admin1/cadastros/tags/templates/templateLista.php old mode 100644 new mode 100755 index 0e61c6b..0e61c6b --- a/admin1/cadastros/tags/templates/templateLista.php +++ b/admin1/cadastros/tags/templates/templateLista.php diff --git a/admin1/catalogo/atlas/pranchas/temas/templates/templateFiltro.php b/admin1/catalogo/atlas/pranchas/temas/templates/templateFiltro.php old mode 100644 new mode 100755 index 35f1a7a..35f1a7a --- a/admin1/catalogo/atlas/pranchas/temas/templates/templateFiltro.php +++ b/admin1/catalogo/atlas/pranchas/temas/templates/templateFiltro.php diff --git a/admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php b/admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php old mode 100644 new mode 100755 index 94a8bdb..94a8bdb --- a/admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php +++ b/admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php diff --git a/admin1/catalogo/atlas/pranchas/temas/templates/templateLista.php b/admin1/catalogo/atlas/pranchas/temas/templates/templateLista.php old mode 100644 new mode 100755 index 18fc06c..18fc06c --- a/admin1/catalogo/atlas/pranchas/temas/templates/templateLista.php +++ b/admin1/catalogo/atlas/pranchas/temas/templates/templateLista.php diff --git a/admin1/catalogo/atlas/pranchas/temas/templates/templateTemas.php b/admin1/catalogo/atlas/pranchas/temas/templates/templateTemas.php old mode 100644 new mode 100755 index 3cd464e..3cd464e --- a/admin1/catalogo/atlas/pranchas/temas/templates/templateTemas.php +++ b/admin1/catalogo/atlas/pranchas/temas/templates/templateTemas.php diff --git a/admin1/catalogo/atlas/pranchas/templates/templateFiltro.php b/admin1/catalogo/atlas/pranchas/templates/templateFiltro.php old mode 100644 new mode 100755 index 45b48e1..45b48e1 --- a/admin1/catalogo/atlas/pranchas/templates/templateFiltro.php +++ b/admin1/catalogo/atlas/pranchas/templates/templateFiltro.php diff --git a/admin1/catalogo/atlas/pranchas/templates/templateFormLista.php b/admin1/catalogo/atlas/pranchas/templates/templateFormLista.php old mode 100644 new mode 100755 index 6fd86d5..6fd86d5 --- a/admin1/catalogo/atlas/pranchas/templates/templateFormLista.php +++ b/admin1/catalogo/atlas/pranchas/templates/templateFormLista.php diff --git a/admin1/catalogo/atlas/pranchas/templates/templateLista.php b/admin1/catalogo/atlas/pranchas/templates/templateLista.php old mode 100644 new mode 100755 index 21e19c5..21e19c5 --- a/admin1/catalogo/atlas/pranchas/templates/templateLista.php +++ b/admin1/catalogo/atlas/pranchas/templates/templateLista.php diff --git a/admin1/catalogo/atlas/templates/templateFiltro.php b/admin1/catalogo/atlas/templates/templateFiltro.php old mode 100644 new mode 100755 index a147982..a147982 --- a/admin1/catalogo/atlas/templates/templateFiltro.php +++ b/admin1/catalogo/atlas/templates/templateFiltro.php diff --git a/admin1/catalogo/atlas/templates/templateFormLista.php b/admin1/catalogo/atlas/templates/templateFormLista.php old mode 100644 new mode 100755 index b007257..b007257 --- a/admin1/catalogo/atlas/templates/templateFormLista.php +++ b/admin1/catalogo/atlas/templates/templateFormLista.php diff --git a/admin1/catalogo/atlas/templates/templateLista.php b/admin1/catalogo/atlas/templates/templateLista.php old mode 100644 new mode 100755 index ecd6b70..ecd6b70 --- a/admin1/catalogo/atlas/templates/templateLista.php +++ b/admin1/catalogo/atlas/templates/templateLista.php diff --git a/admin1/catalogo/atlas/templates/templateOpcoesTipoGuia.php b/admin1/catalogo/atlas/templates/templateOpcoesTipoGuia.php old mode 100644 new mode 100755 index 7d27491..7d27491 --- a/admin1/catalogo/atlas/templates/templateOpcoesTipoGuia.php +++ b/admin1/catalogo/atlas/templates/templateOpcoesTipoGuia.php diff --git a/admin1/catalogo/mapas/templates/templateFiltro.php b/admin1/catalogo/mapas/templates/templateFiltro.php old mode 100644 new mode 100755 index 431cf76..431cf76 --- a/admin1/catalogo/mapas/templates/templateFiltro.php +++ b/admin1/catalogo/mapas/templates/templateFiltro.php diff --git a/admin1/catalogo/mapas/templates/templateFormLista.php b/admin1/catalogo/mapas/templates/templateFormLista.php old mode 100644 new mode 100755 index 2627d6d..2627d6d --- a/admin1/catalogo/mapas/templates/templateFormLista.php +++ b/admin1/catalogo/mapas/templates/templateFormLista.php diff --git a/admin1/catalogo/mapas/templates/templateLista.php b/admin1/catalogo/mapas/templates/templateLista.php old mode 100644 new mode 100755 index d681ba8..d681ba8 --- a/admin1/catalogo/mapas/templates/templateLista.php +++ b/admin1/catalogo/mapas/templates/templateLista.php diff --git a/admin1/catalogo/mapas/templates/templateOpcoesPerfil.php b/admin1/catalogo/mapas/templates/templateOpcoesPerfil.php old mode 100644 new mode 100755 index 7889bba..7889bba --- a/admin1/catalogo/mapas/templates/templateOpcoesPerfil.php +++ b/admin1/catalogo/mapas/templates/templateOpcoesPerfil.php diff --git a/admin1/catalogo/mapas/templates/templateTemas.php b/admin1/catalogo/mapas/templates/templateTemas.php old mode 100644 new mode 100755 index 3cd464e..3cd464e --- a/admin1/catalogo/mapas/templates/templateTemas.php +++ b/admin1/catalogo/mapas/templates/templateTemas.php diff --git a/admin1/catalogo/menus/grupos/listadegrupos/templates/templateFiltro.php b/admin1/catalogo/menus/grupos/listadegrupos/templates/templateFiltro.php old mode 100644 new mode 100755 index b2bbc65..b2bbc65 --- a/admin1/catalogo/menus/grupos/listadegrupos/templates/templateFiltro.php +++ b/admin1/catalogo/menus/grupos/listadegrupos/templates/templateFiltro.php diff --git a/admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php b/admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php old mode 100644 new mode 100755 index 6c38c8b..6c38c8b --- a/admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php +++ b/admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php diff --git a/admin1/catalogo/menus/grupos/listadegrupos/templates/templateLista.php b/admin1/catalogo/menus/grupos/listadegrupos/templates/templateLista.php old mode 100644 new mode 100755 index 64c86ec..64c86ec --- a/admin1/catalogo/menus/grupos/listadegrupos/templates/templateLista.php +++ b/admin1/catalogo/menus/grupos/listadegrupos/templates/templateLista.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFiltro.php b/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFiltro.php old mode 100644 new mode 100755 index 88002b7..88002b7 --- a/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFiltro.php +++ b/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFiltro.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php b/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php old mode 100644 new mode 100755 index 755ae71..755ae71 --- a/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php +++ b/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateLista.php b/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateLista.php old mode 100644 new mode 100755 index 5657410..5657410 --- a/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateLista.php +++ b/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateLista.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateFiltro.php b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateFiltro.php old mode 100644 new mode 100755 index 5113e9e..5113e9e --- a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateFiltro.php +++ b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateFiltro.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php old mode 100644 new mode 100755 index b9bf15f..b9bf15f --- a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php +++ b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesNo.php b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesNo.php old mode 100644 new mode 100755 index 71cd2b7..71cd2b7 --- a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesNo.php +++ b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesNo.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesPerfil.php b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesPerfil.php old mode 100644 new mode 100755 index 7889bba..7889bba --- a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesPerfil.php +++ b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesPerfil.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesTema.php b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesTema.php old mode 100644 new mode 100755 index a924e99..a924e99 --- a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesTema.php +++ b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateOpcoesTema.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateTemas.php b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateTemas.php old mode 100644 new mode 100755 index f5d783d..f5d783d --- a/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateTemas.php +++ b/admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateTemas.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/templates/templateFiltro.php b/admin1/catalogo/menus/grupos/subgrupos/templates/templateFiltro.php old mode 100644 new mode 100755 index c4eb26e..c4eb26e --- a/admin1/catalogo/menus/grupos/subgrupos/templates/templateFiltro.php +++ b/admin1/catalogo/menus/grupos/subgrupos/templates/templateFiltro.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php b/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php old mode 100644 new mode 100755 index 92c6ebf..92c6ebf --- a/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php +++ b/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php b/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php old mode 100644 new mode 100755 index 080914b..080914b --- a/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php +++ b/admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/templates/templateNos.php b/admin1/catalogo/menus/grupos/subgrupos/templates/templateNos.php old mode 100644 new mode 100755 index 4ab8a57..4ab8a57 --- a/admin1/catalogo/menus/grupos/subgrupos/templates/templateNos.php +++ b/admin1/catalogo/menus/grupos/subgrupos/templates/templateNos.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesNo.php b/admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesNo.php old mode 100644 new mode 100755 index 71cd2b7..71cd2b7 --- a/admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesNo.php +++ b/admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesNo.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesPerfil.php b/admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesPerfil.php old mode 100644 new mode 100755 index 7889bba..7889bba --- a/admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesPerfil.php +++ b/admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesPerfil.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesTema.php b/admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesTema.php old mode 100644 new mode 100755 index a924e99..a924e99 --- a/admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesTema.php +++ b/admin1/catalogo/menus/grupos/subgrupos/templates/templateOpcoesTema.php diff --git a/admin1/catalogo/menus/grupos/subgrupos/templates/templateRaiz.php b/admin1/catalogo/menus/grupos/subgrupos/templates/templateRaiz.php old mode 100644 new mode 100755 index c268648..c268648 --- a/admin1/catalogo/menus/grupos/subgrupos/templates/templateRaiz.php +++ b/admin1/catalogo/menus/grupos/subgrupos/templates/templateRaiz.php diff --git a/admin1/catalogo/menus/grupos/templates/templateFiltro.php b/admin1/catalogo/menus/grupos/templates/templateFiltro.php old mode 100644 new mode 100755 index 4d661a3..4d661a3 --- a/admin1/catalogo/menus/grupos/templates/templateFiltro.php +++ b/admin1/catalogo/menus/grupos/templates/templateFiltro.php diff --git a/admin1/catalogo/menus/grupos/templates/templateFormNos.php b/admin1/catalogo/menus/grupos/templates/templateFormNos.php old mode 100644 new mode 100755 index 41950a3..41950a3 --- a/admin1/catalogo/menus/grupos/templates/templateFormNos.php +++ b/admin1/catalogo/menus/grupos/templates/templateFormNos.php diff --git a/admin1/catalogo/menus/grupos/templates/templateFormRaiz.php b/admin1/catalogo/menus/grupos/templates/templateFormRaiz.php old mode 100644 new mode 100755 index 558f266..558f266 --- a/admin1/catalogo/menus/grupos/templates/templateFormRaiz.php +++ b/admin1/catalogo/menus/grupos/templates/templateFormRaiz.php diff --git a/admin1/catalogo/menus/grupos/templates/templateNos.php b/admin1/catalogo/menus/grupos/templates/templateNos.php old mode 100644 new mode 100755 index 7491664..7491664 --- a/admin1/catalogo/menus/grupos/templates/templateNos.php +++ b/admin1/catalogo/menus/grupos/templates/templateNos.php diff --git a/admin1/catalogo/menus/grupos/templates/templateOpcoesNo.php b/admin1/catalogo/menus/grupos/templates/templateOpcoesNo.php old mode 100644 new mode 100755 index e704fbd..e704fbd --- a/admin1/catalogo/menus/grupos/templates/templateOpcoesNo.php +++ b/admin1/catalogo/menus/grupos/templates/templateOpcoesNo.php diff --git a/admin1/catalogo/menus/grupos/templates/templateOpcoesPerfil.php b/admin1/catalogo/menus/grupos/templates/templateOpcoesPerfil.php old mode 100644 new mode 100755 index 7889bba..7889bba --- a/admin1/catalogo/menus/grupos/templates/templateOpcoesPerfil.php +++ b/admin1/catalogo/menus/grupos/templates/templateOpcoesPerfil.php diff --git a/admin1/catalogo/menus/grupos/templates/templateOpcoesTema.php b/admin1/catalogo/menus/grupos/templates/templateOpcoesTema.php old mode 100644 new mode 100755 index a924e99..a924e99 --- a/admin1/catalogo/menus/grupos/templates/templateOpcoesTema.php +++ b/admin1/catalogo/menus/grupos/templates/templateOpcoesTema.php diff --git a/admin1/catalogo/menus/grupos/templates/templateRaiz.php b/admin1/catalogo/menus/grupos/templates/templateRaiz.php old mode 100644 new mode 100755 index c268648..c268648 --- a/admin1/catalogo/menus/grupos/templates/templateRaiz.php +++ b/admin1/catalogo/menus/grupos/templates/templateRaiz.php diff --git a/admin1/catalogo/menus/templates/templateFiltro.php b/admin1/catalogo/menus/templates/templateFiltro.php old mode 100644 new mode 100755 index 8a45341..8a45341 --- a/admin1/catalogo/menus/templates/templateFiltro.php +++ b/admin1/catalogo/menus/templates/templateFiltro.php diff --git a/admin1/catalogo/menus/templates/templateFormLista.php b/admin1/catalogo/menus/templates/templateFormLista.php old mode 100644 new mode 100755 index 0444d76..0444d76 --- a/admin1/catalogo/menus/templates/templateFormLista.php +++ b/admin1/catalogo/menus/templates/templateFormLista.php diff --git a/admin1/catalogo/menus/templates/templateLista.php b/admin1/catalogo/menus/templates/templateLista.php old mode 100644 new mode 100755 index 3d7699a..3d7699a --- a/admin1/catalogo/menus/templates/templateLista.php +++ b/admin1/catalogo/menus/templates/templateLista.php diff --git a/admin1/catalogo/menus/templates/templateOpcoesPerfil.php b/admin1/catalogo/menus/templates/templateOpcoesPerfil.php old mode 100644 new mode 100755 index 7889bba..7889bba --- a/admin1/catalogo/menus/templates/templateOpcoesPerfil.php +++ b/admin1/catalogo/menus/templates/templateOpcoesPerfil.php diff --git a/admin1/templates/templateOpcoesAberto.php b/admin1/templates/templateOpcoesAberto.php old mode 100644 new mode 100755 index 71ef128..71ef128 --- a/admin1/templates/templateOpcoesAberto.php +++ b/admin1/templates/templateOpcoesAberto.php diff --git a/admin1/templates/templateOpcoesLigado.php b/admin1/templates/templateOpcoesLigado.php old mode 100644 new mode 100755 index ea22c8f..ea22c8f --- a/admin1/templates/templateOpcoesLigado.php +++ b/admin1/templates/templateOpcoesLigado.php diff --git a/admin1/templates/templateOpcoesPublicado.php b/admin1/templates/templateOpcoesPublicado.php old mode 100644 new mode 100755 index 6f16f70..6f16f70 --- a/admin1/templates/templateOpcoesPublicado.php +++ b/admin1/templates/templateOpcoesPublicado.php diff --git a/css/black.css b/css/black.css index 1ee5b52..8531059 100755 --- a/css/black.css +++ b/css/black.css @@ -481,7 +481,7 @@ Menu superior de opcoes } .yuimenubaritemlabel, .yuimenuitemlabel { - font-size: 14px; + font-size: 12px; } /* itens dos submenus quando o mouse passa*/ diff --git a/css/geral.css b/css/geral.css index 08b99d6..4498ad3 100755 --- a/css/geral.css +++ b/css/geral.css @@ -701,7 +701,7 @@ td { color: #2F4632; margin: 0px; text-align: center; - font-size: 12pt !Important; + font-size: 10pt !Important; font-family: Verdana, Arial, Helvetica, sans-serif; } diff --git a/css/i3geo7.css b/css/i3geo7.css index aca6f5f..9aab27d 100755 --- a/css/i3geo7.css +++ b/css/i3geo7.css @@ -892,7 +892,7 @@ padding: 0px; color: #2F4632; margin: 0px; text-align: center; -font-size: 12pt !Important; +font-size: 10pt !Important; font-family: Verdana, Arial, Helvetica, sans-serif; } .ajuda_usuario { diff --git a/css/i3geo7.css.php b/css/i3geo7.css.php index 37b7802..6074a67 100755 --- a/css/i3geo7.css.php +++ b/css/i3geo7.css.php @@ -892,7 +892,7 @@ padding: 0px; color: #2F4632; margin: 0px; text-align: center; -font-size: 12pt !Important; +font-size: 10pt !Important; font-family: Verdana, Arial, Helvetica, sans-serif; } .ajuda_usuario { diff --git a/css/i3geo_ferramentas7.css b/css/i3geo_ferramentas7.css index 500a1a8..b37710d 100755 --- a/css/i3geo_ferramentas7.css +++ b/css/i3geo_ferramentas7.css @@ -991,7 +991,7 @@ td { color: #2F4632; margin: 0px; text-align: center; - font-size: 12pt !Important; + font-size: 10pt !Important; font-family: Verdana, Arial, Helvetica, sans-serif; } diff --git a/ferramentas/blacklist.php b/ferramentas/blacklist.php index b1cc27c..a90908f 100755 --- a/ferramentas/blacklist.php +++ b/ferramentas/blacklist.php @@ -5,7 +5,11 @@ // function verificaBlFerramentas($dir,$i3geoBlFerramentas="",$js=true){ if($i3geoBlFerramentas == ""){ - include_once(dirname(__FILE__)."/../ms_configura.php"); + if(file_exists(dirname(__FILE__)."/../ms_configura.php")){ + include_once(dirname(__FILE__)."/../ms_configura.php"); + } else { + include_once(dirname(__FILE__)."/../../ms_configura.php"); + } } if(!empty($i3geoBlFerramentas)){ if(in_array($dir,$i3geoBlFerramentas) == true){ -- libgit2 0.21.2