Download as
Browse Code »

Commit 5d53c782b149cf6872bb4d6073c2fffee19c8bc4

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

Correção de erros PHP sistemáticos, principalmente no sistema de administração, … 

…onde a verificação de parâmetros estava construindo um array de forma errada
Showing 81 changed files with 136 additions and 123 deletions   Show diff stats
admin/admin.db
View file @5d53c78
No preview for this file type
admin/php/webservices.php
  Diff comments   View file @5d53c78
... ... @@ -48,7 +48,7 @@ include_once(dirname(__FILE__)."/login.php");
48 48 $id_ws = $_GET["id_ws"];
49 49 $id = $_GET["id"];
50 50  
51   -testaSafeNumerico([$id,$id_ws]);
  51 +testaSafeNumerico(array($id,$id_ws));
52 52  
53 53 $funcoesEdicao = array(
54 54 "ALTERARWS",
... ...
admin1/cadastros/identifica/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( "admin/html/identifica" ) =
32 32 }
33 33 $id_i = $_POST["id_i"];
34 34 $id = $_POST["id"];
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_i,$id]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_i,$id));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/cadastros/identifica/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\cadastros\identifica;
  3 +use PDOException;
3 4 function listar($dbh, $id_i = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_i != ""){
... ...
admin1/cadastros/perfis/exec.php
  Diff comments   View file @5d53c78
... ... @@ -37,7 +37,7 @@ if(!isset($idioma) || $idioma == &quot;&quot;){
37 37 $perfil = str_replace(" ","",$perfil);
38 38  
39 39 $id_perfil = $_POST["id_perfil"];
40   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_perfil]);
  40 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_perfil));
41 41  
42 42 $funcao = strtoupper ( $funcao );
43 43 switch ($funcao) {
... ...
admin1/cadastros/perfis/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\cadastros\perfis;
  3 +use PDOException;
3 4 function listar($dbh, $id_perfil = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_perfil != ""){
... ...
admin1/cadastros/servicos/exec.php
  Diff comments   View file @5d53c78
... ... @@ -7,10 +7,9 @@
7 7 //pega algumas variaveis de uso mais comum
8 8 //session_start
9 9 //
10   -if($_GET["funcao"] != "lista"){
11   - include (dirname(__FILE__)."/../../php/checaLogin.php");
12   - \admin\php\login\checaLogin();
13   -}
  10 +include (dirname(__FILE__)."/../../php/checaLogin.php");
  11 +\admin\php\login\checaLogin();
  12 +
14 13 //funcoes de administracao
15 14 include ($_SESSION["locaplic"]."/admin1/php/funcoesAdmin.php");
16 15 //
... ... @@ -35,7 +34,7 @@ if ($_GET[&quot;funcao&quot;] != &quot;lista&quot; &amp;&amp; \admin\php\funcoesAdmin\verificaOperacaoSessao
35 34 $id_ws = $_POST["id_ws"];
36 35 $id = $_POST["id"];
37 36  
38   -\admin\php\funcoesAdmin\testaSafeNumerico([$id,$id_ws]);
  37 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id,$id_ws));
39 38  
40 39 $funcao = strtoupper ( $funcao );
41 40 switch ($funcao) {
... ...
admin1/cadastros/servicos/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\cadastros\servicos;
  3 +use PDOException;
3 4 function listar($dbh, $id_ws = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_ws != ""){
... ...
admin1/cadastros/sistemas/exec.php
  Diff comments   View file @5d53c78
... ... @@ -37,7 +37,7 @@ $id = $_POST[&quot;id&quot;];
37 37 $id_sistema = $_POST["id_sistema"];
38 38 $id_funcao = $_POST["id_funcao"];
39 39  
40   -\admin\php\funcoesAdmin\testaSafeNumerico([$id,$id_sistema,$id_funcao]);
  40 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id,$id_sistema,$id_funcao));
41 41  
42 42 $funcao = strtoupper ( $funcao );
43 43 switch ($funcao) {
... ...
admin1/cadastros/sistemas/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\cadastros\sistemas;
  3 +use PDOException;
3 4 function listar($dbh, $id_sistema = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_sistema != ""){
... ...
admin1/cadastros/sistemas/funcoes/exec.php
  Diff comments   View file @5d53c78
... ... @@ -37,7 +37,7 @@ $id = $_POST[&quot;id&quot;];
37 37 $id_sistema = $_POST["id_sistema"];
38 38 $id_funcao = $_POST["id_funcao"];
39 39  
40   -\admin\php\funcoesAdmin\testaSafeNumerico([$id,$id_sistema,$id_funcao]);
  40 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id,$id_sistema,$id_funcao));
41 41  
42 42 $funcao = strtoupper ( $funcao );
43 43 switch ($funcao) {
... ...
admin1/cadastros/sistemas/funcoes/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\cadastros\sistemas\funcoes;
3   -
  3 +use PDOException;
4 4 function listar($dbh, $id_sistema, $id_funcao = ""){
5 5 $esquemaadmin = $_SESSION["esquemaadmin"];
6 6 if($id_funcao != ""){
... ...
admin1/cadastros/tags/exec.php
  Diff comments   View file @5d53c78
... ... @@ -33,7 +33,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/arvore&quot; ) === f
33 33 //remove espaco em branco do nome do tag
34 34 $nome = str_replace(" ","",$_POST["nome"]);
35 35 $id_tag = $_POST["id_tag"];
36   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_tag]);
  36 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_tag));
37 37  
38 38 $funcao = strtoupper ( $funcao );
39 39 switch ($funcao) {
... ...
admin1/cadastros/tags/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\cadastros\tags;
  3 +use PDOException;
3 4 function listar($dbh, $id_tag = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_tag != ""){
... ...
admin1/catalogo/atlas/exec.php
  Diff comments   View file @5d53c78
... ... @@ -34,7 +34,7 @@ $id = $_POST[&quot;id&quot;];
34 34 $id_atlas = $_POST["id_atlas"];
35 35 $id_prancha = $_POST["id_prancha"];
36 36  
37   -\admin\php\funcoesAdmin\testaSafeNumerico([$id,$id_atlas,$id_prancha]);
  37 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id,$id_atlas,$id_prancha));
38 38  
39 39 $funcao = strtoupper ( $funcao );
40 40 switch ($funcao) {
... ...
admin1/catalogo/atlas/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\atlas;
  3 +use PDOException;
3 4 function listar($dbh, $id_atlas = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_atlas != ""){
... ...
admin1/catalogo/atlas/pranchas/exec.php
  Diff comments   View file @5d53c78
... ... @@ -34,7 +34,7 @@ $id = $_POST[&quot;id&quot;];
34 34 $id_atlas = $_POST["id_atlas"];
35 35 $id_prancha = $_POST["id_prancha"];
36 36  
37   -\admin\php\funcoesAdmin\testaSafeNumerico([$id,$id_atlas,$id_prancha]);
  37 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id,$id_atlas,$id_prancha));
38 38  
39 39 $funcao = strtoupper ( $funcao );
40 40 switch ($funcao) {
... ...
admin1/catalogo/atlas/pranchas/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\atlas\pranchas;
  3 +use PDOException;
3 4 function listar($dbh, $id_atlas = "",$id_prancha = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_prancha != ""){
... ...
admin1/catalogo/atlas/pranchas/temas/exec.php
  Diff comments   View file @5d53c78
... ... @@ -35,7 +35,7 @@ $id_atlas = $_POST[&quot;id_atlas&quot;];
35 35 $id_prancha = $_POST["id_prancha"];
36 36 $id_tema = $_POST["id_tema"];
37 37  
38   -\admin\php\funcoesAdmin\testaSafeNumerico([$id,$id_atlas,$id_prancha]);
  38 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id,$id_atlas,$id_prancha));
39 39  
40 40 $funcao = strtoupper ( $funcao );
41 41 switch ($funcao) {
... ...
admin1/catalogo/atlas/pranchas/temas/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\atlas\pranchas\temas;
  3 +use PDOException;
3 4 function listar($dbh, $id_prancha = "", $id_tema = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_tema != ""){
... ...
admin1/catalogo/mapas/exec.php
  Diff comments   View file @5d53c78
... ... @@ -31,9 +31,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/mapas&quot; ) === fa
31 31 exit ();
32 32 }
33 33 $id_mapa = $_POST ["id_mapa"];
34   -\admin\php\funcoesAdmin\testaSafeNumerico ( [
35   - $id_mapa
36   -] );
  34 +\admin\php\funcoesAdmin\testaSafeNumerico ( array($id_mapa) );
37 35  
38 36 $funcao = strtoupper ( $funcao );
39 37 switch ($funcao) {
... ...
admin1/catalogo/mapas/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\mapas;
  3 +use PDOException;
3 4 function listar($dbh, $id_mapa = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_mapa != ""){
... ...
admin1/catalogo/mapfile/cdados/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\mapfile\cdados;
  3 +use Exception;
3 4 function listar($locaplic,$codigo){
4 5 // pega o nome registrado no mapfile
5 6 if (! file_exists ( $locaplic . "/temas/" . $codigo . ".map" )) {
... ...
admin1/catalogo/mapfile/disponibilidade/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\mapfile\disponibilidade;
  3 +use PDOException;
3 4 function listar($locaplic,$codigo){
4 5  
5 6  
... ...
admin1/catalogo/mapfile/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\mapfile;
3   -
  3 +use PDOException;
4 4 function excluir($codigo, $dbhw) {
5 5 $esquemaadmin = $_SESSION["esquemaadmin"];
6 6 $locaplic = $_SESSION["locaplic"];
... ...
admin1/catalogo/mapfile/gruposusuarios/exec.php
  Diff comments   View file @5d53c78
... ... @@ -40,7 +40,7 @@ $codigo = htmlspecialchars ( $codigo, ENT_QUOTES );
40 40 $id_grupo = $_POST["id_grupo"];
41 41 $id_tema = $_POST["id_tema"];
42 42  
43   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_grupo,$id_tema]);
  43 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_grupo,$id_tema));
44 44  
45 45 $funcao = strtoupper ( $funcao );
46 46 switch ($funcao) {
... ...
admin1/catalogo/mapfile/gruposusuarios/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\mapfile\gruposusuarios;
  3 +use PDOException;
3 4 function listar($dbh,$locaplic,$codigo){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if(empty($codigo)){
... ...
admin1/catalogo/menus/exec.php
  Diff comments   View file @5d53c78
... ... @@ -35,7 +35,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/arvore&quot; ) === f
35 35 }
36 36 if(isset($_POST["id_menu"])){
37 37 $id_menu = $_POST["id_menu"];
38   - \admin\php\funcoesAdmin\testaSafeNumerico([$id_menu]);
  38 + \admin\php\funcoesAdmin\testaSafeNumerico(array($id_menu));
39 39 }
40 40 if(!isset($idioma) || $idioma == ""){
41 41 $idioma = "pt";
... ...
admin1/catalogo/menus/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2   -
3 2 namespace admin\catalogo\menus;
  3 +use PDOException;
4 4  
5 5 function listar($dbh, $id_menu = "") {
6 6 $esquemaadmin = $_SESSION["esquemaadmin"];
... ...
admin1/catalogo/menus/grupos/exec.php
  Diff comments   View file @5d53c78
... ... @@ -34,7 +34,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/arvore&quot; ) === f
34 34 $id_menu = $_POST["id_menu"];
35 35 $id_n1 = $_POST["id_n1"];
36 36 $id_grupo = $_POST["id_grupo"];
37   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_menu,$id_n1, $id_grupo]);
  37 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_menu,$id_n1, $id_grupo));
38 38  
39 39 $funcao = strtoupper ( $funcao );
40 40 switch ($funcao) {
... ...
admin1/catalogo/menus/grupos/execraiz.php
  Diff comments   View file @5d53c78
... ... @@ -34,7 +34,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/arvore&quot; ) === f
34 34 $id_menu = $_POST["id_menu"];
35 35 $id_tema = $_POST["id_tema"];
36 36 $id_raiz = $_POST["id_raiz"];
37   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_menu,$id_tema,$id_raiz]);
  37 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_menu,$id_tema,$id_raiz));
38 38  
39 39 $funcao = strtoupper ( $funcao );
40 40 switch ($funcao) {
... ...
admin1/catalogo/menus/grupos/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\menus\grupos {
  3 + use PDOException;
3 4 function listar($dbh, $id_menu = "", $id_n1){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_n1 != ""){
... ... @@ -80,6 +81,7 @@ namespace admin\catalogo\menus\grupos {
80 81 }
81 82 }
82 83 namespace admin\catalogo\menus\grupos\raiz {
  84 + use PDOException;
83 85 function listar($dbh, $id_raiz = "", $id_menu = ""){
84 86 $esquemaadmin = $_SESSION["esquemaadmin"];
85 87 if($id_raiz != ""){
... ...
admin1/catalogo/menus/grupos/listadegrupos/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/arvore&quot; ) === f
32 32 }
33 33  
34 34 $id_grupo = $_POST["id_grupo"];
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_grupo]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_grupo));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/catalogo/menus/grupos/listadegrupos/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\menus\grupos\listadegrupos;
  3 +use PDOException;
3 4 function listar($dbh, $id_grupo = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_grupo != ""){
... ...
admin1/catalogo/menus/grupos/subgrupos/exec.php
  Diff comments   View file @5d53c78
... ... @@ -35,7 +35,7 @@ $id_n1 = $_POST[&quot;id_n1&quot;];
35 35 $id_n2 = $_POST["id_n2"];
36 36 $id_menu = $_POST["id_menu"];
37 37 $id_subgrupo = $_POST["id_subgrupo"];
38   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_n1,$id_n2,$id_menu,$id_subgrupo]);
  38 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_n1,$id_n2,$id_menu,$id_subgrupo));
39 39  
40 40 $funcao = strtoupper ( $funcao );
41 41 switch ($funcao) {
... ...
admin1/catalogo/menus/grupos/subgrupos/execraiz.php
  Diff comments   View file @5d53c78
... ... @@ -36,7 +36,7 @@ $id_menu = $_POST[&quot;id_menu&quot;];
36 36 $id_tema = $_POST["id_tema"];
37 37 $id_raiz = $_POST["id_raiz"];
38 38  
39   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_n1,$id_menu,$id_tema,$id_raiz]);
  39 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_n1,$id_menu,$id_tema,$id_raiz));
40 40  
41 41 $funcao = strtoupper ( $funcao );
42 42 switch ($funcao) {
... ...
admin1/catalogo/menus/grupos/subgrupos/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\menus\grupos\subgrupos {
  3 + use PDOException;
3 4 function listar($dbh, $id_n1 = "", $id_n2){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_n2 != ""){
... ... @@ -77,6 +78,7 @@ namespace admin\catalogo\menus\grupos\subgrupos {
77 78 }
78 79 }
79 80 namespace admin\catalogo\menus\grupos\subgrupos\raiz {
  81 + use PDOException;
80 82 function listar($dbh, $id_raiz = "", $id_n1 = "", $id_menu = ""){
81 83 $esquemaadmin = $_SESSION["esquemaadmin"];
82 84 if($id_raiz != ""){
... ...
admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/arvore&quot; ) === f
32 32 }
33 33  
34 34 $id_subgrupo = $_POST["id_subgrupo"];
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_subgrupo]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_subgrupo));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\menus\grupos\subgrupos\listadesubgrupos;
  3 +use PDOException;
3 4 function listar($dbh, $id_subgrupo = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_subgrupo != ""){
... ...
admin1/catalogo/menus/grupos/subgrupos/temas/exec.php
  Diff comments   View file @5d53c78
... ... @@ -34,7 +34,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/arvore&quot; ) === f
34 34 $id_n2 = $_POST["id_n2"];
35 35 $id_n3 = $_POST["id_n3"];
36 36 $id_tema = $_POST["id_tema"];
37   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_tema,$id_n2,$id_n3]);
  37 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_tema,$id_n2,$id_n3));
38 38  
39 39 $funcao = strtoupper ( $funcao );
40 40 switch ($funcao) {
... ...
admin1/catalogo/menus/grupos/subgrupos/temas/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\catalogo\menus\grupos\subgrupos\temas;
  3 +use PDOException;
3 4 function todosTemas($dbh){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 $dados = \admin\php\funcoesAdmin\pegaDados("select id_tema,desc_tema,nome_tema,codigo_tema from ".$esquemaadmin."i3geoadmin_temas order by lower(nome_tema) ", $dbh, false);
... ...
admin1/metaestat/conexoes/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/metaestat/geral&quot; ) =
32 32 }
33 33 $codigo_estat_conexao = $_POST["codigo_estat_conexao"];
34 34  
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$codigo_estat_conexao]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($codigo_estat_conexao));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/metaestat/conexoes/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2   -
3 2 namespace admin\metaestat\conexoes;
  3 +use PDOException;
4 4  
5 5 function listar($dbh, $codigo_estat_conexao = "") {
6 6 $esquemaadmin = $_SESSION ["esquemaadmin"];
... ...
admin1/metaestat/fontes/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/metaestat/geral&quot; ) =
32 32 }
33 33 $id_fonteinfo = $_POST["id_fonteinfo"];
34 34  
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_fonteinfo]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_fonteinfo));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/metaestat/fontes/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2   -
3 2 namespace admin\metaestat\fontes;
  3 +use PDOException;
4 4  
5 5 function listar($dbh, $id_fonteinfo = "") {
6 6 $esquemaadmin = $_SESSION ["esquemaadmin"];
... ...
admin1/metaestat/periodos/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/metaestat/geral&quot; ) =
32 32 }
33 33 $codigo_tipo_periodo = $_POST["codigo_tipo_periodo"];
34 34  
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$codigo_tipo_periodo]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($codigo_tipo_periodo));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/metaestat/periodos/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\metaestat\periodos;
  3 +use PDOException;
3 4  
4 5 function listar($dbh, $codigo_tipo_periodo = "") {
5 6 $esquemaadmin = $_SESSION ["esquemaadmin"];
... ...
admin1/metaestat/regioes/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/metaestat/geral&quot; ) =
32 32 }
33 33 $codigo_tipo_regiao = $_POST["codigo_tipo_regiao"];
34 34  
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$codigo_tipo_regiao]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($codigo_tipo_regiao));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/metaestat/regioes/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\metaestat\regioes;
3 3 use PDO;
4   -
  4 +use PDOException;
5 5 function listar($dbh, $codigo_tipo_regiao = "") {
6 6 $esquemaadmin = $_SESSION ["esquemaadmin"];
7 7 if ($codigo_tipo_regiao != "") {
... ...
admin1/metaestat/regioes/hierarquia/exec.php
  Diff comments   View file @5d53c78
... ... @@ -36,10 +36,10 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/arvore&quot; ) === f
36 36 $codigo_tipo_regiao = $_POST ["codigo_tipo_regiao"];
37 37 $id_agregaregiao = $_POST ["id_agregaregiao"];
38 38  
39   -\admin\php\funcoesAdmin\testaSafeNumerico ( [
  39 +\admin\php\funcoesAdmin\testaSafeNumerico ( array(
40 40 $codigo_tipo_regiao,
41 41 $id_agregaregiao
42   -] );
  42 +) );
43 43  
44 44 $funcao = strtoupper ( $funcao );
45 45 switch ($funcao) {
... ...
admin1/metaestat/regioes/hierarquia/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2   -
3 2 namespace admin\metaestat\regioes\hierarquia;
  3 +use PDOException;
4 4  
5 5 function listar($dbh, $codigo_tipo_regiao, $id_agregaregiao = "") {
6 6 $esquemaadmin = $_SESSION ["esquemaadmin"];
... ...
admin1/metaestat/unidades/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/metaestat/geral&quot; ) =
32 32 }
33 33 $codigo_unidade_medida = $_POST["codigo_unidade_medida"];
34 34  
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$codigo_unidade_medida]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($codigo_unidade_medida));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/metaestat/unidades/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\metaestat\unidades;
  3 +use PDOException;
3 4  
4 5 function listar($dbh, $codigo_unidade_medida = "") {
5 6 $esquemaadmin = $_SESSION ["esquemaadmin"];
... ...
admin1/metaestat/variaveis/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/metaestat/geral&quot; ) =
32 32 }
33 33 $codigo_variavel = $_POST["codigo_variavel"];
34 34  
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$codigo_variavel]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($codigo_variavel));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/metaestat/variaveis/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\metaestat\variaveis;
  3 +use PDOException;
3 4  
4 5 function listar($dbh, $codigo_variavel = "") {
5 6 $esquemaadmin = $_SESSION ["esquemaadmin"];
... ...
admin1/metaestat/variaveis/medidas/classificacoes/classes/exec.php
  Diff comments   View file @5d53c78
... ... @@ -33,7 +33,7 @@ $id_classificacao = $_POST[&quot;id_classificacao&quot;];
33 33 $id_medida_variavel = $_POST["id_medida_variavel"];
34 34 $id_classe = $_POST["id_classe"];
35 35  
36   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_medida_variavel,$id_classificacao, $id_classe]);
  36 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_medida_variavel,$id_classificacao, $id_classe));
37 37  
38 38 $funcao = strtoupper ( $funcao );
39 39 switch ($funcao) {
... ...
admin1/metaestat/variaveis/medidas/classificacoes/classes/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\metaestat\variaveis\medidas\classificacoes\classes;
3   -
  3 +use PDOException;
4 4 function listar($dbh, $id_classificacao, $id_classe = "") {
5 5 $esquemaadmin = $_SESSION ["esquemaadmin"];
6 6 if ($id_classe != "") {
... ...
admin1/metaestat/variaveis/medidas/classificacoes/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/editormapfile&quot;
32 32 $id_classificacao = $_POST["id_classificacao"];
33 33 $id_medida_variavel = $_POST["id_medida_variavel"];
34 34  
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_medida_variavel,$id_classificacao]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_medida_variavel,$id_classificacao));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/metaestat/variaveis/medidas/classificacoes/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\metaestat\variaveis\medidas\classificacoes;
  3 +use PDOException;
3 4  
4 5 function listar($dbh, $id_medida_variavel, $id_classificacao = "") {
5 6 $esquemaadmin = $_SESSION ["esquemaadmin"];
... ...
admin1/metaestat/variaveis/medidas/exec.php
  Diff comments   View file @5d53c78
... ... @@ -33,7 +33,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/metaestat/geral&quot; ) =
33 33 $codigo_variavel = $_POST["codigo_variavel"];
34 34 $id_medida_variavel = $_POST["id_medida_variavel"];
35 35  
36   -\admin\php\funcoesAdmin\testaSafeNumerico([$codigo_variavel,$id_medida_variavel]);
  36 +\admin\php\funcoesAdmin\testaSafeNumerico(array($codigo_variavel,$id_medida_variavel));
37 37  
38 38 $funcao = strtoupper ( $funcao );
39 39 switch ($funcao) {
... ...
admin1/metaestat/variaveis/medidas/fontes/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/editormapfile&quot;
32 32 $id_fonteinfo = $_POST["id_fonteinfo"];
33 33 $id_medida_variavel = $_POST["id_medida_variavel"];
34 34  
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_medida_variavel,$id_fonteinfo]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_medida_variavel,$id_fonteinfo));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/metaestat/variaveis/medidas/fontes/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\metaestat\variaveis\medidas\fontes;
  3 +use PDOException;
3 4  
4 5 function listar($dbh, $id_medida_variavel) {
5 6 $esquemaadmin = $_SESSION ["esquemaadmin"];
... ...
admin1/metaestat/variaveis/medidas/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\metaestat\variaveis\medidas;
3 3 use PDO;
  4 +use PDOException;
4 5  
5 6 function listar($dbh, $codigo_variavel, $id_medida_variavel = "") {
6 7 $esquemaadmin = $_SESSION ["esquemaadmin"];
... ...
admin1/metaestat/variaveis/medidas/links/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/editormapfile&quot;
32 32 $id_link = $_POST["id_link"];
33 33 $id_medida_variavel = $_POST["id_medida_variavel"];
34 34  
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_medida_variavel,$id_link]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_medida_variavel,$id_link));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/metaestat/variaveis/medidas/links/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\metaestat\variaveis\medidas\links;
  3 +use PDOException;
3 4  
4 5 function listar($dbh, $id_medida_variavel, $id_link = "") {
5 6 $esquemaadmin = $_SESSION ["esquemaadmin"];
... ...
admin1/metaestat/variaveis/medidas/parametros/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/editormapfile&quot;
32 32 $id_parametro_medida = $_POST["id_parametro_medida"];
33 33 $id_medida_variavel = $_POST["id_medida_variavel"];
34 34  
35   -\admin\php\funcoesAdmin\testaSafeNumerico([$id_medida_variavel,$id_parametro_medida]);
  35 +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_medida_variavel,$id_parametro_medida));
36 36  
37 37 $funcao = strtoupper ( $funcao );
38 38 switch ($funcao) {
... ...
admin1/metaestat/variaveis/medidas/parametros/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\metaestat\variaveis\medidas\parametros;
  3 +use PDOException;
3 4  
4 5 function listar($dbh, $id_medida_variavel, $id_parametro_medida = "") {
5 6 $esquemaadmin = $_SESSION ["esquemaadmin"];
... ...
admin1/php/funcoesAdmin.php
  Diff comments   View file @5d53c78
... ... @@ -2,6 +2,7 @@
2 2 namespace admin\php\funcoesAdmin;
3 3 use PDO;
4 4 use Services_JSON;
  5 +use PDOException;
5 6 //
6 7 // verifica se um determinado papel esta registrado na variavel SESSION
7 8 //
... ...
admin1/usuarios/cadastro/exec.php
  Diff comments   View file @5d53c78
... ... @@ -34,10 +34,10 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/usuarios&quot; ) ===
34 34 $id_usuario = $_POST ["id_usuario"];
35 35 $id_papel = $_POST ["id_papel"];
36 36  
37   -\admin\php\funcoesAdmin\testaSafeNumerico ( [
  37 +\admin\php\funcoesAdmin\testaSafeNumerico ( array(
38 38 $id_usuario,
39 39 $id_papel
40   -] );
  40 +) );
41 41  
42 42 $funcao = strtoupper ( $funcao );
43 43 // converte os parametros de definicao dos papeis em um array
... ...
admin1/usuarios/cadastro/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\usuarios\cadastro;
  3 +use PDOException;
  4 +
3 5 function listar($dbh, $id_usuario = ""){
4 6 $esquemaadmin = $_SESSION["esquemaadmin"];
5 7 if($id_usuario != ""){
... ...
admin1/usuarios/grupos/exec.php
  Diff comments   View file @5d53c78
... ... @@ -32,10 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( &quot;admin/html/usuarios&quot; ) ===
32 32 }
33 33 $id_usuario = $_POST ["id_usuario"];
34 34 $id_grupo = $_POST ["id_grupo"];
35   -\admin\php\funcoesAdmin\testaSafeNumerico ( [
36   - $id_usuario,
37   - $id_grupo
38   -] );
  35 +\admin\php\funcoesAdmin\testaSafeNumerico ( array($id_usuario,$id_grupo) );
39 36  
40 37 $funcao = strtoupper ( $funcao );
41 38 // converte os parametros de definicao dos papeis em um array
... ...
admin1/usuarios/grupos/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\usuarios\grupos;
  3 +use PDOException;
3 4 function listar($dbh, $id_grupo = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_grupo != ""){
... ...
admin1/usuarios/operacoes/exec.php
  Diff comments   View file @5d53c78
... ... @@ -34,11 +34,11 @@ $id = $_POST [&quot;id&quot;];
34 34 $id_operacao = $_POST ["id_operacao"];
35 35 $id_papel = $_POST ["id_papel"];
36 36  
37   -\admin\php\funcoesAdmin\testaSafeNumerico ( [
  37 +\admin\php\funcoesAdmin\testaSafeNumerico ( array(
38 38 $id,
39 39 $id_operacao,
40 40 $id_papel
41   -] );
  41 +) );
42 42  
43 43 $funcao = strtoupper ( $funcao );
44 44 // converte os parametros de definicao dos papeis em um array
... ...
admin1/usuarios/operacoes/funcoes.php
  Diff comments   View file @5d53c78
1 1 <?php
2 2 namespace admin\usuarios\operacoes;
  3 +use PDOException;
3 4 function listar($dbh, $id_operacao = ""){
4 5 $esquemaadmin = $_SESSION["esquemaadmin"];
5 6 if($id_operacao != ""){
... ...
classesphp/classe_bdexplorer.php
  Diff comments   View file @5d53c78
... ... @@ -8,6 +8,7 @@
8 8 */
9 9 namespace i3geo\classesphp\bdexplorer;
10 10 use PDO;
  11 +use PDOException;
11 12 class Bdexplorer{
12 13 /**
13 14 * Nome do esquema no banco de dados utilizado para armazenar as tabelas
... ...
classesphp/mapa_controle.php
  Diff comments   View file @5d53c78
... ... @@ -626,7 +626,8 @@ switch (strtoupper($funcao))
626 626 $path = $split[0];
627 627 $split[0] = "";
628 628 $shp = implode("/",$split);
629   - $shp = explode(".",$shp)[0].".shp";
  629 + $shp = explode(".",$shp);
  630 + $shp = $shp[0].".shp";
630 631 $path = $drives[$path] . $shp;
631 632  
632 633 $retorno = $m->adicionaTemaSHP($path);
... ...
classesphp/wmswfs.php
  Diff comments   View file @5d53c78
... ... @@ -361,10 +361,10 @@ function temaswms() {
361 361 // $wms_service_request = "c://temp//teste.xml";
362 362  
363 363 if (file_exists ( dirname ( __FILE__ ) . "/../admin1/cadastros/servicos/exec.php" )) {
364   - include_once (dirname ( __FILE__ ) . "/../admin1/cadastros/servicos/exec.php");
  364 + //include_once (dirname ( __FILE__ ) . "/../admin1/cadastros/servicos/exec.php");
365 365 } else {
366   - include_once (dirname ( __FILE__ ) . "/../admin/php/admin.php");
367   - include_once (dirname ( __FILE__ ) . "/../admin/php/webservices.php");
  366 + //include_once (dirname ( __FILE__ ) . "/../admin/php/admin.php");
  367 + //include_once (dirname ( __FILE__ ) . "/../admin/php/webservices.php");
368 368 }
369 369  
370 370 // error_reporting(0);
... ...
mashups/openlayers3_depreciado.php
  Diff comments   View file @5d53c78
... ... @@ -328,10 +328,6 @@ if($temas != &quot;&quot;){
328 328 $ferramentas = array();
329 329 //TODO implementar para gvsig
330 330 if(file_exists($locaplic."/temas/".$tema.".gvp")){
331   - include_once($locaplic."/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php");
332   - $gm = new gvsig2mapfile($locaplic."/temas/".$tema.".gvp");
333   - $gvsigview = $gm->getViewsNames();
334   - $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$gvsigview[0].'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{layers:"'.$tema.'",transparent: "true", format: "image/png"},{singleTile:false,visibility:true,isBaseLayer:false, ferramentas :'.$ferramentas.')';
335 331 }
336 332 else{
337 333 $nomeMap = "";
... ...
mashups/openlayers_depreciado.php
  Diff comments   View file @5d53c78
... ... @@ -335,10 +335,6 @@ if($temas != &quot;&quot;){
335 335 //
336 336 $ferramentas = array();
337 337 if(file_exists($locaplic."/temas/".$tema.".gvp")){
338   - include_once($locaplic."/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php");
339   - $gm = new gvsig2mapfile($locaplic."/temas/".$tema.".gvp");
340   - $gvsigview = $gm->getViewsNames();
341   - $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$gvsigview[0].'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{layers:"'.$tema.'",transparent: "true", format: "image/png"},{singleTile:false,visibility:true,isBaseLayer:false, ferramentas :'.$ferramentas.')';
342 338 }
343 339 else{
344 340 $nomeMap = "";
... ...
mashups/osm.php
  Diff comments   View file @5d53c78
... ... @@ -11,11 +11,11 @@ include_once (dirname(__FILE__) . &quot;/../classesphp/funcoes_gerais.php&quot;);
11 11 // error_reporting(0);
12 12 // variaveis utilizadas
13 13 $parurl = array_merge($_GET, $_POST);
14   -if(count($parurl) == 0){
  14 +if (count($parurl) == 0) {
15 15 ajuda();
16   - exit;
  16 + exit();
17 17 }
18   -if(!isset($parurl["fundo"])){
  18 +if (! isset($parurl["fundo"])) {
19 19 $parurl["fundo"] = "osm";
20 20 }
21 21 if (isset($parurl["opacidade"])) {
... ... @@ -38,18 +38,18 @@ if (! isset($parurl[&quot;temas&quot;]) &amp;&amp; isset($parurl[&quot;layers&quot;])) {
38 38 $parurl["temas"] = $parurl["layers"];
39 39 }
40 40 $temas = explode(",", str_replace(" ", ",", $parurl["temas"]));
41   -if(!isset($parurl["visiveis"])){
  41 +if (! isset($parurl["visiveis"])) {
42 42 $parurl["visiveis"] = $parurl["temas"];
43 43 }
44 44 $visiveis = explode(",", str_replace(" ", ",", $parurl["visiveis"]));
45 45 $off = array_diff($temas, $visiveis);
46   -//filtros
  46 +// filtros
47 47 $filtros = array();
48   -foreach($temas as $tema){
49   - if(isset($parurl["map_layer_".$tema."_filter"])){
  48 +foreach ($temas as $tema) {
  49 + if (isset($parurl["map_layer_" . $tema . "_filter"])) {
50 50 $filtros[] = array(
51   - "layer"=>$tema,
52   - "expression"=>$parurl["map_layer_".$tema."_filter"]
  51 + "layer" => $tema,
  52 + "expression" => $parurl["map_layer_" . $tema . "_filter"]
53 53 );
54 54 }
55 55 }
... ... @@ -267,7 +267,6 @@ if (isset($botoes)) {
267 267 $objBotoes[] = "'frente':true";
268 268  
269 269 $botoes = "{" . implode(",", $objBotoes) . "}";
270   -
271 270 }
272 271 if (isset($parurl["kml"])) {
273 272 $kml = $parurl["kml"];
... ... @@ -297,21 +296,19 @@ if (isset($parurl[&quot;pontos&quot;])) {
297 296 } else {
298 297 $pontos = "";
299 298 }
300   -if(isset($parurl["marca"])){
  299 +if (isset($parurl["marca"])) {
301 300 $marca = $parurl["marca"];
302 301 } else {
303   - $marca = "../pacotes/openlayers/img/marker-gold.png";
  302 + $marca = "../pacotes/openlayers/img/marker-gold.png";
304 303 }
305   -if(isset($parurl["tiles"])){
  304 +if (isset($parurl["tiles"])) {
306 305 $tiles = $parurl["tiles"];
  306 +} else {
  307 + $tiles = "true";
307 308 }
308   -else{
309   - $tiles = "true";
310   -}
311   -if(isset($parurl["ativarodadomouse"]) && $parurl["ativarodadomouse"] == "false"){
  309 +if (isset($parurl["ativarodadomouse"]) && $parurl["ativarodadomouse"] == "false") {
312 310 $ativarodadomouse = "";
313   -}
314   -else{
  311 +} else {
315 312 $ativarodadomouse = "new ol.interaction.MouseWheelZoom(),";
316 313 }
317 314 $legendahtml = $parurl["legendahtml"];
... ... @@ -485,10 +482,10 @@ function ajuda()
485 482 }
486 483  
487 484 .ol-mouse-position {
488   - left: 10px;
489   - position: absolute;
490   - bottom: 5px;
491   - top: auto;
  485 + left: 10px;
  486 + position: absolute;
  487 + bottom: 5px;
  488 + top: auto;
492 489 }
493 490 </style>
494 491 </head>
... ... @@ -696,34 +693,34 @@ function ajuda()
696 693 <p>
697 694 <!-- <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.atualiza()">Refresh</a> -->
698 695 </p>
699   - <li class="divider"></p>
700   - <p>
701   - <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.conectaservico()">{{{a15}}}</a>
702   - </p>
703   - <p>
704   - <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.uploadarquivo()">{{{a14}}}</a>
705   - </p>
706   - <p>
707   - <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.downloadbase()">{{{a3}}}</a>
708   - </p>
709   - <p>
710   - <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.importarwmc()">{{{a3a}}}</a>
711   - </p>
712   - <p>
713   - <!-- <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.nuvemTags()">{{{a5a}}}</a> -->
714   - </p>
715   - <p>
716   - <!-- <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.carouselTemas()">Miniaturas</a> -->
717   - </p>
718   - <p>
719   - <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.buscaInde()">Busca na INDE</a>
720   - </p>
721   - <p>
722   - <a href="javascript:void(0)" onclick="i3GEO.mapa.dialogo.metaestat()">Cartogramas estatisticos</a>
723   - </p>
724   - <p>
725   - <a href="http://localhost/i3geo/kml.php?tipoxml=kml" target="_blank">{{{a13}}}</a>
726   - </p>
  696 + <li class="divider"></li>
  697 + <p>
  698 + <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.conectaservico()">{{{a15}}}</a>
  699 + </p>
  700 + <p>
  701 + <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.uploadarquivo()">{{{a14}}}</a>
  702 + </p>
  703 + <p>
  704 + <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.downloadbase()">{{{a3}}}</a>
  705 + </p>
  706 + <p>
  707 + <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.importarwmc()">{{{a3a}}}</a>
  708 + </p>
  709 + <p>
  710 + <!-- <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.nuvemTags()">{{{a5a}}}</a> -->
  711 + </p>
  712 + <p>
  713 + <!-- <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.carouselTemas()">Miniaturas</a> -->
  714 + </p>
  715 + <p>
  716 + <a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.buscaInde()">Busca na INDE</a>
  717 + </p>
  718 + <p>
  719 + <a href="javascript:void(0)" onclick="i3GEO.mapa.dialogo.metaestat()">Cartogramas estatisticos</a>
  720 + </p>
  721 + <p>
  722 + <a href="http://localhost/i3geo/kml.php?tipoxml=kml" target="_blank">{{{a13}}}</a>
  723 + </p>
727 724  
728 725 </div>
729 726 </div>
... ...
mashups/osm_depreciado.php
  Diff comments   View file @5d53c78
... ... @@ -335,10 +335,6 @@ if($temas != &quot;&quot;){
335 335 //
336 336 $ferramentas = array();
337 337 if(file_exists($locaplic."/temas/".$tema.".gvp")){
338   - include_once($locaplic."/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php");
339   - $gm = new gvsig2mapfile($locaplic."/temas/".$tema.".gvp");
340   - $gvsigview = $gm->getViewsNames();
341   - $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$gvsigview[0].'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{layers:"'.$tema.'",transparent: "true", format: "image/png"},{singleTile:false,visibility:true,isBaseLayer:false, ferramentas :'.$ferramentas.')';
342 338 }
343 339 else{
344 340 $nomeMap = "";
... ...