From 5d53c782b149cf6872bb4d6073c2fffee19c8bc4 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Sun, 24 Sep 2017 21:04:42 -0300 Subject: [PATCH] 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 --- admin/admin.db | Bin 340992 -> 0 bytes admin/php/webservices.php | 2 +- admin1/cadastros/identifica/exec.php | 2 +- admin1/cadastros/identifica/funcoes.php | 1 + admin1/cadastros/perfis/exec.php | 2 +- admin1/cadastros/perfis/funcoes.php | 1 + admin1/cadastros/servicos/exec.php | 9 ++++----- admin1/cadastros/servicos/funcoes.php | 1 + admin1/cadastros/sistemas/exec.php | 2 +- admin1/cadastros/sistemas/funcoes.php | 1 + admin1/cadastros/sistemas/funcoes/exec.php | 2 +- admin1/cadastros/sistemas/funcoes/funcoes.php | 2 +- admin1/cadastros/tags/exec.php | 2 +- admin1/cadastros/tags/funcoes.php | 1 + admin1/catalogo/atlas/exec.php | 2 +- admin1/catalogo/atlas/funcoes.php | 1 + admin1/catalogo/atlas/pranchas/exec.php | 2 +- admin1/catalogo/atlas/pranchas/funcoes.php | 1 + admin1/catalogo/atlas/pranchas/temas/exec.php | 2 +- admin1/catalogo/atlas/pranchas/temas/funcoes.php | 1 + admin1/catalogo/mapas/exec.php | 4 +--- admin1/catalogo/mapas/funcoes.php | 1 + admin1/catalogo/mapfile/cdados/funcoes.php | 1 + admin1/catalogo/mapfile/disponibilidade/funcoes.php | 1 + admin1/catalogo/mapfile/funcoes.php | 2 +- admin1/catalogo/mapfile/gruposusuarios/exec.php | 2 +- admin1/catalogo/mapfile/gruposusuarios/funcoes.php | 1 + admin1/catalogo/menus/exec.php | 2 +- admin1/catalogo/menus/funcoes.php | 2 +- admin1/catalogo/menus/grupos/exec.php | 2 +- admin1/catalogo/menus/grupos/execraiz.php | 2 +- admin1/catalogo/menus/grupos/funcoes.php | 2 ++ admin1/catalogo/menus/grupos/listadegrupos/exec.php | 2 +- admin1/catalogo/menus/grupos/listadegrupos/funcoes.php | 1 + admin1/catalogo/menus/grupos/subgrupos/exec.php | 2 +- admin1/catalogo/menus/grupos/subgrupos/execraiz.php | 2 +- admin1/catalogo/menus/grupos/subgrupos/funcoes.php | 2 ++ admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/exec.php | 2 +- admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/funcoes.php | 1 + admin1/catalogo/menus/grupos/subgrupos/temas/exec.php | 2 +- admin1/catalogo/menus/grupos/subgrupos/temas/funcoes.php | 1 + admin1/metaestat/conexoes/exec.php | 2 +- admin1/metaestat/conexoes/funcoes.php | 2 +- admin1/metaestat/fontes/exec.php | 2 +- admin1/metaestat/fontes/funcoes.php | 2 +- admin1/metaestat/periodos/exec.php | 2 +- admin1/metaestat/periodos/funcoes.php | 1 + admin1/metaestat/regioes/exec.php | 2 +- admin1/metaestat/regioes/funcoes.php | 2 +- admin1/metaestat/regioes/hierarquia/exec.php | 4 ++-- admin1/metaestat/regioes/hierarquia/funcoes.php | 2 +- admin1/metaestat/unidades/exec.php | 2 +- admin1/metaestat/unidades/funcoes.php | 1 + admin1/metaestat/variaveis/exec.php | 2 +- admin1/metaestat/variaveis/funcoes.php | 1 + admin1/metaestat/variaveis/medidas/classificacoes/classes/exec.php | 2 +- admin1/metaestat/variaveis/medidas/classificacoes/classes/funcoes.php | 2 +- admin1/metaestat/variaveis/medidas/classificacoes/exec.php | 2 +- admin1/metaestat/variaveis/medidas/classificacoes/funcoes.php | 1 + admin1/metaestat/variaveis/medidas/exec.php | 2 +- admin1/metaestat/variaveis/medidas/fontes/exec.php | 2 +- admin1/metaestat/variaveis/medidas/fontes/funcoes.php | 1 + admin1/metaestat/variaveis/medidas/funcoes.php | 1 + admin1/metaestat/variaveis/medidas/links/exec.php | 2 +- admin1/metaestat/variaveis/medidas/links/funcoes.php | 1 + admin1/metaestat/variaveis/medidas/parametros/exec.php | 2 +- admin1/metaestat/variaveis/medidas/parametros/funcoes.php | 1 + admin1/php/funcoesAdmin.php | 1 + admin1/usuarios/cadastro/exec.php | 4 ++-- admin1/usuarios/cadastro/funcoes.php | 2 ++ admin1/usuarios/grupos/exec.php | 5 +---- admin1/usuarios/grupos/funcoes.php | 1 + admin1/usuarios/operacoes/exec.php | 4 ++-- admin1/usuarios/operacoes/funcoes.php | 1 + classesphp/classe_bdexplorer.php | 1 + classesphp/mapa_controle.php | 3 ++- classesphp/wmswfs.php | 6 +++--- mashups/openlayers3_depreciado.php | 4 ---- mashups/openlayers_depreciado.php | 4 ---- mashups/osm.php | 99 ++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------- mashups/osm_depreciado.php | 4 ---- 81 files changed, 136 insertions(+), 123 deletions(-) diff --git a/admin/admin.db b/admin/admin.db index 877c1aa..775a0fa 100755 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/admin/php/webservices.php b/admin/php/webservices.php index 984136a..db79da8 100755 --- a/admin/php/webservices.php +++ b/admin/php/webservices.php @@ -48,7 +48,7 @@ include_once(dirname(__FILE__)."/login.php"); $id_ws = $_GET["id_ws"]; $id = $_GET["id"]; -testaSafeNumerico([$id,$id_ws]); +testaSafeNumerico(array($id,$id_ws)); $funcoesEdicao = array( "ALTERARWS", diff --git a/admin1/cadastros/identifica/exec.php b/admin1/cadastros/identifica/exec.php index b3b5911..d1e1ad0 100755 --- a/admin1/cadastros/identifica/exec.php +++ b/admin1/cadastros/identifica/exec.php @@ -32,7 +32,7 @@ if (\admin\php\funcoesAdmin\verificaOperacaoSessao ( "admin/html/identifica" ) = } $id_i = $_POST["id_i"]; $id = $_POST["id"]; -\admin\php\funcoesAdmin\testaSafeNumerico([$id_i,$id]); +\admin\php\funcoesAdmin\testaSafeNumerico(array($id_i,$id)); $funcao = strtoupper ( $funcao ); switch ($funcao) { diff --git a/admin1/cadastros/identifica/funcoes.php b/admin1/cadastros/identifica/funcoes.php index 48bae64..5d92dc6 100755 --- a/admin1/cadastros/identifica/funcoes.php +++ b/admin1/cadastros/identifica/funcoes.php @@ -1,5 +1,6 @@ adicionaTemaSHP($path); diff --git a/classesphp/wmswfs.php b/classesphp/wmswfs.php index d258197..42331a0 100755 --- a/classesphp/wmswfs.php +++ b/classesphp/wmswfs.php @@ -361,10 +361,10 @@ function temaswms() { // $wms_service_request = "c://temp//teste.xml"; if (file_exists ( dirname ( __FILE__ ) . "/../admin1/cadastros/servicos/exec.php" )) { - include_once (dirname ( __FILE__ ) . "/../admin1/cadastros/servicos/exec.php"); + //include_once (dirname ( __FILE__ ) . "/../admin1/cadastros/servicos/exec.php"); } else { - include_once (dirname ( __FILE__ ) . "/../admin/php/admin.php"); - include_once (dirname ( __FILE__ ) . "/../admin/php/webservices.php"); + //include_once (dirname ( __FILE__ ) . "/../admin/php/admin.php"); + //include_once (dirname ( __FILE__ ) . "/../admin/php/webservices.php"); } // error_reporting(0); diff --git a/mashups/openlayers3_depreciado.php b/mashups/openlayers3_depreciado.php index 7208d2c..97ca7e9 100755 --- a/mashups/openlayers3_depreciado.php +++ b/mashups/openlayers3_depreciado.php @@ -328,10 +328,6 @@ if($temas != ""){ $ferramentas = array(); //TODO implementar para gvsig if(file_exists($locaplic."/temas/".$tema.".gvp")){ - include_once($locaplic."/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php"); - $gm = new gvsig2mapfile($locaplic."/temas/".$tema.".gvp"); - $gvsigview = $gm->getViewsNames(); - $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.')'; } else{ $nomeMap = ""; diff --git a/mashups/openlayers_depreciado.php b/mashups/openlayers_depreciado.php index 0d47368..e0c9fc3 100755 --- a/mashups/openlayers_depreciado.php +++ b/mashups/openlayers_depreciado.php @@ -335,10 +335,6 @@ if($temas != ""){ // $ferramentas = array(); if(file_exists($locaplic."/temas/".$tema.".gvp")){ - include_once($locaplic."/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php"); - $gm = new gvsig2mapfile($locaplic."/temas/".$tema.".gvp"); - $gvsigview = $gm->getViewsNames(); - $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.')'; } else{ $nomeMap = ""; diff --git a/mashups/osm.php b/mashups/osm.php index c9a5c26..906b45e 100755 --- a/mashups/osm.php +++ b/mashups/osm.php @@ -11,11 +11,11 @@ include_once (dirname(__FILE__) . "/../classesphp/funcoes_gerais.php"); // error_reporting(0); // variaveis utilizadas $parurl = array_merge($_GET, $_POST); -if(count($parurl) == 0){ +if (count($parurl) == 0) { ajuda(); - exit; + exit(); } -if(!isset($parurl["fundo"])){ +if (! isset($parurl["fundo"])) { $parurl["fundo"] = "osm"; } if (isset($parurl["opacidade"])) { @@ -38,18 +38,18 @@ if (! isset($parurl["temas"]) && isset($parurl["layers"])) { $parurl["temas"] = $parurl["layers"]; } $temas = explode(",", str_replace(" ", ",", $parurl["temas"])); -if(!isset($parurl["visiveis"])){ +if (! isset($parurl["visiveis"])) { $parurl["visiveis"] = $parurl["temas"]; } $visiveis = explode(",", str_replace(" ", ",", $parurl["visiveis"])); $off = array_diff($temas, $visiveis); -//filtros +// filtros $filtros = array(); -foreach($temas as $tema){ - if(isset($parurl["map_layer_".$tema."_filter"])){ +foreach ($temas as $tema) { + if (isset($parurl["map_layer_" . $tema . "_filter"])) { $filtros[] = array( - "layer"=>$tema, - "expression"=>$parurl["map_layer_".$tema."_filter"] + "layer" => $tema, + "expression" => $parurl["map_layer_" . $tema . "_filter"] ); } } @@ -267,7 +267,6 @@ if (isset($botoes)) { $objBotoes[] = "'frente':true"; $botoes = "{" . implode(",", $objBotoes) . "}"; - } if (isset($parurl["kml"])) { $kml = $parurl["kml"]; @@ -297,21 +296,19 @@ if (isset($parurl["pontos"])) { } else { $pontos = ""; } -if(isset($parurl["marca"])){ +if (isset($parurl["marca"])) { $marca = $parurl["marca"]; } else { - $marca = "../pacotes/openlayers/img/marker-gold.png"; + $marca = "../pacotes/openlayers/img/marker-gold.png"; } -if(isset($parurl["tiles"])){ +if (isset($parurl["tiles"])) { $tiles = $parurl["tiles"]; +} else { + $tiles = "true"; } -else{ - $tiles = "true"; -} -if(isset($parurl["ativarodadomouse"]) && $parurl["ativarodadomouse"] == "false"){ +if (isset($parurl["ativarodadomouse"]) && $parurl["ativarodadomouse"] == "false") { $ativarodadomouse = ""; -} -else{ +} else { $ativarodadomouse = "new ol.interaction.MouseWheelZoom(),"; } $legendahtml = $parurl["legendahtml"]; @@ -485,10 +482,10 @@ function ajuda() } .ol-mouse-position { - left: 10px; - position: absolute; - bottom: 5px; - top: auto; + left: 10px; + position: absolute; + bottom: 5px; + top: auto; } @@ -696,34 +693,34 @@ function ajuda()

-

  • -

    - {{{a15}}} -

    -

    - {{{a14}}} -

    -

    - {{{a3}}} -

    -

    - {{{a3a}}} -

    -

    - -

    -

    - -

    -

    - Busca na INDE -

    -

    - Cartogramas estatisticos -

    -

    - {{{a13}}} -

    +
  • +

    + {{{a15}}} +

    +

    + {{{a14}}} +

    +

    + {{{a3}}} +

    +

    + {{{a3a}}} +

    +

    + +

    +

    + +

    +

    + Busca na INDE +

    +

    + Cartogramas estatisticos +

    +

    + {{{a13}}} +

    diff --git a/mashups/osm_depreciado.php b/mashups/osm_depreciado.php index 6c65e7d..51e0451 100755 --- a/mashups/osm_depreciado.php +++ b/mashups/osm_depreciado.php @@ -335,10 +335,6 @@ if($temas != ""){ // $ferramentas = array(); if(file_exists($locaplic."/temas/".$tema.".gvp")){ - include_once($locaplic."/pacotes/gvsig/gvsig2mapfile/class.gvsig2mapfile.php"); - $gm = new gvsig2mapfile($locaplic."/temas/".$tema.".gvp"); - $gvsigview = $gm->getViewsNames(); - $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.')'; } else{ $nomeMap = ""; -- libgit2 0.21.2