Download as
Browse Code »

Commit d87ee9b0976fd21099df2edb13693083fae9fe7f

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

funcao de log

Showing 4 changed files with 107 additions and 105 deletions   Show diff stats
admin/php/editormapfile.php
  Diff comments   View file @d87ee9b
... ... @@ -1893,9 +1893,9 @@ function pegaConexao()
1893 1893 }
1894 1894 function alterarConexao()
1895 1895 {
1896   - global $tiles,$cortepixels,$esquemaadmin,$metaestat_id_medida_variavel,$metaestat,$convcaracter,$cache,$tipooriginal,$filteritem,$filter,$projection,$type,$dir_tmp,$testar,$codigoMap,$codigoLayer,$locaplic,$connection,$connectiontype,$data,$tileitem,$tileindex;
1897   - if($data != ""){
1898   - $data = base64_decode($data);
  1896 + global $esquemaadmin,$dir_tmp,$codigoMap,$codigoLayer,$locaplic;
  1897 + if($_GET["data"] != ""){
  1898 + $_GET["data"] = base64_decode($_GET["data"]);
1899 1899 }
1900 1900 $mapfile = $locaplic."/temas/".$codigoMap.".map";
1901 1901 $mapa = ms_newMapObj($mapfile);
... ... @@ -1921,17 +1921,17 @@ function alterarConexao()
1921 1921 i3GeoAdminInsert($dbhw,"i3geoadmin_temas",$dataCol);
1922 1922 }
1923 1923 if(strtoupper($metaestat) == "SIM"){
1924   - $connectiontype = 6;
1925   - $filteritem = "";
1926   - $filter = "";
1927   - $data = "";
1928   - $connection = "";
  1924 + $_GET["connectiontype"] = 6;
  1925 + $_GET["filteritem"] = "";
  1926 + $_GET["filter"] = "";
  1927 + $_GET["data"] = "";
  1928 + $_GET["connection"] = "";
1929 1929 $dataCol = array(
1930 1930 "tipoa_tema" => "META"
1931 1931 );
1932 1932 i3GeoAdminUpdate($dbhw,"i3geoadmin_temas",$dataCol,"WHERE codigo_tema = '$codigoMap'");
1933 1933 $layer->setmetadata("metaestat","SIM");
1934   - $layer->setmetadata("METAESTAT_ID_MEDIDA_VARIAVEL",$metaestat_id_medida_variavel);
  1934 + $layer->setmetadata("METAESTAT_ID_MEDIDA_VARIAVEL",$_GET["metaestat_id_medida_variavel"]);
1935 1935 }
1936 1936 else{
1937 1937 $layer->setmetadata("METAESTAT_CODIGO_TIPO_REGIAO","");
... ... @@ -1942,56 +1942,56 @@ function alterarConexao()
1942 1942 );
1943 1943 i3GeoAdminUpdate($dbhw,"i3geoadmin_temas",$dataCol,"WHERE codigo_tema = '$codigoMap'");
1944 1944 }
1945   - $layer->set("connection",$connection);
  1945 + $layer->set("connection",$_GET["connection"]);
1946 1946 if(ms_GetVersionInt() > 50201){
1947   - $layer->setconnectiontype($connectiontype);
  1947 + $layer->setconnectiontype($_GET["connectiontype"]);
1948 1948 }
1949 1949 else{
1950   - $layer->set("connectiontype",$connectiontype);
  1950 + $layer->set("connectiontype",$_GET["connectiontype"]);
1951 1951 }
1952   - $layer->set("data",$data);
1953   - $layer->set("tileitem",$tileitem);
1954   - $layer->set("tileindex",$tileindex);
1955   - $layer->set("type",$type);
1956   - if($type == 0){
  1952 + $layer->set("data",$_GET["data"]);
  1953 + $layer->set("tileitem",$_GET["tileitem"]);
  1954 + $layer->set("tileindex",$_GET["tileindex"]);
  1955 + $layer->set("type",$_GET["type"]);
  1956 + if($_GET["type"] == 0){
1957 1957 $c = $layer->getClass(0);
1958 1958 $e = $c->getStyle(0);
1959 1959 if($e->symbolname == ""){
1960 1960 $e->set("symbolname","ponto");
1961 1961 }
1962 1962 }
1963   - if($type == 1){
  1963 + if($_GET["type"] == 1){
1964 1964 $c = $layer->getClass(0);
1965 1965 $e = $c->getStyle(0);
1966 1966 if($e->symbolname == "" || $e->symbolname == "ponto"){
1967 1967 $e->set("symbolname","linha");
1968 1968 }
1969 1969 }
1970   - if($type == 2){
  1970 + if($_GET["type"] == 2){
1971 1971 $c = $layer->getClass(0);
1972 1972 $e = $c->getStyle(0);
1973 1973 if($e->symbolname == "linha" || $e->symbolname == "ponto"){
1974 1974 $e->set("symbolname"," ");
1975 1975 }
1976 1976 }
1977   - $layer->setfilter($filter);
1978   - $layer->set("filteritem",$filteritem);
  1977 + $layer->setfilter($_GET["filter"]);
  1978 + $layer->set("filteritem",$_GET["filteritem"]);
1979 1979 if($layer->getprojection() == MS_TRUE)
1980   - $layer->setprojection($projection);
1981   - if($layer->getprojection() == MS_FALSE && $projection != "")
1982   - $layer->setprojection($projection);
  1980 + $layer->setprojection($_GET["projection"]);
  1981 + if($layer->getprojection() == MS_FALSE && $_GET["projection"] != "")
  1982 + $layer->setprojection($_GET["projection"]);
1983 1983 if($layer->connectiontype == 7 || $layer->connectiontype== 9){
1984   - $layer->setmetadata("tipooriginal",$tipooriginal);
  1984 + $layer->setmetadata("tipooriginal",$_GET["tipooriginal"]);
1985 1985 }
1986   - $layer->setmetadata("cache",$cache);
1987   - $layer->setmetadata("tiles",$tiles);
1988   - if($cortepixels == ""){
1989   - $cortepixels = 0;
  1986 + $layer->setmetadata("cache",$_GET["cache"]);
  1987 + $layer->setmetadata("tiles",$_GET["tiles"]);
  1988 + if($_GET["cortepixels"] == ""){
  1989 + $_GET["cortepixels"] = 0;
1990 1990 }
1991   - $layer->setmetadata("cortepixels",$cortepixels);
  1991 + $layer->setmetadata("cortepixels",$_GET["cortepixels"]);
1992 1992  
1993   - $layer->setmetadata("convcaracter",$convcaracter);
1994   - if($testar == "true")
  1993 + $layer->setmetadata("convcaracter",$_GET["convcaracter"]);
  1994 + if($_GET["testar"] == "true")
1995 1995 {
1996 1996 $nome = $dir_tmp."/".$codigoMap.".map";
1997 1997 $mapa->save($nome);
... ... @@ -2082,7 +2082,7 @@ function pegaMetadados()
2082 2082 }
2083 2083 function alterarMetadados()
2084 2084 {
2085   - global $tipooriginal,$wms_srs,$wms_name,$wms_server_version,$wms_format,$wms_auth_username,$wms_auth_password,$wms_auth_type,$wms_connectiontimeout,$wms_latlonboundingbox,$wms_proxy_auth_type,$wms_proxy_host,$wms_proxy_port,$wms_proxy_type,$wms_proxy_username,$wms_proxy_password,$wms_sld_body,$wms_sld_url,$wms_style,$wms_bgcolor,$wms_transparent,$wms_time,$wms_tile,$itembuscarapida,$iconetema,$ltempoformatodata,$ltempoconvencode,$ltempoiteminicio,$ltempoitemfim,$ltempoitemtitulo,$ltempoitemdescricao,$ltempoitemtip,$ltempoitemimagem,$ltempoitemicone,$ltempoitemlink,$description_template,$palletestep,$palletefile,$codigoMap,$codigoLayer,$locaplic,$classestamanho,$classessimbolo,$classescor,$classesnome,$classesitem,$mensagem,$extensao,$tip,$itenslink,$itens,$itensdesc,$editorsql;
  2085 + global $codigoMap,$codigoLayer,$locaplic;
2086 2086 $dados = array();
2087 2087 $mapfile = $locaplic."/temas/".$codigoMap.".map";
2088 2088 $mapa = ms_newMapObj($mapfile);
... ... @@ -2090,78 +2090,78 @@ function alterarMetadados()
2090 2090 if(strtoupper($layer->getmetadata("metaestat")) === "SIM"){
2091 2091 return "erro. Layer METAESTAT";
2092 2092 }
2093   - $itens = str_replace(", ",",",$itens);
2094   - $itens = str_replace(" ,",",",$itens);
2095   - $layer->setmetadata("itens",$itens);
2096   - $itensdesc = str_replace(", ",",",$itensdesc);
2097   - $itensdesc = str_replace(" ,",",",$itensdesc);
2098   - $layer->setmetadata("itensdesc",$itensdesc);
2099   - $layer->setmetadata("itenslink",$itenslink);
2100   - $tip = str_replace(", ",",",$tip);
2101   - $tip = str_replace(" ,",",",$tip);
2102   - $layer->setmetadata("tip",$tip);
2103   - $layer->setmetadata("classesitem",$classesitem);
2104   - $layer->setmetadata("classesnome",$classesnome);
2105   - $layer->setmetadata("classescor",$classescor);
2106   - $layer->setmetadata("classessimbolo",$classessimbolo);
2107   - $layer->setmetadata("classestamanho",$classestamanho);
2108   - $layer->setmetadata("palletefile",$palletefile);
2109   - $layer->setmetadata("palletestep",$palletestep);
2110   - $layer->setmetadata("description_template",$description_template);
2111   - $layer->setmetadata("editorsql",$editorsql);
2112   - $layer->setmetadata("ltempoformatodata",$ltempoformatodata);
2113   - $layer->setmetadata("ltempoiteminicio",$ltempoiteminicio);
2114   - $layer->setmetadata("ltempoitemfim",$ltempoitemfim);
2115   - $layer->setmetadata("ltempoitemtitulo",$ltempoitemtitulo);
2116   - $layer->setmetadata("ltempoconvencode",$ltempoconvencode);
2117   - $layer->setmetadata("ltempoitemdescricao",$ltempoitemdescricao);
2118   - $layer->setmetadata("ltempoitemtip",$ltempoitemtip);
2119   - $layer->setmetadata("ltempoitemimagem",$ltempoitemimagem);
2120   - $layer->setmetadata("ltempoitemicone",$ltempoitemicone);
2121   - $layer->setmetadata("ltempoitemlink",$ltempoitemlink);
2122   -
2123   - $layer->setmetadata("itembuscarapida",$itembuscarapida);
  2093 + $_GET["itens"] = str_replace(", ",",",$_GET["itens"]);
  2094 + $_GET["itens"] = str_replace(" ,",",",$_GET["itens"]);
  2095 + $layer->setmetadata("itens",$_GET["itens"]);
  2096 + $_GET["itensdesc"] = str_replace(", ",",",$_GET["itensdesc"]);
  2097 + $_GET["itensdesc"] = str_replace(" ,",",",$_GET["itensdesc"]);
  2098 + $layer->setmetadata("itensdesc",$_GET["itensdesc"]);
  2099 + $layer->setmetadata("itenslink",$_GET["itenslink"]);
  2100 + $_GET["tip"] = str_replace(", ",",",$_GET["tip"]);
  2101 + $_GET["tip"] = str_replace(" ,",",",$_GET["tip"]);
  2102 + $layer->setmetadata("tip",$_GET["tip"]);
  2103 + $layer->setmetadata("classesitem",$_GET["classesitem"]);
  2104 + $layer->setmetadata("classesnome",$_GET["classesnome"]);
  2105 + $layer->setmetadata("classescor",$_GET["classescor"]);
  2106 + $layer->setmetadata("classessimbolo",$_GET["classessimbolo"]);
  2107 + $layer->setmetadata("classestamanho",$_GET["classestamanho"]);
  2108 + $layer->setmetadata("palletefile",$_GET["palletefile"]);
  2109 + $layer->setmetadata("palletestep",$_GET["palletestep"]);
  2110 + $layer->setmetadata("description_template",$_GET["description_template"]);
  2111 + $layer->setmetadata("editorsql",$_GET["editorsql"]);
  2112 + $layer->setmetadata("ltempoformatodata",$_GET["ltempoformatodata"]);
  2113 + $layer->setmetadata("ltempoiteminicio",$_GET["ltempoiteminicio"]);
  2114 + $layer->setmetadata("ltempoitemfim",$_GET["ltempoitemfim"]);
  2115 + $layer->setmetadata("ltempoitemtitulo",$_GET["ltempoitemtitulo"]);
  2116 + $layer->setmetadata("ltempoconvencode",$_GET["ltempoconvencode"]);
  2117 + $layer->setmetadata("ltempoitemdescricao",$_GET["ltempoitemdescricao"]);
  2118 + $layer->setmetadata("ltempoitemtip",$_GET["ltempoitemtip"]);
  2119 + $layer->setmetadata("ltempoitemimagem",$_GET["ltempoitemimagem"]);
  2120 + $layer->setmetadata("ltempoitemicone",$_GET["ltempoitemicone"]);
  2121 + $layer->setmetadata("ltempoitemlink",$_GET["ltempoitemlink"]);
  2122 +
  2123 + $layer->setmetadata("itembuscarapida",$_GET["itembuscarapida"]);
2124 2124 if($layer->connectiontype == 7 || $layer->connectiontype== 9){
2125   - $layer->setmetadata("wms_srs",$wms_srs);
2126   - $layer->setmetadata("wms_name",$wms_name);
2127   - $layer->setmetadata("wms_server_version",$wms_server_version);
2128   - $layer->setmetadata("wms_format",$wms_format);
2129   - if($wms_auth_username != ""){
2130   - $layer->setmetadata("wms_auth_username",$wms_auth_username);
2131   - $layer->setmetadata("wms_auth_password",$wms_auth_password);
2132   - $layer->setmetadata("wms_auth_type",$wms_auth_type);
  2125 + $layer->setmetadata("wms_srs",$_GET["wms_srs"]);
  2126 + $layer->setmetadata("wms_name",$_GET["wms_name"]);
  2127 + $layer->setmetadata("wms_server_version",$_GET["wms_server_version"]);
  2128 + $layer->setmetadata("wms_format",$_GET["wms_format"]);
  2129 + if($_GET["wms_auth_username"] != ""){
  2130 + $layer->setmetadata("wms_auth_username",$_GET["wms_auth_username"]);
  2131 + $layer->setmetadata("wms_auth_password",$_GET["wms_auth_password"]);
  2132 + $layer->setmetadata("wms_auth_type",$_GET["wms_auth_type"]);
2133 2133 }
2134   - $layer->setmetadata("wms_connectiontimeout",$wms_connectiontimeout);
2135   - if($wms_latlonboundingbox != "")
  2134 + $layer->setmetadata("wms_connectiontimeout",$_GET["wms_connectiontimeout"]);
  2135 + if($_GET["wms_latlonboundingbox"] != "")
2136 2136 {
2137   - $layer->setmetadata("wms_latlonboundingbox",$wms_latlonboundingbox);
  2137 + $layer->setmetadata("wms_latlonboundingbox",$_GET["wms_latlonboundingbox"]);
2138 2138 }
2139   - if($wms_proxy_host != ""){
2140   - $layer->setmetadata("wms_proxy_auth_type",$wms_proxy_auth_type);
2141   - $layer->setmetadata("wms_proxy_host",$wms_proxy_host);
2142   - $layer->setmetadata("wms_proxy_port",$wms_proxy_port);
2143   - $layer->setmetadata("wms_proxy_type",$wms_proxy_type);
2144   - $layer->setmetadata("wms_proxy_username",$wms_proxy_username);
2145   - $layer->setmetadata("wms_proxy_password",$wms_proxy_password);
  2139 + if($_GET["wms_proxy_host"] != ""){
  2140 + $layer->setmetadata("wms_proxy_auth_type",$_GET["wms_proxy_auth_type"]);
  2141 + $layer->setmetadata("wms_proxy_host",$_GET["wms_proxy_host"]);
  2142 + $layer->setmetadata("wms_proxy_port",$_GET["wms_proxy_port"]);
  2143 + $layer->setmetadata("wms_proxy_type",$_GET["wms_proxy_type"]);
  2144 + $layer->setmetadata("wms_proxy_username",$_GET["wms_proxy_username"]);
  2145 + $layer->setmetadata("wms_proxy_password",$_GET["wms_proxy_password"]);
2146 2146 }
2147   - if($wms_sld_body != "")
  2147 + if($_GET["wms_sld_body"] != "")
2148 2148 {
2149   - $layer->setmetadata("wms_sld_body",$wms_sld_body);
  2149 + $layer->setmetadata("wms_sld_body",$_GET["wms_sld_body"]);
2150 2150 }
2151   - if($wms_sld_url != "")
  2151 + if($_GET["wms_sld_url"] != "")
2152 2152 {
2153   - $layer->setmetadata("wms_sld_url",$wms_sld_url);
  2153 + $layer->setmetadata("wms_sld_url",$_GET["wms_sld_url"]);
2154 2154 }
2155   - $layer->setmetadata("wms_style",$wms_style);
2156   - if($wms_bgcolor != "")
2157   - $layer->setmetadata("wms_bgcolor",$wms_bgcolor);
2158   - if($wms_transparent != "")
2159   - $layer->setmetadata("wms_transparent",$wms_transparent);
2160   - if($wms_time != "")
2161   - $layer->setmetadata("wms_time",$wms_time);
2162   - if($wms_tile != "")
2163   - $layer->setmetadata("wms_tile",$wms_tile);
2164   - $layer->setmetadata("tipooriginal",$tipooriginal);
  2155 + $layer->setmetadata("wms_style",$_GET["wms_style"]);
  2156 + if($_GET["wms_bgcolor"] != "")
  2157 + $layer->setmetadata("wms_bgcolor",$_GET["wms_bgcolor"]);
  2158 + if($_GET["wms_transparent"] != "")
  2159 + $layer->setmetadata("wms_transparent",$_GET["wms_transparent"]);
  2160 + if($_GET["wms_time"] != "")
  2161 + $layer->setmetadata("wms_time",$_GET["wms_time"]);
  2162 + if($_GET["wms_tile"] != "")
  2163 + $layer->setmetadata("wms_tile",$_GET["wms_tile"]);
  2164 + $layer->setmetadata("tipooriginal",$_GET["tipooriginal"]);
2165 2165 }
2166 2166 $mapa->save($mapfile);
2167 2167 removeCabecalho($mapfile);
... ... @@ -2169,14 +2169,14 @@ function alterarMetadados()
2169 2169 }
2170 2170 function pegaClasseGeral()
2171 2171 {
2172   - global $codigoMap,$codigoLayer,$indiceClasse,$locaplic;
  2172 + global $codigoMap,$codigoLayer,$locaplic;
2173 2173  
2174 2174 error_reporting(0);
2175 2175 $dados = array();
2176 2176 $mapfile = $locaplic."/temas/".$codigoMap.".map";
2177 2177 $mapa = ms_newMapObj($mapfile);
2178 2178 $layer = $mapa->getlayerbyname($codigoLayer);
2179   - $classe = $layer->getclass($indiceClasse);
  2179 + $classe = $layer->getclass($_GET["indiceClasse"]);
2180 2180 $dados["name"] = base64_encode($classe->name);
2181 2181 $dados["title"] = base64_encode($classe->title);
2182 2182 $temp = $classe->getExpressionString();
... ... @@ -2192,7 +2192,7 @@ function pegaClasseGeral()
2192 2192 //$dados["text"] = $classe->getTextString();
2193 2193 $dados["codigoMap"] = $codigoMap;
2194 2194 $dados["codigoLayer"] = $codigoLayer;
2195   - $dados["indiceClasse"] = $indiceClasse;
  2195 + $dados["indiceClasse"] = $_GET["indiceClasse"];
2196 2196 $dados["colunas"] = implode(" ,",pegaItens($layer));
2197 2197 return $dados;
2198 2198 }
... ...
classesphp/mapa_openlayers.php
  Diff comments   View file @d87ee9b
... ... @@ -167,6 +167,7 @@ $postgis_mapa = $_SESSION["postgis_mapa"];
167 167 include_once("funcoes_gerais.php");
168 168  
169 169 $logExec = $_SESSION["logExec"];
  170 +
170 171 if(isset($logExec) && $logExec["mapa_"] == true){
171 172 i3GeoLog("prog: mapa_openlayers url: ".implode("&",array_merge($_GET,$_POST)),$_SESSION["dir_tmp"]);
172 173 }
... ...
ms_configura.php
  Diff comments   View file @d87ee9b
... ... @@ -96,12 +96,12 @@ $logTransacoes = false;
96 96  
97 97 */
98 98 $logExec = array(
99   - "mapa_" => true, //mapa_openlayers e mapa_googlemaps
100   - "init" => true, //ms_criamapa mapa_inicia
101   - "ogc" => true, //servico ogc
102   - "upload" => true, //ferramentas de upload
103   - "ferramentas" => true, //todas asferramentas que usam safe.php
104   - "controle" => true //tudo que passa por mapa_controle.php
  99 + "mapa_" => false, //mapa_openlayers e mapa_googlemaps
  100 + "init" => false, //ms_criamapa mapa_inicia
  101 + "ogc" => false, //servico ogc
  102 + "upload" => false, //ferramentas de upload
  103 + "ferramentas" => false, //todas asferramentas que usam safe.php
  104 + "controle" => false //tudo que passa por mapa_controle.php
105 105 );
106 106 /*
107 107 Variable: $i3GeoProjDefault
... ...
ms_criamapa.php
  Diff comments   View file @d87ee9b
... ... @@ -438,6 +438,7 @@ $_SESSION["expoeMapfile"] = $expoeMapfile;
438 438 $_SESSION["googleApiKey"] = $googleApiKey_;
439 439 $_SESSION["mensagemInicia"] = $mensagemInicia_;
440 440 $_SESSION["interfacePadrao"] = $interfacePadrao_;
  441 +$_SESSION["logExec"] = $logExec_;
441 442 if(isset($interface_)){
442 443 $_SESSION["interface"] = $interface_;
443 444 }
... ...