Commit e791d51de84b9d079e45a7feb794349a84b6d4b1
1 parent
5cfbe63a
Exists in
master
and in
7 other branches
funcao de log
Showing
17 changed files
with
122 additions
and
103 deletions
Show diff stats
admin/php/editormapfile.php
... | ... | @@ -47,6 +47,7 @@ testaSafeNumerico([$id]); |
47 | 47 | |
48 | 48 | $codigoMap = $_GET["codigoMap"]; |
49 | 49 | $codigoLayer = $_GET["codigoLayer"]; |
50 | +$movimento = $_GET["movimento"]; | |
50 | 51 | |
51 | 52 | $funcoesEdicao = array( |
52 | 53 | "CRIARNOVOMAP", |
... | ... | @@ -1203,7 +1204,10 @@ function refazerLayer() |
1203 | 1204 | } |
1204 | 1205 | function sobeDesce() |
1205 | 1206 | { |
1206 | - global $movimento,$tipo,$codigoMap,$codigoLayer,$indiceClasse,$indiceEstilo,$locaplic; | |
1207 | + global $movimento,$tipo,$codigoMap,$codigoLayer,$locaplic; | |
1208 | + | |
1209 | + $indiceClasse = $_GET["indiceClasse"]; | |
1210 | + $indiceEstilo = $_GET["indiceEstilo"]; | |
1207 | 1211 | $mapfile = $locaplic."/temas/".$codigoMap.".map"; |
1208 | 1212 | $mapa = ms_newMapObj($mapfile); |
1209 | 1213 | $layer = $mapa->getlayerbyname($codigoLayer); |
... | ... | @@ -1248,49 +1252,51 @@ function sobeDesce() |
1248 | 1252 | } |
1249 | 1253 | //essa funcao e usada tambem por i3geo/ferramentas/upload/upload.php |
1250 | 1254 | function criarNovoMap(){ |
1251 | - global $nome,$codigo,$locaplic,$it,$en,$es,$esquemaadmin,$metaestat,$tipoLayer,$data,$conexao,$acessopublico; | |
1252 | - $arq = $locaplic."/temas/".$codigo.".map"; | |
1253 | - if(empty($acessopublico)){ | |
1254 | - $acessopublico = "SIM"; | |
1255 | + global $locaplic,$esquemaadmin; | |
1256 | + | |
1257 | + $arq = $locaplic."/temas/".$_GET["codigo"].".map"; | |
1258 | + if(empty($_GET["acessopublico"])){ | |
1259 | + $_GET["acessopublico"] = "SIM"; | |
1255 | 1260 | } |
1256 | 1261 | if(!file_exists($arq)){ |
1257 | - if(empty($tipoLayer)){ | |
1258 | - $tipoLayer = "line"; | |
1262 | + if(empty($_GET["tipoLayer"])){ | |
1263 | + $_GET["tipoLayer"] = "line"; | |
1259 | 1264 | } |
1260 | 1265 | $dados[] = "MAP"; |
1261 | 1266 | $dados[] = "SYMBOLSET ../symbols/simbolosv6.sym"; |
1262 | 1267 | $dados[] = 'FONTSET "../symbols/fontes.txt"'; |
1263 | 1268 | $dados[] = "LAYER"; |
1264 | - $dados[] = ' NAME "'.$codigo.'"'; | |
1269 | + $dados[] = ' NAME "'.$_GET["codigo"].'"'; | |
1265 | 1270 | $dados[] = ' TEMPLATE "none.htm"'; |
1266 | - if(!empty($metaestat) && $metaestat == "SIM"){ | |
1271 | + if(!empty($_GET["metaestat"]) && $_GET["metaestat"] == "SIM"){ | |
1267 | 1272 | $dados[] = ' CONNECTIONTYPE POSTGIS'; |
1268 | 1273 | $tipoLayer = "polygon"; |
1269 | 1274 | } |
1270 | 1275 | elseif(!empty($conexao)){ |
1271 | 1276 | $dados[] = ' CONNECTIONTYPE POSTGIS'; |
1272 | - $dados[] = ' CONNECTION "'.$conexao.'"'; | |
1277 | + $dados[] = ' CONNECTION "'.$_GET["conexao"].'"'; | |
1273 | 1278 | } |
1274 | - $dados[] = " TYPE ".$tipoLayer; | |
1275 | - if(empty($data)){ | |
1279 | + $dados[] = " TYPE ".$_GET["tipoLayer"]; | |
1280 | + if(empty($_GET["data"])){ | |
1276 | 1281 | $dados[] = ' DATA ""'; |
1277 | 1282 | $dados[] = ' CONNECTION ""'; |
1278 | 1283 | } |
1279 | 1284 | else{ |
1280 | - $dados[] = ' DATA "'.$data.'"'; | |
1285 | + $dados[] = ' DATA "'.$_GET["data"].'"'; | |
1281 | 1286 | } |
1282 | 1287 | $dados[] = ' STATUS DEFAULT'; |
1283 | 1288 | $dados[] = ' METADATA'; |
1284 | - $dados[] = ' TEMA "'.$nome.'"'; | |
1289 | + $dados[] = ' TEMA "'.$_GET["nome"].'"'; | |
1285 | 1290 | $dados[] = ' CLASSE "SIM"'; |
1286 | 1291 | $tipoa_tema = ""; |
1287 | - if(!empty($metaestat) && $metaestat == "SIM"){ | |
1292 | + if(!empty($_GET["metaestat"]) && $_GET["metaestat"] == "SIM"){ | |
1288 | 1293 | $dados[] = ' METAESTAT "SIM"'; |
1289 | 1294 | //para marcar no banco de dados de administracao |
1290 | 1295 | $tipoa_tema = "META"; |
1291 | 1296 | //METAESTAT_CODIGO_TIPO_REGIAO |
1292 | 1297 | //ID_MEDIDA_VARIAVEL |
1293 | 1298 | } |
1299 | + $acessopublico = $_GET["acessopublico"]; | |
1294 | 1300 | $dados[] = ' permiteogc "'.$acessopublico.'"'; |
1295 | 1301 | $dados[] = ' permitedownload "'.$acessopublico.'"'; |
1296 | 1302 | $dados[] = ' permitekml "'.$acessopublico.'"'; |
... | ... | @@ -1317,8 +1323,8 @@ function criarNovoMap(){ |
1317 | 1323 | |
1318 | 1324 | include("conexao.php"); |
1319 | 1325 | if($convUTF){ |
1320 | - $nome = utf8_encode($nome); | |
1321 | - $desc = utf8_encode($desc); | |
1326 | + $_GET["nome"] = utf8_encode($_GET["nome"]); | |
1327 | + $_GET["desc"] = utf8_encode($_GET["desc"]); | |
1322 | 1328 | } |
1323 | 1329 | $dataCol = array( |
1324 | 1330 | "link_tema" => '', |
... | ... | @@ -1329,11 +1335,11 @@ function criarNovoMap(){ |
1329 | 1335 | "desc_tema" => '', |
1330 | 1336 | "tipoa_tema" => $tipoa_tema, |
1331 | 1337 | "tags_tema" => '', |
1332 | - "nome_tema" => $nome, | |
1333 | - "codigo_tema" => $codigo, | |
1334 | - "it" => $it, | |
1335 | - "es" => $es, | |
1336 | - "en" => $en | |
1338 | + "nome_tema" => $_GET["nome"], | |
1339 | + "codigo_tema" => $_GET["codigo"], | |
1340 | + "it" => $_GET["it"], | |
1341 | + "es" => $_GET["es"], | |
1342 | + "en" => $_GET["en"] | |
1337 | 1343 | ); |
1338 | 1344 | i3GeoAdminInsert($dbhw,"i3geoadmin_temas",$dataCol); |
1339 | 1345 | $dbh = null; |
... | ... | @@ -1345,6 +1351,7 @@ function criarNovoMap(){ |
1345 | 1351 | function criarNovoLayer() |
1346 | 1352 | { |
1347 | 1353 | global $locaplic,$codigoMap; |
1354 | + | |
1348 | 1355 | include_once("$locaplic/classesphp/funcoes_gerais.php"); |
1349 | 1356 | $mapfile = $locaplic."/temas/".$codigoMap.".map"; |
1350 | 1357 | $mapa = ms_newMapObj($mapfile); |
... | ... | @@ -1357,7 +1364,7 @@ function criarNovoLayer() |
1357 | 1364 | } |
1358 | 1365 | function autoClassesLayer() |
1359 | 1366 | { |
1360 | - global $codigoMap,$codigoLayer,$itemExpressao,$itemNome,$locaplic,$dir_tmp,$postgis_mapa; | |
1367 | + global $codigoMap,$codigoLayer,$locaplic,$dir_tmp,$postgis_mapa; | |
1361 | 1368 | $mapfile = $locaplic."/temas/".$codigoMap.".map"; |
1362 | 1369 | include_once("$locaplic/classesphp/classe_alteraclasse.php"); |
1363 | 1370 | error_reporting(0); |
... | ... | @@ -1419,7 +1426,7 @@ function autoClassesLayer() |
1419 | 1426 | } |
1420 | 1427 | $mapageral->save($nometemp); |
1421 | 1428 | $m = new Alteraclasse($nometemp,$codigoLayer); |
1422 | - $m->valorunico($itemExpressao,"",$itemNome); | |
1429 | + $m->valorunico($_GET["itemExpressao"],"",$_GET["itemNome"]); | |
1423 | 1430 | $m->salva(); |
1424 | 1431 | $mapatemp = ms_newMapObj($nometemp); |
1425 | 1432 | |
... | ... | @@ -1454,11 +1461,11 @@ function criarNovaClasse() |
1454 | 1461 | } |
1455 | 1462 | function criarNovoEstilo() |
1456 | 1463 | { |
1457 | - global $codigoMap,$codigoLayer,$indiceClasse,$locaplic; | |
1464 | + global $codigoMap,$codigoLayer,$locaplic; | |
1458 | 1465 | $mapfile = $locaplic."/temas/".$codigoMap.".map"; |
1459 | 1466 | $mapa = ms_newMapObj($mapfile); |
1460 | 1467 | $nl = $mapa->getlayerbyname($codigoLayer); |
1461 | - $classObj = $nl->getclass($indiceClasse); | |
1468 | + $classObj = $nl->getclass($_GET["indiceClasse"]); | |
1462 | 1469 | $numestilos = $classObj->numstyles; |
1463 | 1470 | $nestilo = ms_newStyleObj($classObj); |
1464 | 1471 | $mapa->save($mapfile); |
... | ... | @@ -1562,7 +1569,7 @@ function listaClasses() |
1562 | 1569 | } |
1563 | 1570 | function listaEstilos() |
1564 | 1571 | { |
1565 | - global $codigoMap,$codigoLayer,$indiceClasse,$locaplic; | |
1572 | + global $codigoMap,$codigoLayer,$locaplic; | |
1566 | 1573 | $dados = array(); |
1567 | 1574 | $mapfile = $locaplic."/temas/".$codigoMap.".map"; |
1568 | 1575 | $mapa = ms_newMapObj($mapfile); |
... | ... | @@ -1570,7 +1577,7 @@ function listaEstilos() |
1570 | 1577 | if(strtoupper($layer->getmetadata("metaestat")) === "SIM"){ |
1571 | 1578 | return $dados; |
1572 | 1579 | } |
1573 | - $classe = $layer->getclass($indiceClasse); | |
1580 | + $classe = $layer->getclass($_GET["indiceClasse"]); | |
1574 | 1581 | $numestilos = $classe->numstyles; |
1575 | 1582 | for($i=0;$i<$numestilos;++$i) |
1576 | 1583 | { |
... | ... | @@ -1592,11 +1599,11 @@ function excluirLayer() |
1592 | 1599 | } |
1593 | 1600 | function excluirClasse() |
1594 | 1601 | { |
1595 | - global $codigoMap,$codigoLayer,$indiceClasse,$locaplic; | |
1602 | + global $codigoMap,$codigoLayer,$locaplic; | |
1596 | 1603 | $mapfile = $locaplic."/temas/".$codigoMap.".map"; |
1597 | 1604 | $mapa = ms_newMapObj($mapfile); |
1598 | 1605 | $nl = $mapa->getlayerbyname($codigoLayer); |
1599 | - $classObj = $nl->getclass($indiceClasse); | |
1606 | + $classObj = $nl->getclass($_GET["indiceClasse"]); | |
1600 | 1607 | $classObj->set("status",MS_DELETE); |
1601 | 1608 | $mapa->save($mapfile); |
1602 | 1609 | removeCabecalho($mapfile); |
... | ... | @@ -1604,12 +1611,12 @@ function excluirClasse() |
1604 | 1611 | } |
1605 | 1612 | function excluirEstilo() |
1606 | 1613 | { |
1607 | - global $codigoMap,$codigoLayer,$indiceClasse,$indiceEstilo,$locaplic; | |
1614 | + global $codigoMap,$codigoLayer,$locaplic; | |
1608 | 1615 | $mapfile = $locaplic."/temas/".$codigoMap.".map"; |
1609 | 1616 | $mapa = ms_newMapObj($mapfile); |
1610 | 1617 | $nl = $mapa->getlayerbyname($codigoLayer); |
1611 | - $classObj = $nl->getclass($indiceClasse); | |
1612 | - $classObj->deletestyle($indiceEstilo); | |
1618 | + $classObj = $nl->getclass($_GET["indiceClasse"]); | |
1619 | + $classObj->deletestyle($_GET["indiceEstilo"]); | |
1613 | 1620 | $mapa->save($mapfile); |
1614 | 1621 | removeCabecalho($mapfile); |
1615 | 1622 | return "ok"; |
... | ... | @@ -1649,40 +1656,40 @@ function pegaComport() |
1649 | 1656 | } |
1650 | 1657 | function alterarComport() |
1651 | 1658 | { |
1652 | - global $dir_tmp,$codigoMap,$codigoLayer,$locaplic,$aplicaextensao,$permitecomentario,$temporizador,$classe,$legendaimg,$escondido,$identifica,$transitioneffect,$status,$offsite,$opacity,$maxscale,$minscale,$labelitem,$labelmaxscale,$labelminscale,$symbolscale,$tolerance,$toleranceunits,$sizeunits; | |
1659 | + global $dir_tmp,$codigoMap,$codigoLayer,$locaplic; | |
1653 | 1660 | $v = versao(); |
1654 | 1661 | $mapfile = $locaplic."/temas/".$codigoMap.".map"; |
1655 | 1662 | $mapa = ms_newMapObj($mapfile); |
1656 | 1663 | $layer = $mapa->getlayerbyname($codigoLayer); |
1657 | - $layer->setmetadata("aplicaextensao",$aplicaextensao); | |
1658 | - $layer->setmetadata("permitecomentario",$permitecomentario); | |
1659 | - $layer->setmetadata("temporizador",$temporizador); | |
1660 | - $layer->setmetadata("classe",$classe); | |
1661 | - $layer->setmetadata("legendaimg",$legendaimg); | |
1662 | - $layer->setmetadata("escondido",$escondido); | |
1663 | - $layer->setmetadata("identifica",$identifica); | |
1664 | - $layer->setmetadata("transitioneffect",$transitioneffect); | |
1665 | - $layer->set("status",$status); | |
1666 | - if($offsite == -1 || $offsite == "null") | |
1664 | + $layer->setmetadata("aplicaextensao",$_GET["aplicaextensao"]); | |
1665 | + $layer->setmetadata("permitecomentario",$_GET["permitecomentario"]); | |
1666 | + $layer->setmetadata("temporizador",$_GET["temporizador"]); | |
1667 | + $layer->setmetadata("classe",$_GET["classe"]); | |
1668 | + $layer->setmetadata("legendaimg",$_GET["legendaimg"]); | |
1669 | + $layer->setmetadata("escondido",$_GET["escondido"]); | |
1670 | + $layer->setmetadata("identifica",$_GET["identifica"]); | |
1671 | + $layer->setmetadata("transitioneffect",$_GET["transitioneffect"]); | |
1672 | + $layer->set("status",$_GET["status"]); | |
1673 | + if($_GET["offsite"] == -1 || $_GET["offsite"] == "null") | |
1667 | 1674 | { |
1668 | - $offsite = "-1,-1,-1"; | |
1675 | + $_GET["offsite"] = "-1,-1,-1"; | |
1669 | 1676 | } |
1670 | 1677 | $cor = $layer->offsite; |
1671 | - $c = explode(",",$offsite); | |
1678 | + $c = explode(",",$_GET["offsite"]); | |
1672 | 1679 | if(count($c) < 3) |
1673 | - $c = explode(" ",$offsite); | |
1680 | + $c = explode(" ",$_GET["offsite"]); | |
1674 | 1681 | $cor->setrgb($c[0],$c[1],$c[2]); |
1675 | 1682 | $layer->offsite->red.",".$layer->offsite->green.",".$layer->offsite->blue; |
1676 | - $v["principal"] == "4" ? $layer->set("transparency",$opacity) : $layer->set("opacity",$opacity); | |
1677 | - $layer->set("maxscaledenom",$maxscale); | |
1678 | - $layer->set("minscaledenom",$minscale); | |
1679 | - $layer->set("labelitem",$labelitem); | |
1680 | - $layer->set("labelmaxscaledenom",$labelmaxscale); | |
1681 | - $layer->set("labelminscaledenom",$labelminscale); | |
1682 | - $layer->set("symbolscaledenom",$symbolscale); | |
1683 | - $layer->set("tolerance",$tolerance); | |
1684 | - $layer->set("toleranceunits",$toleranceunits); | |
1685 | - $layer->set("sizeunits",$sizeunits); | |
1683 | + $v["principal"] == "4" ? $layer->set("transparency",$_GET["opacity"]) : $layer->set("opacity",$_GET["opacity"]); | |
1684 | + $layer->set("maxscaledenom",$_GET["maxscale"]); | |
1685 | + $layer->set("minscaledenom",$_GET["minscale"]); | |
1686 | + $layer->set("labelitem",$_GET["labelitem"]); | |
1687 | + $layer->set("labelmaxscaledenom",$_GET["labelmaxscale"]); | |
1688 | + $layer->set("labelminscaledenom",$_GET["labelminscale"]); | |
1689 | + $layer->set("symbolscaledenom",$_GET["symbolscale"]); | |
1690 | + $layer->set("tolerance",$_GET["tolerance"]); | |
1691 | + $layer->set("toleranceunits",$_GET["toleranceunits"]); | |
1692 | + $layer->set("sizeunits",$_GET["sizeunits"]); | |
1686 | 1693 | |
1687 | 1694 | $mapa->save($mapfile); |
1688 | 1695 | removeCabecalho($mapfile); |
... | ... | @@ -1707,20 +1714,20 @@ function pegaTitulo() |
1707 | 1714 | return $dados; |
1708 | 1715 | } |
1709 | 1716 | function alterarNomeTema(){ |
1710 | - global $locaplic,$codigoMap, $novoNome, $esquemaadmin; | |
1717 | + global $locaplic,$codigoMap, $esquemaadmin; | |
1711 | 1718 | $mapfile = $locaplic."/temas/".$codigoMap.".map"; |
1712 | 1719 | $mapa = ms_newMapObj($mapfile); |
1713 | 1720 | $layer = $mapa->getlayerbyname($codigoMap); |
1714 | 1721 | if($layer){ |
1715 | - $layer->setmetadata("tema",$novoNome); | |
1722 | + $layer->setmetadata("tema",$_GET["novoNome"]); | |
1716 | 1723 | $mapa->save($mapfile); |
1717 | 1724 | removeCabecalho($mapfile); |
1718 | 1725 | include("conexao.php"); |
1719 | 1726 | if($convUTF){ |
1720 | - $novoNome = utf8_encode($novoNome); | |
1727 | + $_GET["novoNome"] = utf8_encode($_GET["novoNome"]); | |
1721 | 1728 | } |
1722 | 1729 | $dataCol = array( |
1723 | - "nome_tema" => $novoNome | |
1730 | + "nome_tema" => $_GET["novoNome"] | |
1724 | 1731 | ); |
1725 | 1732 | i3GeoAdminUpdate($dbhw,"i3geoadmin_temas",$dataCol," WHERE codigo_tema='$codigoMap'"); |
1726 | 1733 | $dbhw = null; |
... | ... | @@ -1730,22 +1737,22 @@ function alterarNomeTema(){ |
1730 | 1737 | } |
1731 | 1738 | function alterarTitulo() |
1732 | 1739 | { |
1733 | - global $dir_tmp,$codigoMap,$codigoLayer,$locaplic,$name,$tema,$iconetema,$mensagem,$escala,$extensao; | |
1740 | + global $dir_tmp,$codigoMap,$codigoLayer,$locaplic; | |
1734 | 1741 | $mapfile = $locaplic."/temas/".$codigoMap.".map"; |
1735 | 1742 | $mapa = ms_newMapObj($mapfile); |
1736 | 1743 | $layer = $mapa->getlayerbyname($codigoLayer); |
1737 | 1744 | |
1738 | - $layer->set("name",$name); | |
1739 | - $layer->setmetadata("tema",$tema); | |
1740 | - $layer->setmetadata("iconetema",$iconetema); | |
1741 | - $layer->setmetadata("mensagem",$mensagem); | |
1742 | - $layer->setmetadata("escala",$escala); | |
1743 | - $layer->setmetadata("extensao",$extensao); | |
1744 | - $layer->set("group",$group); | |
1745 | + $layer->set("name",$_GET["name"]); | |
1746 | + $layer->setmetadata("tema",$_GET["tema"]); | |
1747 | + $layer->setmetadata("iconetema",$_GET["iconetema"]); | |
1748 | + $layer->setmetadata("mensagem",$_GET["mensagem"]); | |
1749 | + $layer->setmetadata("escala",$_GET["escala"]); | |
1750 | + $layer->setmetadata("extensao",$_GET["extensao"]); | |
1751 | + $layer->set("group",$_GET["group"]); | |
1745 | 1752 | |
1746 | 1753 | $mapa->save($mapfile); |
1747 | 1754 | removeCabecalho($mapfile); |
1748 | - $codigoLayer = $name; | |
1755 | + $codigoLayer = $_GET["name"]; | |
1749 | 1756 | return "ok"; |
1750 | 1757 | } |
1751 | 1758 | function pegaDispo() |
... | ... | @@ -1784,15 +1791,15 @@ function pegaEditavel() |
1784 | 1791 | } |
1785 | 1792 | function alterarEditavel() |
1786 | 1793 | { |
1787 | - global $dir_tmp,$codigoMap,$codigoLayer,$locaplic,$editavel,$colunaidunico,$tabelaeditavel,$esquematabelaeditavel,$colunageometria; | |
1794 | + global $dir_tmp,$codigoMap,$codigoLayer,$locaplic; | |
1788 | 1795 | $mapfile = $locaplic."/temas/".$codigoMap.".map"; |
1789 | 1796 | $mapa = ms_newMapObj($mapfile); |
1790 | 1797 | $layer = $mapa->getlayerbyname($codigoLayer); |
1791 | - $layer->setmetadata("EDITAVEL",$editavel); | |
1792 | - $layer->setmetadata("COLUNAIDUNICO",$colunaidunico); | |
1793 | - $layer->setmetadata("TABELAEDITAVEL",$tabelaeditavel); | |
1794 | - $layer->setmetadata("ESQUEMATABELAEDITAVEL",$esquematabelaeditavel); | |
1795 | - $layer->setmetadata("COLUNAGEOMETRIA",$colunageometria); | |
1798 | + $layer->setmetadata("EDITAVEL",$_GET["editavel"]); | |
1799 | + $layer->setmetadata("COLUNAIDUNICO",$_GET["colunaidunico"]); | |
1800 | + $layer->setmetadata("TABELAEDITAVEL",$_GET["tabelaeditavel"]); | |
1801 | + $layer->setmetadata("ESQUEMATABELAEDITAVEL",$_GET["esquematabelaeditavel"]); | |
1802 | + $layer->setmetadata("COLUNAGEOMETRIA",$_GET["colunageometria"]); | |
1796 | 1803 | $layer->setmetadata("cache",""); |
1797 | 1804 | $mapa->save($mapfile); |
1798 | 1805 | removeCabecalho($mapfile); |
... | ... | @@ -1800,30 +1807,30 @@ function alterarEditavel() |
1800 | 1807 | } |
1801 | 1808 | function alterarDispo() |
1802 | 1809 | { |
1803 | - global $dir_tmp,$codigoMap,$codigoLayer,$locaplic,$download,$arquivodownload,$arquivokmz,$ogc_tema,$kml_tema,$kmz_tema,$download_tema; | |
1810 | + global $dir_tmp,$codigoMap,$codigoLayer,$locaplic; | |
1804 | 1811 | $mapfile = $locaplic."/temas/".$codigoMap.".map"; |
1805 | 1812 | $mapa = ms_newMapObj($mapfile); |
1806 | 1813 | $layer = $mapa->getlayerbyname($codigoLayer); |
1807 | - $layer->setmetadata("download",$download); | |
1808 | - $layer->setmetadata("arquivodownload",$arquivodownload); | |
1809 | - $layer->setmetadata("arquivokmz",$arquivokmz); | |
1810 | - $layer->setmetadata("permiteogc",$ogc_tema); | |
1811 | - $layer->setmetadata("permitekml",$kml_tema); | |
1812 | - $layer->setmetadata("permitekmz",$kmz_tema); | |
1813 | - $layer->setmetadata("permitedownload",$download_tema); | |
1814 | + $layer->setmetadata("download",$_GET["download"]); | |
1815 | + $layer->setmetadata("arquivodownload",$_GET["arquivodownload"]); | |
1816 | + $layer->setmetadata("arquivokmz",$_GET["arquivokmz"]); | |
1817 | + $layer->setmetadata("permiteogc",$_GET["ogc_tema"]); | |
1818 | + $layer->setmetadata("permitekml",$_GET["kml_tema"]); | |
1819 | + $layer->setmetadata("permitekmz",$_GET["kmz_tema"]); | |
1820 | + $layer->setmetadata("permitedownload",$_GET["download_tema"]); | |
1814 | 1821 | $mapa->save($mapfile); |
1815 | 1822 | removeCabecalho($mapfile); |
1816 | 1823 | return "ok"; |
1817 | 1824 | } |
1818 | 1825 | //essa funcao existe tambem em menutemas.php |
1819 | 1826 | function alteraTemas(){ |
1820 | - global $esquemaadmin,$codigoLayer,$ogc_tema,$kml_tema,$kmz_tema,$locaplic,$download_tema; | |
1827 | + global $esquemaadmin,$codigoLayer,$locaplic; | |
1821 | 1828 | include("conexao.php"); |
1822 | 1829 | $dataCol = array( |
1823 | - "download_tema" => $download_tema, | |
1824 | - "ogc_tema" => $ogc_tema, | |
1825 | - "kml_tema" => $kml_tema, | |
1826 | - "kmz_tema" => $kmz_tema | |
1830 | + "download_tema" => $_GET["download_tema"], | |
1831 | + "ogc_tema" => $_GET["ogc_tema"], | |
1832 | + "kml_tema" => $_GET["kml_tema"], | |
1833 | + "kmz_tema" => $_GET["kmz_tema"] | |
1827 | 1834 | ); |
1828 | 1835 | i3GeoAdminUpdate($dbhw,"i3geoadmin_temas",$dataCol,"WHERE codigo_tema = '$codigoLayer'"); |
1829 | 1836 | $dbhw = null; | ... | ... |
classesphp/mapa_controle.php
... | ... | @@ -194,6 +194,11 @@ include_once ("carrega_ext.php"); |
194 | 194 | if(!function_exists("sobeAnno")){ |
195 | 195 | include_once("funcoes_gerais.php"); |
196 | 196 | } |
197 | + | |
198 | +if(isset($logExec) && $logExec["controle"] == true){ | |
199 | + i3GeoLog("prog: mapa_controle url: ".implode("&",array_merge($_GET,$_POST)),$_SESSION["dir_tmp"]); | |
200 | +} | |
201 | + | |
197 | 202 | if($funcao == "criaMapa"){ |
198 | 203 | session_name("i3GeoPHP"); |
199 | 204 | unset($GLOBALS); | ... | ... |
classesphp/mapa_googlemaps.php
... | ... | @@ -148,7 +148,7 @@ include_once("funcoes_gerais.php"); |
148 | 148 | |
149 | 149 | $logExec = $_SESSION["logExec"]; |
150 | 150 | if(isset($logExec) && $logExec["mapa_"] == true){ |
151 | - i3GeoLog("mapa_googlemaps ".implode("&",array_merge($_GET,$_POST)),$_SESSION["dir_tmp"]); | |
151 | + i3GeoLog("prog: mapa_googlemaps url: ".implode("&",array_merge($_GET,$_POST)),$_SESSION["dir_tmp"]); | |
152 | 152 | } |
153 | 153 | |
154 | 154 | restauraCon($map_fileX,$postgis_mapa); | ... | ... |
classesphp/mapa_inicia.php
... | ... | @@ -113,7 +113,7 @@ function iniciaMapa() |
113 | 113 | validaAcessoTemas($map_file); |
114 | 114 | |
115 | 115 | if($dir_tmp != "" && isset($logExec) && $logExec["init"] == true){ |
116 | - i3GeoLog("iniciaMapa $interface",$dir_tmp); | |
116 | + i3GeoLog("prog: iniciaMapa interface: $interface",$dir_tmp); | |
117 | 117 | } |
118 | 118 | |
119 | 119 | if(!isset($kmlurl)){ | ... | ... |
classesphp/mapa_openlayers.php
... | ... | @@ -168,7 +168,7 @@ include_once("funcoes_gerais.php"); |
168 | 168 | |
169 | 169 | $logExec = $_SESSION["logExec"]; |
170 | 170 | if(isset($logExec) && $logExec["mapa_"] == true){ |
171 | - i3GeoLog("mapa_openlayers ".implode("&",array_merge($_GET,$_POST)),$_SESSION["dir_tmp"]); | |
171 | + i3GeoLog("prog: mapa_openlayers url: ".implode("&",array_merge($_GET,$_POST)),$_SESSION["dir_tmp"]); | |
172 | 172 | } |
173 | 173 | |
174 | 174 | restauraCon($map_fileX,$postgis_mapa); | ... | ... |
ferramentas/aplicarsld/upload.php
... | ... | @@ -14,7 +14,7 @@ require_once (dirname(__FILE__)."/../../ms_configura.php"); |
14 | 14 | $tema = $_GET["tema"]; |
15 | 15 | |
16 | 16 | if(isset($logExec) && $logExec["upload"] == true){ |
17 | - i3GeoLog("aplicarsld tema: $tema filename:" . $_FILES['i3GEOaplicarsld']['name'],$dir_tmp); | |
17 | + i3GeoLog("prog: aplicarsld tema: $tema filename:" . $_FILES['i3GEOaplicarsld']['name'],$dir_tmp); | |
18 | 18 | } |
19 | 19 | ?> |
20 | 20 | <html> | ... | ... |
ferramentas/carregamapa/upload.php
... | ... | @@ -13,7 +13,7 @@ $postgis_mapa = $_SESSION["postgis_mapa"]; |
13 | 13 | require_once (dirname(__FILE__)."/../../ms_configura.php"); |
14 | 14 | |
15 | 15 | if(isset($logExec) && $logExec["upload"] == true){ |
16 | - i3GeoLog("carregamapa filename:" . $_FILES['i3GEOcarregamapafilemap']['name'],$dir_tmp); | |
16 | + i3GeoLog("prog: carregamapa filename:" . $_FILES['i3GEOcarregamapafilemap']['name'],$dir_tmp); | |
17 | 17 | } |
18 | 18 | ?> |
19 | 19 | <html> | ... | ... |
ferramentas/importarwmc/upload.php
... | ... | @@ -24,7 +24,7 @@ $dirmap = dirname($map_file); |
24 | 24 | $arquivo = ""; |
25 | 25 | |
26 | 26 | if(isset($logExec) && $logExec["upload"] == true){ |
27 | - i3GeoLog("importarwmc filename:" . $_FILES['i3GEOimportarwmc']['name'],$dir_tmp); | |
27 | + i3GeoLog("prog: importarwmc filename:" . $_FILES['i3GEOimportarwmc']['name'],$dir_tmp); | |
28 | 28 | } |
29 | 29 | |
30 | 30 | if(isset($_FILES['i3GEOimportarwmc']['name']) && !($_POST["i3GEOimportarwmcurl"]) && strlen(basename($_FILES['i3GEOimportarwmc']['name'])) < 200) | ... | ... |
ferramentas/safe.php
... | ... | @@ -31,6 +31,11 @@ $ext = $_GET["ext"]; |
31 | 31 | $funcao = $_GET["funcao"]; |
32 | 32 | |
33 | 33 | include_once(dirname(__FILE__)."/../classesphp/funcoes_gerais.php"); |
34 | + | |
35 | +if(isset($logExec) && $logExec["ferramentas"] == true){ | |
36 | + i3GeoLog("prog: ferramentas url: ".implode("&",array_merge($_GET,$_POST)),$_SESSION["dir_tmp"]); | |
37 | +} | |
38 | + | |
34 | 39 | if(isset($fingerprint) && !empty($g_sid)) { |
35 | 40 | $f = explode(",",$fingerprint); |
36 | 41 | if($f[0] != md5('I3GEOSEC' . $_SERVER['HTTP_USER_AGENT'] . session_id())){ | ... | ... |
ferramentas/upload/upload.php
... | ... | @@ -35,7 +35,7 @@ if (isset($_FILES['i3GEOuploadshp']['name'])) |
35 | 35 | require_once (dirname(__FILE__)."/../../ms_configura.php"); |
36 | 36 | |
37 | 37 | if(isset($logExec) && $logExec["upload"] == true){ |
38 | - i3GeoLog("upload filename:" . $_FILES['i3GEOuploadshp']['name'],$dir_tmp); | |
38 | + i3GeoLog("prog: upload filename:" . $_FILES['i3GEOuploadshp']['name'],$dir_tmp); | |
39 | 39 | } |
40 | 40 | |
41 | 41 | echo "<p class='paragrafo' >Carregando o arquivo...</p>"; | ... | ... |
ferramentas/uploaddbf/upload.php
... | ... | @@ -35,7 +35,7 @@ if (isset($_FILES['i3GEOuploaddbffile']['name']) && strlen(basename($_FILES['i3G |
35 | 35 | require_once (dirname(__FILE__)."/../../ms_configura.php"); |
36 | 36 | |
37 | 37 | if(isset($logExec) && $logExec["upload"] == true){ |
38 | - i3GeoLog("uploaddbf filename:" . $_FILES['i3GEOuploaddbffile']['name'],$dir_tmp); | |
38 | + i3GeoLog("prog: uploaddbf filename:" . $_FILES['i3GEOuploaddbffile']['name'],$dir_tmp); | |
39 | 39 | } |
40 | 40 | |
41 | 41 | $mapa = ms_newMapObj($map_file); | ... | ... |
ferramentas/uploadgpx/upload.php
... | ... | @@ -32,7 +32,7 @@ if (isset($_FILES['i3GEOuploadgpx']['name']) && strlen(basename($_FILES['i3GEOup |
32 | 32 | require_once (dirname(__FILE__)."/../../ms_configura.php"); |
33 | 33 | |
34 | 34 | if(isset($logExec) && $logExec["upload"] == true){ |
35 | - i3GeoLog("uploadgpx filename:" . $_FILES['i3GEOuploadgpx']['name'],$dir_tmp); | |
35 | + i3GeoLog("prog: uploadgpx filename:" . $_FILES['i3GEOuploadgpx']['name'],$dir_tmp); | |
36 | 36 | } |
37 | 37 | |
38 | 38 | $mapa = ms_newMapObj($map_file); | ... | ... |
ferramentas/uploadkml/upload.php
... | ... | @@ -33,7 +33,7 @@ if (isset($_FILES['i3GEOuploadkml']['name']) && strlen(basename($_FILES['i3GEOup |
33 | 33 | require_once (dirname(__FILE__)."/../../ms_configura.php"); |
34 | 34 | |
35 | 35 | if(isset($logExec) && $logExec["upload"] == true){ |
36 | - i3GeoLog("uploadkml filename:" . $_FILES['i3GEOuploadkml']['name'],$dir_tmp); | |
36 | + i3GeoLog("prog: uploadkml filename:" . $_FILES['i3GEOuploadkml']['name'],$dir_tmp); | |
37 | 37 | } |
38 | 38 | |
39 | 39 | $mapa = ms_newMapObj($map_file); | ... | ... |
ferramentas/uploadsimbolo/upload.php
... | ... | @@ -28,7 +28,7 @@ if (isset($_FILES['i3GEOuploadsimboloarq']['name']) && strlen(basename($_FILES[' |
28 | 28 | require_once (dirname(__FILE__)."/../../ms_configura.php"); |
29 | 29 | |
30 | 30 | if(isset($logExec) && $logExec["upload"] == true){ |
31 | - i3GeoLog("uploadsimbolo filename:" . $_FILES['i3GEOuploadsimboloarq']['name'],$dir_tmp); | |
31 | + i3GeoLog("prog: uploadsimbolo filename:" . $_FILES['i3GEOuploadsimboloarq']['name'],$dir_tmp); | |
32 | 32 | } |
33 | 33 | |
34 | 34 | echo "<p class='paragrafo' >Carregando o arquivo...</p>"; | ... | ... |
ms_configura.php
... | ... | @@ -99,7 +99,9 @@ $logExec = array( |
99 | 99 | "mapa_" => true, //mapa_openlayers e mapa_googlemaps |
100 | 100 | "init" => true, //ms_criamapa mapa_inicia |
101 | 101 | "ogc" => true, //servico ogc |
102 | - "upload" => true //ferramentas de upload | |
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 | |
103 | 105 | ); |
104 | 106 | /* |
105 | 107 | Variable: $i3GeoProjDefault | ... | ... |
ms_criamapa.php
... | ... | @@ -287,7 +287,7 @@ if(!isset($dir_tmp)){ |
287 | 287 | include_once (dirname(__FILE__)."/ms_configura.php"); |
288 | 288 | } |
289 | 289 | if(isset($logExec) && $logExec["init"] == true){ |
290 | - i3GeoLog("ms_criamapa ".implode("&",array_merge($_GET,$_POST)),$_SESSION["dir_tmp"]); | |
290 | + i3GeoLog("prog: ms_criamapa url: ".implode("&",array_merge($_GET,$_POST)),$_SESSION["dir_tmp"]); | |
291 | 291 | } |
292 | 292 | if(!empty($restauramapa)){ |
293 | 293 | $base = restauraMapaAdmin($restauramapa,$dir_tmp); | ... | ... |
ogc.php
... | ... | @@ -131,7 +131,7 @@ include(dirname(__FILE__)."/ms_configura.php"); |
131 | 131 | include(dirname(__FILE__)."/classesphp/funcoes_gerais.php"); |
132 | 132 | |
133 | 133 | if(isset($logExec) && $logExec["ogc"] == true){ |
134 | - i3GeoLog("ogc ".implode("&",$_GET),$_SESSION["dir_tmp"]); | |
134 | + i3GeoLog("prog: ogc url: ".implode("&",array_merge($_GET,$_POST)),$_SESSION["dir_tmp"]); | |
135 | 135 | } |
136 | 136 | // |
137 | 137 | //ajusta o default | ... | ... |