Download as
Browse Code »

Commit 2c1d3a0a8672c21acb6be8291f3ab060753e1240

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

Correção em ferramentas de análise cuja passagem de parâmetros estava com erros

Showing 37 changed files with 543 additions and 232 deletions   Show diff stats
admin/admin.db
View file @2c1d3a0
No preview for this file type
admin1/cadastros/identifica/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   - <form id="form-edicao-{{id_i}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_i}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 + <form id="form-edicao-{{id_i}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_i}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <h4>{{{nome_i}}}</h4>
... ...
admin1/cadastros/perfis/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_perfil}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_perfil}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form"
  2 +<form id="form-edicao-{{id_perfil}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_perfil}}');return false;" class="form-horizontal" role="form"
3 3 method="post" >
4 4 <div class="row">
5 5 <div class="col-md-12">
... ...
admin1/cadastros/servicos/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_ws}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_ws}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 +<form id="form-edicao-{{id_ws}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_ws}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <h4>{{{nome_ws}}}</h4>
... ...
admin1/cadastros/sistemas/funcoes/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_funcao}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_funcao}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 +<form id="form-edicao-{{id_funcao}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_funcao}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <div class="form-group form-group-lg">
... ...
admin1/cadastros/sistemas/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_sistema}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_sistema}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 +<form id="form-edicao-{{id_sistema}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_sistema}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <div class="form-group form-group-lg">
... ...
admin1/cadastros/tags/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_tag}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_tag}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form"
  2 +<form id="form-edicao-{{id_tag}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_tag}}');return false;" class="form-horizontal" role="form"
3 3 method="post" >
4 4 <div class="row">
5 5 <div class="col-md-12">
... ...
admin1/catalogo/atlas/pranchas/temas/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_tema}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_tema}}','{{{codigo_tema}}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 +<form id="form-edicao-{{id_tema}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_tema}}','{{{codigo_tema}}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <div class="form-group form-group-lg">
... ...
admin1/catalogo/atlas/pranchas/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_prancha}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_prancha}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 +<form id="form-edicao-{{id_prancha}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_prancha}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <div class="form-group form-group-lg">
... ...
admin1/catalogo/atlas/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_atlas}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_atlas}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 +<form id="form-edicao-{{id_atlas}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_atlas}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <div class="form-group form-group-lg">
... ...
admin1/catalogo/mapas/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_mapa}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_mapa}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 +<form id="form-edicao-{{id_mapa}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_mapa}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <div class="form-group form-group-lg">
... ...
admin1/catalogo/mapfile/exec.php
  Diff comments   View file @2c1d3a0
... ... @@ -30,10 +30,12 @@ error_reporting ( 0 );
30 30 include_once (dirname ( __FILE__ ) . "/../../../admin/php/login.php");
31 31 $funcoesEdicao = array (
32 32 "LISTA",
  33 + "LISTAUNICO",
33 34 "ADICIONAR",
34 35 "EXCLUIR",
35 36 "LIMPACACHE",
36   - "CLONARMAPFILE"
  37 + "CLONARMAPFILE",
  38 + "ALTERAR"
37 39 );
38 40 if (in_array ( strtoupper ( $funcao ), $funcoesEdicao )) {
39 41 if (verificaOperacaoSessao ( "admin/html/editormapfile" ) === false) {
... ... @@ -43,13 +45,11 @@ if (in_array ( strtoupper ( $funcao ), $funcoesEdicao )) {
43 45 }
44 46 include (dirname ( __FILE__ ) . "/../../../admin/php/conexao.php");
45 47  
46   -// $id_mapa = $_POST["id_mapa"];
47   -// testaSafeNumerico([$id_mapa]);
  48 +$codigo = $_POST ["codigo"];
48 49  
49 50 $funcao = strtoupper ( $funcao );
50 51 switch ($funcao) {
51 52 case "ADICIONAR" :
52   - $codigo = $_POST ["codigo"];
53 53 $codigo = str_replace ( " ", "", removeAcentos ( $codigo ) );
54 54 $codigo = str_replace ( ".", "", $codigo );
55 55 $codigo = strip_tags ( $codigo );
... ... @@ -59,7 +59,10 @@ switch ($funcao) {
59 59 header ( "HTTP/1.1 400 arquivo ja existe" );
60 60 exit ();
61 61 }
62   - $novo = adicionar ( $locaplic, $_POST["titulolegenda"], $_POST ["link_tema"], $codigo, $_POST ["acessopublico"], $_POST ["metaestat"], $_POST ["titulo"], $_POST ["desc_tema"], $_POST ["tituloEN"], $_POST ["tituloES"], true, $dbhw );
  62 + if(empty($_POST["titulolegenda"])){
  63 + $_POST["titulolegenda"] = $_POST ["nome_tema"];
  64 + }
  65 + $novo = adicionar ( $locaplic, $_POST["titulolegenda"], $_POST ["link_tema"], $codigo, $_POST ["acessopublico"], $_POST ["metaestat"], $_POST ["nome_tema"], $_POST ["desc_tema"], $_POST ["en"], $_POST ["es"], true, $dbhw );
63 66 if ($novo === false) {
64 67 header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
65 68 exit ();
... ... @@ -69,6 +72,30 @@ switch ($funcao) {
69 72 ) );
70 73 exit ();
71 74 break;
  75 + case "ALTERAR" :
  76 + $codigo = str_replace ( " ", "", removeAcentos ( $codigo ) );
  77 + $codigo = str_replace ( ".", "", $codigo );
  78 + $codigo = strip_tags ( $codigo );
  79 + $codigo = htmlspecialchars ( $codigo, ENT_QUOTES );
  80 + $arq = $locaplic . "/temas/" . $codigo . ".map";
  81 + if ($codigo == "" || !file_exists ( $arq )) {
  82 + header ( "HTTP/1.1 400 arquivo nao existe" );
  83 + exit ();
  84 + }
  85 + if(empty($_POST["titulolegenda"])){
  86 + $_POST["titulolegenda"] = $_POST ["nome_tema"];
  87 + }
  88 + //quando e feita a listagem unica, o mapfile ja foi registrado no banco se nao tinha sido antes
  89 + $novo = alterar ( $locaplic, $_POST["id_tema"], $_POST["titulolegenda"], $_POST ["link_tema"], $codigo, $_POST ["acessopublico"], $_POST ["metaestat"], $_POST ["nome_tema"], $_POST ["desc_tema"], $_POST ["en"], $_POST ["es"], true, $dbhw );
  90 + if ($novo === false) {
  91 + header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
  92 + exit ();
  93 + }
  94 + retornaJSON ( array (
  95 + "codigo" => $codigo
  96 + ) );
  97 + exit ();
  98 + break;
72 99 case "EXCLUIR" :
73 100 $codigo = $_POST ["codigo"];
74 101 $codigo = str_replace ( " ", "", removeAcentos ( $codigo ) );
... ... @@ -98,6 +125,71 @@ switch ($funcao) {
98 125 retornaJSON ( $retorna );
99 126 exit ();
100 127 break;
  128 + case "LISTAUNICO" :
  129 + //pega o nome registrado no mapfile
  130 + if(!file_exists($locaplic."/temas/".$codigo.".map")){
  131 + header ( "HTTP/1.1 500 erro mapfile nao existe" );
  132 + exit ();
  133 + }
  134 + $mapa = ms_newMapObj ( $locaplic."/temas/".$codigo.".map" );
  135 + $layer = $mapa->getlayerbyname($codigo);
  136 + if($layer == ""){
  137 + header ( "HTTP/1.1 500 erro nao existe LAYER com o nome $codigo" );
  138 + exit ();
  139 + }
  140 + $titulolegenda = $layer->getmetadata("TEMA");
  141 + $metaestat = $layer->getmetadata("METAESTAT");
  142 + $dados = pegaDados ( "SELECT * from ".$esquemaadmin."i3geoadmin_temas WHERE codigo_tema = '$codigo' ", $dbh, false );
  143 + //se nao existir no sistema de admin, faz o registro
  144 + if(count($dados) == 0){
  145 + $dataCol = array (
  146 + "kml_tema" => "SIM",
  147 + "kmz_tema" => "SIM",
  148 + "ogc_tema" => "SIM",
  149 + "download_tema" => "SIM",
  150 + "desc_tema" => "",
  151 + "tipoa_tema" => "",
  152 + "tags_tema" => "",
  153 + "nome_tema" => $titulolegenda,
  154 + "codigo_tema" => $codigo,
  155 + "it" => "",
  156 + "es" => "",
  157 + "en" => ""
  158 + );
  159 + $id_tema = i3GeoAdminInsertUnico($dbhw,"i3geoadmin_temas",$dataCol,"link_tema","id_tema");
  160 + $dados = pegaDados ( "SELECT * from ".$esquemaadmin."i3geoadmin_temas WHERE codigo_tema = '$codigo' AND id_tema = $id_tema ", $dbh, false );
  161 + if(count($dados) == 0){
  162 + $dbhw = null;
  163 + $dbh = null;
  164 + header ( "HTTP/1.1 500 erro ao registrar no banco de dados" );
  165 + exit ();
  166 + }
  167 + }
  168 + if ($dados === false) {
  169 + $dbhw = null;
  170 + $dbh = null;
  171 + header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
  172 + exit ();
  173 + }
  174 + $acessopublico = "";
  175 + if(strtolower($dados[0]["ogc_tema"]) !== "nao" || strtolower($dados[0]["download_tema"]) !== "nao"){
  176 + $acessopublico = "checked";
  177 + }
  178 + if($metaestat == ""){
  179 + $dados[0]["metaestatnao"] = "selected";
  180 + } else {
  181 + $dados[0]["metaestatsim"] = "selected";
  182 + }
  183 + $dados[0]["acessopublico"] = $acessopublico;
  184 + $dados[0]["metaestat"] = $metaestat;
  185 + //a pagina e utf e o texto pode ser iso
  186 + if(mb_detect_encoding($titulolegenda,'UTF-8, ISO-8859-1') == "ISO-8859-1"){
  187 + $titulolegenda = utf8_encode($titulolegenda);
  188 + }
  189 + $dados[0]["titulolegenda"] = $titulolegenda;
  190 + $dados[0]["codigo"] = $codigo;
  191 + retornaJSON ( array("dados"=>$dados[0]) );
  192 + break;
101 193 case "LIMPACACHE" :
102 194 $mapfile = $locaplic . "/temas/" . $_POST ["codigo"] . ".map";
103 195 if (! file_exists ( $mapfile )) {
... ... @@ -182,10 +274,7 @@ switch ($funcao) {
182 274 include(dirname(__FILE__)."/../../php/removeCabecalhoMapfile.php");
183 275 removeCabecalhoMapfile($arqnovo);
184 276  
185   - if ($novo === false) {
186   - header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
187   - exit ();
188   - } elseif (count ( $dados ) > 0) {
  277 + if (count ( $dados ) > 0) {
189 278 //registra no banco de dados caso nao tenha ocorrido erro ao criar o mapfile
190 279 i3GeoAdminInsert ( $dbhw, "i3geoadmin_temas", $dataCol );
191 280 }
... ... @@ -234,13 +323,79 @@ function excluir($codigo, $dbhw) {
234 323 unlink ( "$locaplic/temas/" . $codigo . ".map" );
235 324 return true;
236 325 }
237   -function adicionar($locaplic, $titulolegenda, $link_tema, $codigo, $acessopublico, $metaestat, $titulo, $desc_tema, $tituloEN, $tituloES, $registraBanco, $dbhw) {
  326 +function alterar($locaplic, $id_tema, $titulolegenda, $link_tema, $codigo, $acessopublico, $metaestat, $titulo, $desc_tema, $tituloEN, $tituloES, $registraBanco, $dbhw) {
238 327 global $convUTF, $esquemaadmin;
239 328 $arq = $locaplic . "/temas/" . $codigo . ".map";
  329 + if(!file_exists($locaplic . "/temas/" . $codigo . ".map")){
  330 + return false;
  331 + }
  332 + $mapa = ms_newMapObj($arq);
  333 + $layer = @$mapa->getlayerbyname($codigo);
  334 + if($layer == ""){
  335 + return false;
  336 + }
  337 + if(mb_detect_encoding($titulolegenda,'UTF-8, ISO-8859-1') == "UTF-8"){
  338 + $titulolegenda = utf8_decode($titulolegenda);
  339 + }
  340 + if ($convUTF != true) {
  341 + $titulo = utf8_decode ( $titulo );
  342 + $desc_tema = utf8_decode ( $desc_tema );
  343 + }
  344 +
240 345 if (empty ( $acessopublico ) || $acessopublico == "on") {
241 346 $acessopublico = "SIM";
242 347 } else {
  348 + $acessopublico = "NAO";
  349 + }
  350 + $layer->setmetadata("permiteogc",$acessopublico);
  351 + $layer->setmetadata("permitedownload",$acessopublico);
  352 + $layer->setmetadata("permitekml",$acessopublico);
  353 + $layer->setmetadata("permitekmz",$acessopublico);
  354 + $layer->setmetadata("TEMA",$titulolegenda);
  355 + if (! empty ( $metaestat ) && $metaestat == "SIM") {
  356 + $layer->setmetadata("METAESTAT","SIM");
  357 + $tipoa_tema = "META";
  358 + } else {
  359 + $layer->setmetadata("METAESTAT","");
  360 + $tipoa_tema = "";
  361 + }
  362 +
  363 +
  364 + try {
  365 + $dataCol = array (
  366 + "link_tema" => $link_tema,
  367 + "kml_tema" => $acessopublico,
  368 + "kmz_tema" => $acessopublico,
  369 + "ogc_tema" => $acessopublico,
  370 + "download_tema" => $acessopublico,
  371 + "desc_tema" => $desc_tema,
  372 + "tipoa_tema" => $tipoa_tema,
  373 + "tags_tema" => '',
  374 + "nome_tema" => $titulo,
  375 + "codigo_tema" => $codigo,
  376 + "it" => "",
  377 + "es" => $tituloES,
  378 + "en" => $tituloEN
  379 + );
  380 + $resultado = i3GeoAdminUpdate ( $dbhw, "i3geoadmin_temas", $dataCol, "WHERE id_tema = $id_tema" );
  381 + if ($resultado === false) {
  382 + return false;
  383 + }
  384 + $mapa->save($arq);
  385 + include(dirname(__FILE__)."/../../php/removeCabecalhoMapfile.php");
  386 + removeCabecalhoMapfile($arq);
  387 + return true;
  388 + } catch ( PDOException $e ) {
  389 + return false;
  390 + }
  391 +}
  392 +function adicionar($locaplic, $titulolegenda, $link_tema, $codigo, $acessopublico, $metaestat, $titulo, $desc_tema, $tituloEN, $tituloES, $registraBanco, $dbhw) {
  393 + global $convUTF, $esquemaadmin;
  394 + $arq = $locaplic . "/temas/" . $codigo . ".map";
  395 + if (empty ( $acessopublico ) || $acessopublico == "on") {
243 396 $acessopublico = "SIM";
  397 + } else {
  398 + $acessopublico = "NAO";
244 399 }
245 400 if(mb_detect_encoding($titulolegenda,'UTF-8, ISO-8859-1') == "UTF-8"){
246 401 $titulolegenda = utf8_decode($titulolegenda);
... ...
admin1/catalogo/mapfile/index.js
  Diff comments   View file @2c1d3a0
... ... @@ -26,6 +26,8 @@ i3GEOadmin.mapfile = {
26 26 //variavel global indicando o elemento que recebera a lista de menus
27 27 ondeLista: "",
28 28 favoritosArray: [],
  29 + formAdiciona: "",
  30 + parametrosSalvar: "",
29 31 init: function(onde,palavra){
30 32 i3GEOadmin.mapfile.ondeLista = onde;
31 33 i3GEOadmin.mapfile.lista(palavra);
... ... @@ -81,6 +83,28 @@ Obt&amp;eacute;m a lista
81 83 i3GEOadmin.core.filtra(i3GEOadmin.mapfile.pegaFiltro());
82 84 }
83 85  
  86 + //monta um template para o modal de inclusao
  87 + if(i3GEOadmin.mapfile.formAdiciona == ""){
  88 + html = Mustache.to_html(
  89 + $("#templateManterTema").html(),
  90 + $.extend(
  91 + {},
  92 + i3GEOadmin.mapfile.dicionario,
  93 + {
  94 + "codigo": "",
  95 + "escondido": "hidden",
  96 + "excluir": i3GEOadmin.mapfile.dicionario.cancelar,
  97 + "onExcluir": "i3GEOadmin.core.fechaModalGeral",//funcao
  98 + "onSalvar": "i3GEOadmin.mapfile.adiciona",
  99 + "metaestatnao": "selected",
  100 + "acessopublico": "checked",
  101 + "criaMapfileTxt": i3GEOadmin.mapfile.dicionario.criaMapfile,
  102 + "criaMapfileDescTxt": i3GEOadmin.mapfile.dicionario.criaMapfileDesc
  103 + }
  104 + )
  105 + );
  106 + i3GEOadmin.mapfile.formAdiciona = html;
  107 + }
84 108 $.material.init();
85 109 }
86 110 )
... ... @@ -89,24 +113,83 @@ Obt&amp;eacute;m a lista
89 113 i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
90 114 });
91 115 },
92   - adicionaDialogo: function(){
93   - var html = Mustache.to_html(
94   - "{{#data}}" + $("#templateManterTema").html() + "{{/data}}",
95   - $.extend(
96   - {},
97   - i3GEOadmin.mapfile.dicionario,
98   - {
99   - "data": "modal",
100   - "metaestatnao": "selected",
101   - "acessopublico": "checked"
102   - }
103   - )
  116 + editarDialogo: function(id){
  117 + i3GEOadmin.core.fechaModalGeral();
  118 + i3GEOadmin.core.modalAguarde(true);
  119 + //deve-se usar o codigo e nao o id_tema
  120 + $.post(
  121 + "exec.php?funcao=listaunico",
  122 + "codigo=" + id
  123 + )
  124 + .done(
  125 + function(data, status){
  126 + var json = jQuery.parseJSON(data);
  127 +
  128 + var html = Mustache.to_html(
  129 + "{{#data}}" + $("#templateManterTema").html() + "{{/data}}",
  130 + $.extend(
  131 + {},
  132 + i3GEOadmin.mapfile.dicionario,
  133 + {
  134 + "data": json["dados"],
  135 + "onExcluir": "i3GEOadmin.mapfile.excluirDialogo",//funcao
  136 + "onSalvar": "i3GEOadmin.mapfile.salvarAlteracaoDialogo",
  137 + "criaMapfileTxt": i3GEOadmin.mapfile.dicionario.editaMapfile,
  138 + "criaMapfileDescTxt": i3GEOadmin.mapfile.dicionario.editaMapfileDesc
  139 + }
  140 + )
  141 + );
  142 + i3GEOadmin.core.abreModalGeral(html);
  143 + }
  144 + )
  145 + .fail(
  146 + function(data){
  147 + i3GEOadmin.core.modalAguarde(false);
  148 + i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
  149 + }
104 150 );
105   - i3GEOadmin.core.abreModalGeral(html);
  151 + },
  152 + salvarAlteracaoDialogo: function(codigo,id){
  153 + i3GEOadmin.mapfile.parametrosSalvar = $("#form-edicao-" + codigo).serialize();
  154 + var hash = {
  155 + "mensagem": i3GEOadmin.mapfile.dicionario.confirma,
  156 + "onBotao1": "i3GEOadmin.mapfile.salva('"+id+"')",
  157 + "botao1": i3GEOadmin.mapfile.dicionario.sim,
  158 + "onBotao2": "i3GEOadmin.mapfile.parametrosSalvar = '';i3GEOadmin.core.fechaModalConfirma();",
  159 + "botao2": i3GEOadmin.mapfile.dicionario.nao
  160 + };
  161 + i3GEOadmin.core.abreModalConfirma(hash);
  162 + },
  163 + salva: function(id){
  164 + var parametros = i3GEOadmin.mapfile.parametrosSalvar;
  165 + i3GEOadmin.core.fechaModalGeral();
  166 + i3GEOadmin.core.modalAguarde(true);
  167 + $.post(
  168 + "exec.php?funcao=alterar",
  169 + "id_tema=" + id + "&"+parametros
  170 + )
  171 + .done(
  172 + function(data, status){
  173 + i3GEOadmin.mapfile.parametrosSalvar = '';
  174 + i3GEOadmin.core.modalAguarde(false);
  175 + i3GEOadmin.core.iconeAguarde(i3GEOadmin.mapfile.ondeLista);
  176 + i3GEOadmin.mapfile.lista("","");
  177 + }
  178 + )
  179 + .fail(
  180 + function(data){
  181 + i3GEOadmin.mapfile.parametrosSalvar = '';
  182 + i3GEOadmin.core.modalAguarde(false);
  183 + i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
  184 + }
  185 + );
  186 + },
  187 + adicionaDialogo: function(){
  188 + i3GEOadmin.core.abreModalGeral(i3GEOadmin.mapfile.formAdiciona);
106 189 },
107 190 // os parametros sao obtidos do formulario aberto do modal
108 191 adiciona: function(){
109   - var parametros = $("#form-modal-adiciona").serialize();
  192 + var parametros = $("#modalGeral form").serialize();
110 193 i3GEOadmin.core.fechaModalGeral();
111 194 i3GEOadmin.core.modalAguarde(true);
112 195 $.post(
... ... @@ -119,7 +202,7 @@ Obt&amp;eacute;m a lista
119 202 i3GEOadmin.core.modalAguarde(false);
120 203 i3GEOadmin.core.iconeAguarde(i3GEOadmin.mapfile.ondeLista);
121 204 i3GEOadmin.mapfile.favoritosArray.push(json.codigo);
122   - i3GEOadmin.mapfile.lista();
  205 + i3GEOadmin.mapfile.lista("","");
123 206 }
124 207 )
125 208 .fail(
... ... @@ -160,6 +243,18 @@ Obt&amp;eacute;m a lista
160 243 }
161 244 );
162 245 },
  246 + salvarDialogo: function(id){
  247 + i3GEOadmin.mapfile.parametrosSalvar = $("#form-edicao-" + id).serialize();
  248 + console.info(i3GEOadmin.mapfile.parametrosSalvar);
  249 + var hash = {
  250 + "mensagem": i3GEOadmin.mapfile.dicionario.confirma,
  251 + "onBotao1": "i3GEOadmin.mapfile.salvar('"+id+"')",
  252 + "botao1": i3GEOadmin.mapfile.dicionario.sim,
  253 + "onBotao2": "i3GEOadmin.mapfile.parametrosSalvar = '';i3GEOadmin.core.fechaModalConfirma();",
  254 + "botao2": i3GEOadmin.mapfile.dicionario.nao
  255 + };
  256 + i3GEOadmin.core.abreModalConfirma(hash);
  257 + },
163 258 retornaFavoritosArray: function(){
164 259 var temp = i3GEO.util.pegaCookie("I3GEOfavoritosEditorMapfile");
165 260 if(temp){
... ... @@ -185,12 +280,9 @@ Obt&amp;eacute;m a lista
185 280 n = i3GEOadmin.mapfile.favoritosArray.length;
186 281 for (i=0; i<n; i++){
187 282 codigo = i3GEOadmin.mapfile.favoritosArray[i];
188   - h = $("#form-" + codigo + " .panel-heading").html();
  283 + h = $("#form-" + codigo).html();
189 284 if(h != undefined){
190   - mapfile = '<div class="panel panel-default">' + h;
191   - conteudo.push(mapfile);
192   - mapfile = '<div class="panel-body">' + $("#form-" + codigo + " .panel-body").html() + "</div></div>";
193   - conteudo.push(mapfile);
  285 + conteudo.push(h);
194 286 }
195 287 }
196 288 $("#body-favoritos").html(conteudo.join("\n"));
... ...
admin1/catalogo/mapfile/index.php
  Diff comments   View file @2c1d3a0
... ... @@ -87,160 +87,12 @@ include &quot;../../head.php&quot;;
87 87 </div>
88 88 </div>
89 89 </div>
90   -<script id="templateFiltro" type="x-tmpl-mustache">
91   -<option value="form-{{codigo}}">{{{codigo}}} - {{{nome}}}</option>
92   -</script>
93   -<script id="templateLista" type="x-tmpl-mustache">
94   -<div class="panel panel-default" id="form-{{codigo}}">
95   - <div class="panel-heading icon" role="tab">
96   - <h4 class="panel-title {{escondido}}">
97   - <a title="{{{favorito}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.registraFavoritos('{{codigo}}')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
98   - <i class="material-icons">star_border</i>
99   - </a>
100   - <a class="collapsed in" role="button" data-toggle="collapse" href="#body-form-{{codigo}}" aria-expanded="false" aria-controls="#body-form-{{codigo}}">
101   - &nbsp;
102   - <strong>{{{nome}}}</strong> <small> {{{arquivoTxt}}}:</small> {{{codigo}}}
103   - </a>
104   - </h4>
105   - </div>
106   - <div class="panel-body panel-collapse collapse" id="body-form-{{codigo}}">
107   - <div>
108   - <a onclick="i3GEOadmin.mapfile.dadosGeraisDialogo();" href="javascript:void(0)" class="btn btn-primary" style="color:#008579;" role="button">{{{tituloTxt}}}</a>
109   - </div>
110   - <div>
111   - <a title="{{{excluir}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.excluirDialogo('{{codigo}}')" class="btn btn-danger btn-fab btn-fab-mini" role="button">
112   - <i class="material-icons">delete_forever</i>
113   - </a>
114   - &nbsp;
115   - <a title="{{{filtraLista}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.init($('#corpo'),'{{codigo}}');" class="btn btn-primary btn-fab btn-fab-mini" role="button">
116   - <i class="material-icons">filter_list</i>
117   - </a>
118   - &nbsp;
119   -
120   - <a title="{{{criaCopia}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.clonaDialogo('{{codigo}}')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
121   - <i class="material-icons">content_copy</i>
122   - </a>
123   - &nbsp;
124   - <a title="{{{limpaCache}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.limpaCacheDialogo('{{codigo}}')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
125   - <i class="material-icons">layers_clear</i>
126   - </a>
127   - &nbsp;
128   - <a title="{{{editorTxt}}}" href="javascript:void(0)" onclick="window.open('../../../admin/php/editortexto.php?mapfile={{codigo}}')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
129   - <i class="material-icons">mode_edit</i>
130   - </a>
131   - &nbsp;
132   - <a title="{{{testaLayer}}}" href="javascript:void(0)" onclick="window.open('../../../testamapfile.php?map={{codigo}}.map')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
133   - <i class="material-icons">report</i>
134   - </a>
135   - &nbsp;
136   - <a title="{{{editarI3geo}}}" href="javascript:void(0)" onclick="window.open('../../../interface/black_editor.php?&temaEdicao={{codigo}}')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
137   - <i class="material-icons">settings</i>
138   - </a>
139   - &nbsp;
140   - <a title="{{{testarI3geo}}}" href="javascript:void(0)" onclick="window.open('../../../ms_criamapa.php?temasa={{codigo}}&layers={{codigo}}')" class="btn btn-primary btn-fab btn-fab-mini" role="button">
141   - <i class="material-icons">sending</i>
142   - </a>
143   - </div>
144   - </div>
145   -</div>
146   -</script>
147   -<script id="templateManterTema" type="x-tmpl-mustache">
148   - <h4>{{{criaMapfile}}}</h4>
149   - <blockquote>{{{criaMapfileDesc}}}</blockquote>
150   - <form id="form-modal-adiciona" style="" action="#" onsubmit="i3GEOadmin.mapfile.adiciona();return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
151   - <div class="row">
152   - <div class="col-md-12">
153   - <div class="form-group form-group-lg">
154   - <label class="col-md-6 control-label" for="codigo" >{{{nomeMap}}}</label>
155   - <div class="col-md-6">
156   - <input title="{{{nomeMap}}}" type="text" value="{{{codigo}}}" class="form-control" name="codigo" required>
157   - </div>
158   - </div>
159   - <div class="form-group form-group-lg">
160   - <label class="col-md-6 control-label" for="titulolegenda" >{{{tituloLegenda}}}</label>
161   - <div class="col-md-6">
162   - <input title="{{{tituloLegenda}}}" type="text" value="{{{titulolegenda}}}" class="form-control" name="titulolegenda" >
163   - </div>
164   - </div>
165   - <div class="form-group form-group-lg">
166   - <label class="col-md-6 control-label" for="titulo" >{{{tituloTema}}}</label>
167   - <div class="col-md-6">
168   - <input placeholder="{{{tituloPt}}}" title="{{{tituloTema}}}" type="text" value="{{{titulo}}}" class="form-control" name="titulo" >
169   - </div>
170   - </div>
171   - <div class="form-group form-group-lg">
172   - <label class="col-md-6 control-label" for="titulo" ></label>
173   - <div class="col-md-6">
174   - <input placeholder="{{{tituloEs}}}" title="{{{tituloEs}}}" type="text" value="{{{tituloES}}}" class="form-control" name="tituloES" >
175   - </div>
176   - </div>
177   - <div class="form-group form-group-lg">
178   - <label class="col-md-6 control-label" for="titulo" ></label>
179   - <div class="col-md-6">
180   - <input placeholder="{{{tituloEn}}}" title="{{{tituloEn}}}" type="text" value="{{{tituloEN}}}" class="form-control" name="tituloEN" >
181   - </div>
182   - </div>
183   - <div class="form-group form-group-lg">
184   - <label class="col-md-6 control-label" for="desc_tema" >{{{descricaoTxt}}}</label>
185   - <div class="col-md-6">
186   - <input title="{{{descricaoTxt}}}" type="text" value="{{{desc_tema}}}" class="form-control" name="desc_tema" >
187   - </div>
188   - </div>
189   - <div class="form-group form-group-lg">
190   - <label class="col-md-6 control-label" for="link_tema" >{{{fonteTema}}}</label>
191   - <div class="col-md-6">
192   - <input title="{{{fonteTema}}}" type="text" value="{{{link_tema}}}" class="form-control" name="link_tema" >
193   - </div>
194   - </div>
195   - <div class="form-group form-group-lg">
196   - <label class="col-md-6 control-label" for="metaestat">{{{metaestat}}}</label>
197   - <div class="col-md-6">
198   - <select title="{{{metaestat}}}" class="form-control" name="metaestat">
199   - <option value="SIM" {{{metaestatsim}}} >{{{sim}}}</option>
200   - <option value="NAO" {{{metaestatnao}}} >{{{nao}}}</option>
201   - </select>
202   - </div>
203   - </div>
204   - <div class="form-group form-group-lg">
205   - <div class="checkbox col-md-12">
206   - <label>
207   - <input title="{{{permiteOgc}}}" type="checkbox" {{acessopublico}} name="acessopublico" /> {{{permiteOgc}}}
208   - </label>
209   - </div>
210   - </div>
211   - </div>
212   - <div class="pull-right">
213   - <button type="submit" class="btn btn-primary" role="button" style="color:#008579;">{{salva}}</button>
214   - </div>
215   - </div>
216   - </form>
217   -</script>
218   -<script id="templateClonarTema" type="x-tmpl-mustache">
219   - <h4>{{{clonaMapfile}}}</h4>
220   - <form id="form-modal-adiciona" style="" action="#" onsubmit="i3GEOadmin.mapfile.clona();return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
221   - <div class="row">
222   - <div class="col-md-12">
223   - <div class="form-group form-group-lg">
224   - <label class="col-md-6 control-label" for="novocodigo" >{{{nomeMap}}}</label>
225   - <div class="col-md-6">
226   - <input title="{{{nomeArquivo}}}" type="text" value="" class="form-control" name="novocodigo" required>
227   - </div>
228   - </div>
229   - <div class="form-group form-group-lg">
230   - <label class="col-md-6 control-label" for="titulo" >{{{tituloTema}}}</label>
231   - <div class="col-md-6">
232   - <input title="{{{tituloTema}}}" type="text" value="" class="form-control" name="titulo" >
233   - </div>
234   - </div>
235   - </div>
236   - <input type="hidden" value="{{codigoAtual}}" class="form-control" name="codigo" >
237   - <div class="pull-right">
238   - <button type="submit" class="btn btn-primary" role="button" style="color:#008579;">{{criaCopia}}</button>
239   - </div>
240   - </div>
241   - </form>
242   -</script>
243   -
  90 +<?php
  91 +include("templates/templateManterTema.php");
  92 +include("templates/templateLista.php");
  93 +include("templates/templateFiltro.php");
  94 +include("templates/templateClonarTema.php");
  95 +?>
244 96 <script type="text/javascript" src="index.js"></script>
245 97 <script type="text/javascript" src="../../dicionario/editormapfile.js"></script>
246 98 <script>
... ...
admin1/catalogo/mapfile/templates/templateClonarTema.php 0 → 100644
  Diff comments   View file @2c1d3a0
... ... @@ -0,0 +1,25 @@
  1 +<script id="templateClonarTema" type="x-tmpl-mustache">
  2 + <h4>{{{clonaMapfile}}}</h4>
  3 + <form id="form-modal-adiciona" style="" action="#" onsubmit="i3GEOadmin.mapfile.clona();return false;" class="form-horizontal" role="form" method="post" >
  4 + <div class="row">
  5 + <div class="col-md-12">
  6 + <div class="form-group form-group-lg">
  7 + <label class="col-md-6 control-label" for="novocodigo" >{{{nomeMap}}}</label>
  8 + <div class="col-md-6">
  9 + <input title="{{{nomeArquivo}}}" type="text" value="" class="form-control" name="novocodigo" required>
  10 + </div>
  11 + </div>
  12 + <div class="form-group form-group-lg">
  13 + <label class="col-md-6 control-label" for="titulo" >{{{tituloTema}}}</label>
  14 + <div class="col-md-6">
  15 + <input title="{{{tituloTema}}}" type="text" value="" class="form-control" name="titulo" >
  16 + </div>
  17 + </div>
  18 + </div>
  19 + <input type="hidden" value="{{codigoAtual}}" class="form-control" name="codigo" >
  20 + <div class="pull-right">
  21 + <button type="submit" class="btn btn-primary" role="button" style="color:#008579;">{{criaCopia}}</button>
  22 + </div>
  23 + </div>
  24 + </form>
  25 +</script>
0 26 \ No newline at end of file
... ...
admin1/catalogo/mapfile/templates/templateFiltro.php 0 → 100644
  Diff comments   View file @2c1d3a0
... ... @@ -0,0 +1,3 @@
  1 +<script id="templateFiltro" type="x-tmpl-mustache">
  2 +<option value="form-{{codigo}}">{{{codigo}}} - {{{nome}}}</option>
  3 +</script>
0 4 \ No newline at end of file
... ...
admin1/catalogo/mapfile/templates/templateLista.php 0 → 100644
  Diff comments   View file @2c1d3a0
... ... @@ -0,0 +1,36 @@
  1 +<script id="templateLista" type="x-tmpl-mustache">
  2 +<div class="list-group-item" id="form-{{codigo}}">
  3 + <div class="row-content">
  4 + <h4 class="list-group-item-heading">
  5 + <a href="javascript:void(0)" onclick="i3GEOadmin.mapfile.maisOpcoesDialogo('{{codigo}}');" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
  6 + <i class="material-icons md-18">more_horiz</i>
  7 + </a>
  8 + <span class="pull-right">&nbsp;&nbsp;</span>
  9 +<!-- utiliza o codigo aqui pois o mapfile pode nao estar no banco -->
  10 + <a title="{{{tituloTxt}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.editarDialogo('{{codigo}}');" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
  11 + <i class="material-icons md-18">mode_edit</i>
  12 + </a>
  13 + <span class="pull-right">&nbsp;&nbsp;</span>
  14 +
  15 + <a title="{{{criaCopia}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.clonaDialogo('{{codigo}}')" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
  16 + <i class="material-icons md-18">content_copy</i>
  17 + </a>
  18 + <span class="pull-right">&nbsp;&nbsp;</span>
  19 +
  20 + <a title="{{{excluir}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.excluirDialogo('{{codigo}}')" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
  21 + <i class="material-icons md-18">delete_forever</i>
  22 + </a>
  23 + <span class="pull-right">&nbsp;&nbsp;</span>
  24 +
  25 + <a title="{{{favorito}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.registraFavoritos('{{codigo}}')" class="pull-right btn btn-primary btn-fab btn-fab-mini" role="button">
  26 + <i class="material-icons md-18">star_border</i>
  27 + </a>
  28 + <span class="pull-right">&nbsp;&nbsp;</span>
  29 +
  30 + &nbsp;<strong>{{{nome}}}</strong> <small> {{{arquivoTxt}}}:</small> {{{codigo}}}
  31 + </h4>
  32 + </div>
  33 + <div class="list-group-separator"></div>
  34 +</div>
  35 +
  36 +</script>
0 37 \ No newline at end of file
... ...
admin1/catalogo/mapfile/templates/templateMaisOpcoes.php 0 → 100644
  Diff comments   View file @2c1d3a0
... ... @@ -0,0 +1,26 @@
  1 +<script id="templateMaisOpcoes" type="x-tmpl-mustache">
  2 +
  3 + <a title="{{{limpaCache}}}" href="javascript:void(0)" onclick="i3GEOadmin.mapfile.limpaCacheDialogo('{{codigo}}')" class="btn btn-danger btn-fab btn-fab-mini" role="button">
  4 + <i class="material-icons">layers_clear</i>
  5 + </a>
  6 + &nbsp;
  7 +
  8 + <a title="{{{editorTxt}}}" href="javascript:void(0)" onclick="window.open('../../../admin/php/editortexto.php?mapfile={{codigo}}')" class="btn btn-danger btn-fab btn-fab-mini" role="button">
  9 + <i class="material-icons">mode_edit</i>
  10 + </a>
  11 + &nbsp;
  12 +
  13 + <a title="{{{testaLayer}}}" href="javascript:void(0)" onclick="window.open('../../../testamapfile.php?map={{codigo}}.map')" class="btn btn-danger btn-fab btn-fab-mini" role="button">
  14 + <i class="material-icons">report</i>
  15 + </a>
  16 + &nbsp;
  17 +
  18 + <a title="{{{editarI3geo}}}" href="javascript:void(0)" onclick="window.open('../../../interface/black_editor.php?&temaEdicao={{codigo}}')" class="btn btn-danger btn-fab btn-fab-mini" role="button">
  19 + <i class="material-icons">settings</i>
  20 + </a>
  21 + &nbsp;
  22 + <a title="{{{testarI3geo}}}" href="javascript:void(0)" onclick="window.open('../../../ms_criamapa.php?temasa={{codigo}}&layers={{codigo}}')" class="btn btn-danger btn-fab btn-fab-mini" role="button">
  23 + <i class="material-icons">sending</i>
  24 + </a>
  25 + </div>
  26 +</script>
0 27 \ No newline at end of file
... ...
admin1/catalogo/mapfile/templates/templateManterTema.php 0 → 100644
  Diff comments   View file @2c1d3a0
... ... @@ -0,0 +1,72 @@
  1 +<script id="templateManterTema" type="x-tmpl-mustache">
  2 + <!-- o titulo e a descricao sao diferentes para a edicao e para a criacao, por isso utiliza-se essas chaves controladas no javascript-->
  3 + <h4>{{{criaMapfileTxt}}}</h4>
  4 + <blockquote>{{{criaMapfileDescTxt}}}</blockquote>
  5 + <form id="form-edicao-{{codigo}}" style="" action="#" onsubmit="{{onSalvar}}('{{codigo}}','{{id_tema}}');" class="form-horizontal" role="form" method="post" >
  6 + <div class="row">
  7 + <div class="col-md-12">
  8 + <div class="form-group form-group-lg">
  9 + <label class="col-md-6 control-label" for="codigo" >{{{nomeMap}}}</label>
  10 + <div class="col-md-6">
  11 + <input title="{{{nomeMap}}}" type="text" value="{{{codigo}}}" class="form-control" name="codigo" required>
  12 + </div>
  13 + </div>
  14 + <div class="form-group form-group-lg">
  15 + <label class="col-md-6 control-label" for="titulolegenda" >{{{tituloLegenda}}}</label>
  16 + <div class="col-md-6">
  17 + <input title="{{{tituloLegenda}}}" type="text" value="{{{titulolegenda}}}" class="form-control" name="titulolegenda" >
  18 + </div>
  19 + </div>
  20 + <div class="form-group form-group-lg">
  21 + <label class="col-md-6 control-label" for="nome_tema" >{{{tituloTema}}}</label>
  22 + <div class="col-md-6">
  23 + <input placeholder="{{{tituloPt}}}" title="{{{tituloTema}}}" type="text" value="{{{nome_tema}}}" class="form-control" name="nome_tema" >
  24 + </div>
  25 + </div>
  26 + <div class="form-group form-group-lg">
  27 + <label class="col-md-6 control-label" for="es" >{{{tituloEs}}}</label>
  28 + <div class="col-md-6">
  29 + <input title="{{{tituloEs}}}" type="text" value="{{{es}}}" class="form-control" name="es" >
  30 + </div>
  31 + </div>
  32 + <div class="form-group form-group-lg">
  33 + <label class="col-md-6 control-label" for="en" >{{{tituloEn}}}</label>
  34 + <div class="col-md-6">
  35 + <input title="{{{tituloEn}}}" type="text" value="{{{en}}}" class="form-control" name="en" >
  36 + </div>
  37 + </div>
  38 + <div class="form-group form-group-lg">
  39 + <label class="col-md-6 control-label" for="desc_tema" >{{{descricaoTxt}}}</label>
  40 + <div class="col-md-6">
  41 + <input title="{{{descricaoTxt}}}" type="text" value="{{{desc_tema}}}" class="form-control" name="desc_tema" >
  42 + </div>
  43 + </div>
  44 + <div class="form-group form-group-lg">
  45 + <label class="col-md-6 control-label" for="link_tema" >{{{fonteTema}}}</label>
  46 + <div class="col-md-6">
  47 + <input title="{{{fonteTema}}}" type="text" value="{{{link_tema}}}" class="form-control" name="link_tema" >
  48 + </div>
  49 + </div>
  50 + <div class="form-group form-group-lg">
  51 + <label class="col-md-6 control-label" for="metaestat">{{{metaestatTxt}}}</label>
  52 + <div class="col-md-6">
  53 + <select title="{{{metaestat}}}" class="form-control" name="metaestat">
  54 + <option value="SIM" {{{metaestatsim}}} >{{{sim}}}</option>
  55 + <option value="NAO" {{{metaestatnao}}} >{{{nao}}}</option>
  56 + </select>
  57 + </div>
  58 + </div>
  59 + <div class="form-group form-group-lg">
  60 + <div class="checkbox col-md-12">
  61 + <label>
  62 + <input title="{{{permiteOgc}}}" type="checkbox" {{acessopublico}} name="acessopublico" /> {{{permiteOgc}}}
  63 + </label>
  64 + </div>
  65 + </div>
  66 + </div>
  67 + <div class="pull-right">
  68 + <button type="submit" class="btn btn-primary" role="button" style="color:#008579;">{{salva}}</button>
  69 + </div>
  70 + </div>
  71 + </form>
  72 +</script>
0 73 \ No newline at end of file
... ...
admin1/catalogo/menus/grupos/listadegrupos/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_grupo}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_grupo}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form"
  2 +<form id="form-edicao-{{id_grupo}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_grupo}}');return false;" class="form-horizontal" role="form"
3 3 method="post" >
4 4 <div class="row">
5 5 <div class="col-md-12">
... ...
admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_subgrupo}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_subgrupo}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form"
  2 +<form id="form-edicao-{{id_subgrupo}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_subgrupo}}');return false;" class="form-horizontal" role="form"
3 3 method="post" >
4 4 <div class="row">
5 5 <div class="col-md-12">
... ...
admin1/catalogo/menus/grupos/subgrupos/temas/templates/templateForm.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateForm" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_n3}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_n3}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 +<form id="form-edicao-{{id_n3}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_n3}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <div class="form-group form-group-lg">
... ...
admin1/catalogo/menus/grupos/subgrupos/templates/templateFormNos.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormNos" type="x-tmpl-mustache">
2   -<form id="form-edicao-no-{{id_n2}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_n2}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 +<form id="form-edicao-no-{{id_n2}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_n2}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <div class="form-group form-group-lg">
... ...
admin1/catalogo/menus/grupos/subgrupos/templates/templateFormRaiz.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormRaiz" type="x-tmpl-mustache">
2   -<form id="form-edicao-raiz-{{id_raiz}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_raiz}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 +<form id="form-edicao-raiz-{{id_raiz}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_raiz}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <div class="form-group form-group-lg">
... ...
admin1/catalogo/menus/grupos/templates/templateFormNos.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormNos" type="x-tmpl-mustache">
2   -<form id="form-edicao-no-{{id_n1}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_n1}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 +<form id="form-edicao-no-{{id_n1}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_n1}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <div class="form-group form-group-lg">
... ...
admin1/catalogo/menus/grupos/templates/templateFormRaiz.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormRaiz" type="x-tmpl-mustache">
2   -<form id="form-edicao-raiz-{{id_raiz}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_raiz}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  2 +<form id="form-edicao-raiz-{{id_raiz}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_raiz}}');return false;" class="form-horizontal" role="form" method="post" >
3 3 <div class="row">
4 4 <div class="col-md-12">
5 5 <div class="form-group form-group-lg">
... ...
admin1/catalogo/menus/templates/templateFormLista.php
  Diff comments   View file @2c1d3a0
1 1 <script id="templateFormLista" type="x-tmpl-mustache">
2   -<form id="form-edicao-{{id_menu}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_menu}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal"
  2 +<form id="form-edicao-{{id_menu}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_menu}}');return false;" class="form-horizontal"
3 3 role="form" method="post" >
4 4 <div class="row">
5 5 <div class="col-md-12">
... ...
admin1/dicionario/editormapfile.js
  Diff comments   View file @2c1d3a0
... ... @@ -5,6 +5,16 @@ i3GEOadmin.mapfile.dicionario = {
5 5 en : "",
6 6 es : ""
7 7 } ],
  8 + 'editaMapfile' : [ {
  9 + pt : "Edi&ccedil;&atilde;o",
  10 + en : "",
  11 + es : ""
  12 + } ],
  13 + 'editaMapfileDesc' : [ {
  14 + pt : "Utilize as op&ccedil;&otilde;es para modificar as caracter&iacute;sticas principais do mapfile",
  15 + en : "",
  16 + es : ""
  17 + } ],
8 18 'txtAjuda' : [ {
9 19 pt : "Na lista, o texto marcado corresponde ao nome do tema registrado na &aacute;rvore de temas (registro no banco de dados). Nem todos os temas s&atilde;o utilizados na &aacute;rvore, por isso n&atilde;o necessitam ser associados a um 'tema' e registrados no banco de dados. Ao criar um mapfile por esse sistema, o registro no banco de dados &eacute; autom&aacute;tico.<p>Importante: a restri&ccedil;&atilde;o ao tema por meio da defini&ccedil;&atilde;o de grupos de usu&aacute;rios n&atilde;o bloqueia o acesso por meio de download, WMS, KML, etc. Para bloquear esse tipo de acesso &eacute; necess&aacute;rio alterar as op&ccedil;&otilde;es espec&iacute;ficas. Por padr&atilde;o, esses servi&ccedil;os s&atilde;o habilitados para qualquer usu&aacute;rio, n&atilde;o sendo poss&iacute;vel bloquear apenas para determinados grupos. <p>Este formul&aacute;rio permite criar ou editar os arquivos mapfile que comp&otilde;em temas no i3geo. <p>Os arquivo .map s&atilde;o armazenados no diret&oacute;rio i3geo/temas e podem tamb&eacute;m ser editados manualmente. <p>Cada arquivo cont&eacute;m layers definidos conforme a sintaxe utilizada pelo Mapserver. Esses arquivos s&atilde;o as estruturas b&aacute;sicas utilizadas pelo i3geo na apresenta&ccedil;&atilde;o de dados e montagem das camadas que s&atilde;o vistas no mapa. <p>Ap&oacute;s criados os mapfiles, deve-se ainda definir as caracter&iacute;sticas de cada LAYER. <p>A lista de IPs dos usu&aacute;rios que podem administrar o i3geo &eacute; definida no arquivo i3geo/ms_configura.php <p>Apenas os mapfiles que forem vinculados a um tema poder&atilde;o ser vistos na janela de inclus&atilde;o de temas na &aacute;rvore de temas. Se voc&ecirc; criou um mapfile manualmente, utilize a op&ccedil;&atilde;o de edi&ccedil;&atilde;o (&iacute;cone apresentado ao lado de cada mapfile) para fazer essa associa&ccedil;&atilde;o. <p>A op&ccedil;&atilde;o 'Verifica temas sem mapfiles' possibilita resolver problemas decorrentes da elimina&ccedil;&atilde;o manual de um arquivo mapfile do servidor. Nesses casos, o registro no banco de dados permanece. Com essa op&ccedil;&atilde;o &eacute; poss&iacute;vel apagar os registros ou recriar o mapfile perdido.",
10 20 en : "",
... ... @@ -55,7 +65,7 @@ i3GEOadmin.mapfile.dicionario = {
55 65 en : "",
56 66 es : ""
57 67 } ],
58   - 'metaestat' : [ {
  68 + 'metaestatTxt' : [ {
59 69 pt : "Esse mapfile baseia-se no sistema de metadados estat&iacute;sticos?</b> Caso escolha sim, a conex&atilde;o com o banco e o sql de acesso aos dados ser&atilde;o constru&iacute;dos de forma din&acirc;mica",
60 70 en : "",
61 71 es : ""
... ...
admin1/usuarios/cadastro/index.php
  Diff comments   View file @2c1d3a0
... ... @@ -60,7 +60,7 @@ include &quot;../../head.php&quot;;
60 60 <option value="form-{{id_usuario}}">{{{nome_usuario}}}</option>
61 61 </script>
62 62 <script id="templateFormLista" type="x-tmpl-mustache">
63   -<form id="form-edicao-{{id_usuario}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_usuario}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  63 +<form id="form-edicao-{{id_usuario}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_usuario}}');return false;" class="form-horizontal" role="form" method="post" >
64 64 <div class="row">
65 65 <div class="col-md-4" >
66 66 <h4> {{{papeisv}}}</h4>
... ...
admin1/usuarios/grupos/index.php
  Diff comments   View file @2c1d3a0
... ... @@ -57,7 +57,7 @@ include &quot;../../head.php&quot;;
57 57 <option value="form-{{id_grupo}}">{{{nome}}}</option>
58 58 </script>
59 59 <script id="templateFormLista" type="x-tmpl-mustache">
60   -<form id="form-edicao-{{id_grupo}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_grupo}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  60 +<form id="form-edicao-{{id_grupo}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_grupo}}');return false;" class="form-horizontal" role="form" method="post" >
61 61 <div class="row">
62 62 <div class="col-md-4" style="max-height: 230px; overflow-y: auto;">
63 63 <h4> {{{usuariosv}}}</h4>
... ...
admin1/usuarios/operacoes/index.php
  Diff comments   View file @2c1d3a0
... ... @@ -61,7 +61,7 @@ include &quot;../../head.php&quot;;
61 61 <option value="form-{{id_operacao}}">{{{codigo}}}</option>
62 62 </script>
63 63 <script id="templateFormLista" type="x-tmpl-mustache">
64   -<form id="form-edicao-{{id_operacao}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_operacao}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
  64 +<form id="form-edicao-{{id_operacao}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_operacao}}');return false;" class="form-horizontal" role="form" method="post" >
65 65 <div class="row">
66 66 <div class="col-md-4" >
67 67 <h4> {{{papeisv}}}</h4>
... ...
classesphp/classe_analise.php
  Diff comments   View file @2c1d3a0
... ... @@ -1828,10 +1828,12 @@ class Analise
1828 1828 function gradeDePol($xdd,$ydd,$px,$py,$locaplic,$nptx,$npty,$proj=false)
1829 1829 {
1830 1830 set_time_limit(180);
  1831 +
1831 1832 //para manipular dbf
1832 1833 if($this->dbaseExiste == false){
1833 1834 include_once dirname(__FILE__)."/../pacotes/phpxbase/api_conversion.php";
1834 1835 }
  1836 +
1835 1837 $nomegrade = nomeRandomico();
1836 1838 $nomeshp = $this->diretorio."/".$nomegrade;
1837 1839 //pega a extens&atilde;o geogr&aacute;fica do mapa
... ... @@ -1873,6 +1875,7 @@ class Analise
1873 1875 {
1874 1876 $npty = round(($disty / $ydd),0);
1875 1877 }
  1878 +
1876 1879 // cria o shapefile
1877 1880 $novoshpf = ms_newShapefileObj($nomeshp, MS_SHP_POLYGON);
1878 1881 $def = array();
... ...
ferramentas/gradepol/exec.php
  Diff comments   View file @2c1d3a0
... ... @@ -19,7 +19,9 @@ Salva o mapa acrescentando um novo layer com a grade.
19 19 case "GRADEDEPOL":
20 20 include_once(dirname(__FILE__)."/../../classesphp/classe_analise.php");
21 21 copiaSeguranca($map_file);
22   - if(!isset($tema)){$tema = "";}
  22 + if(!isset($tema)){
  23 + $tema = "";
  24 + }
23 25 $m = new Analise($map_file,$tema);
24 26 if($_GET["proj"] == "sim"){
25 27 $_GET["proj"] = true;
... ... @@ -27,8 +29,7 @@ Salva o mapa acrescentando um novo layer com a grade.
27 29 else{
28 30 $_GET["proj"] = false;
29 31 }
30   -
31   - $retorno = $m->gradeDePol($_GET["dd"],$_GET["px"],$_GET["py"],$locaplic,$_GET["nptx"],$_GET["npty"],$_GET["proj"]);
  32 + $retorno = $m->gradeDePol($_GET["xdd"],$_GET["ydd"],$_GET["px"],$_GET["py"],$locaplic,$_GET["nptx"],$_GET["npty"],$_GET["proj"]);
32 33 $m->salva();
33 34 $_SESSION["contadorsalva"]++;
34 35 break;
... ...
ferramentas/selecao/exec.php
  Diff comments   View file @2c1d3a0
... ... @@ -52,7 +52,7 @@ Sleciona elementos de um tema com base em outro tema.
52 52 $temas = explode(",",$tema);
53 53 foreach($temas as $tema){
54 54 $m = new Selecao($map_file,$tema);
55   - $ok[] = $m->selecaoTema($temao,$_GET["tipo"],$_GET["buffer"]);
  55 + $ok[] = $m->selecaoTema($_GET["temao"],$_GET["tipo"],$_GET["buffer"]);
56 56 }
57 57 $_SESSION["contadorsalva"]++;
58 58 redesenhaMapa();
... ...
pacotes/phpxbase/api_conversion.php
  Diff comments   View file @2c1d3a0
... ... @@ -21,6 +21,7 @@
21 21 if(!isset($locaplic)){
22 22 $locaplic = dirname(__FILE__)."/../../";
23 23 }
  24 +
24 25 require_once "$locaplic/pacotes/phpxbase/Column.class.php";
25 26 require_once "$locaplic/pacotes/phpxbase/Record.class.php";
26 27 require_once "$locaplic/pacotes/phpxbase/Table.class.php";
... ... @@ -144,4 +145,4 @@ function xbase_addInstance(&amp;$i) {
144 145 $xbase_instances[$result]=&$i;
145 146 return $result;
146 147 }
147   -?>
148 148 \ No newline at end of file
  149 +?>
... ...
temas/_estadosbr.map
  Diff comments   View file @2c1d3a0
1 1 MAP
2   -SYMBOLSET ../symbols/simbolosv6.sym
3   -FONTSET "../symbols/fontes.txt"
4   -LAYER
5   - NAME "_estadosbr" # ok
6   - TYPE line
7   - STATUS DEFAULT
8   - DATA "/var/www/i3geo/aplicmap/dados/estados.shp"
9   - TEMPLATE "none.htm"
10   - METADATA
11   - "TEMA" "Limite Estadual"
12   - "CLASSE" "SIM"
13   - "permiteogc" "sim"
14   - END
15   - CLASS
16   - NAME ""
17   - STYLE
18   - COLOR 0 0 0
19   - END
20   - END # CLASS
21   -END # LAYER
22   -END
  2 + FONTSET "../symbols/fontes.txt"
  3 + SYMBOLSET "../symbols/simbolosv6.sym"
  4 + LAYER
  5 + DATA "/var/www/i3geo/aplicmap/dados/estados.shp"
  6 + METADATA
  7 + "CLASSE" "SIM"
  8 + "permitekmz" "SIM"
  9 + "permitedownload" "SIM"
  10 + "METAESTAT" ""
  11 + "permitekml" "SIM"
  12 + "permiteogc" "SIM"
  13 + "TEMA" "Limite Estadualx"
  14 + END # METADATA
  15 + NAME "_estadosbr"
  16 + STATUS DEFAULT
  17 + TEMPLATE "none.htm"
  18 + TILEITEM "location"
  19 + TYPE LINE
  20 + UNITS METERS
  21 + CLASS
  22 + NAME ""
  23 + STYLE
  24 + COLOR 0 0 0
  25 + END # STYLE
  26 + END # CLASS
  27 + END # LAYER
  28 +
  29 +END # MAP
  30 +
... ...
temas/aaaaaa.map 0 → 100644
  Diff comments   View file @2c1d3a0
... ... @@ -0,0 +1,27 @@
  1 +MAP
  2 +SYMBOLSET ../symbols/simbolosv6.sym
  3 +FONTSET "../symbols/fontes.txt"
  4 +LAYER
  5 + NAME "aaaaaa"
  6 + TEMPLATE "none.htm"
  7 + TYPE line
  8 + DATA ""
  9 + CONNECTION ""
  10 + STATUS DEFAULT
  11 + METADATA
  12 + TEMA "çççççç"
  13 + CLASSE "SIM"
  14 + permiteogc "SIM"
  15 + permitedownload "SIM"
  16 + permitekml "SIM"
  17 + permitekmz "SIM"
  18 + END
  19 + CLASS
  20 + NAME ""
  21 + STYLE
  22 + COLOR 0 0 0
  23 + SIZE 12
  24 + END
  25 + END
  26 +END
  27 +END
... ...