Download as
Browse Code »

Commit 6920cf73af1440a07306d6bff287746e97b0a106

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

--no commit message

Showing 6 changed files with 17 additions and 7 deletions   Show diff stats
admin/js/editormapfile.js
  Diff comments   View file @6920cf7
@@ -1909,7 +1909,13 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo, @@ -1909,7 +1909,13 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo,
1909 { 1909 {
1910 if(testar == false){ 1910 if(testar == false){
1911 if(tipo=="conexao") 1911 if(tipo=="conexao")
1912 - {montaEditorConexao(YAHOO.lang.JSON.parse(o.responseText));} 1912 + {montaEditorDados(YAHOO.lang.JSON.parse(o.responseText));}
  1913 + if(tipo=="comport")
  1914 + {montaEditorComport(YAHOO.lang.JSON.parse(o.responseText));}
  1915 + if(tipo=="dispo")
  1916 + {montaEditorDispo(YAHOO.lang.JSON.parse(o.responseText));}
  1917 + if(tipo=="titulo")
  1918 + {montaEditorTitulo(YAHOO.lang.JSON.parse(o.responseText));}
1913 if(tipo=="metadados") 1919 if(tipo=="metadados")
1914 {montaEditorMetadados(YAHOO.lang.JSON.parse(o.responseText));} 1920 {montaEditorMetadados(YAHOO.lang.JSON.parse(o.responseText));}
1915 if(tipo=="geral") 1921 if(tipo=="geral")
admin/php/admin.php
  Diff comments   View file @6920cf7
@@ -83,10 +83,10 @@ Imprime na saída a string JSON @@ -83,10 +83,10 @@ Imprime na saída a string JSON
83 function retornaJSON($obj) 83 function retornaJSON($obj)
84 { 84 {
85 global $locaplic; 85 global $locaplic;
86 - if(function_exists("json_encode"))  
87 - {echojson(json_encode($obj));}  
88 - else  
89 - { 86 + //if(function_exists("json_encode"))
  87 + //{echojson(json_encode($obj));}
  88 + //else
  89 + //{
90 include_once($locaplic."/pacotes/cpaint/JSON/json2.php"); 90 include_once($locaplic."/pacotes/cpaint/JSON/json2.php");
91 error_reporting(0); 91 error_reporting(0);
92 $j = new Services_JSON(); 92 $j = new Services_JSON();
@@ -94,7 +94,7 @@ function retornaJSON($obj) @@ -94,7 +94,7 @@ function retornaJSON($obj)
94 if (!mb_detect_encoding($texto,"UTF-8",true)) 94 if (!mb_detect_encoding($texto,"UTF-8",true))
95 $texto = utf8_encode($texto); 95 $texto = utf8_encode($texto);
96 echo $texto; 96 echo $texto;
97 - } 97 + //}
98 /* 98 /*
99 include_once($locaplic."/pacotes/cpaint/JSON/json2.php"); 99 include_once($locaplic."/pacotes/cpaint/JSON/json2.php");
100 error_reporting(0); 100 error_reporting(0);
admin/php/conexao.php
  Diff comments   View file @6920cf7
@@ -98,4 +98,5 @@ if($conexaoadmin == "") @@ -98,4 +98,5 @@ if($conexaoadmin == "")
98 } 98 }
99 else 99 else
100 include($conexaoadmin); 100 include($conexaoadmin);
  101 +
101 ?> 102 ?>
102 \ No newline at end of file 103 \ No newline at end of file
aplicmap/ogcws.map
  Diff comments   View file @6920cf7
@@ -102,6 +102,7 @@ MAP @@ -102,6 +102,7 @@ MAP
102 "ows_namespace_uri" "http://www.omsug.ca/osgis2004" 102 "ows_namespace_uri" "http://www.omsug.ca/osgis2004"
103 "ows_address" "http://www.mma.gov.br" 103 "ows_address" "http://www.mma.gov.br"
104 "ows_postcode" "" 104 "ows_postcode" ""
  105 + "ows_enable_request" "*"
105 END 106 END
106 QUERYFORMAT text/html 107 QUERYFORMAT text/html
107 LEGENDFORMAT text/html 108 LEGENDFORMAT text/html
aplicmap/ogcwsv5.map
  Diff comments   View file @6920cf7
@@ -104,6 +104,7 @@ MAP @@ -104,6 +104,7 @@ MAP
104 "ows_namespace_uri" "http://www.omsug.ca/osgis2004" 104 "ows_namespace_uri" "http://www.omsug.ca/osgis2004"
105 "ows_address" "http://www.mma.gov.br" 105 "ows_address" "http://www.mma.gov.br"
106 "ows_postcode" "" 106 "ows_postcode" ""
  107 + "ows_enable_request" "*"
107 END 108 END
108 QUERYFORMAT text/html 109 QUERYFORMAT text/html
109 LEGENDFORMAT text/html 110 LEGENDFORMAT text/html
aplicmap/ogcwsv6.map
  Diff comments   View file @6920cf7
@@ -18,7 +18,7 @@ MAP @@ -18,7 +18,7 @@ MAP
18 NAME 'png' 18 NAME 'png'
19 MIMETYPE "image/png" 19 MIMETYPE "image/png"
20 DRIVER AGG/PNG 20 DRIVER AGG/PNG
21 - IMAGEMODE RGB 21 + IMAGEMODE RGBA
22 FORMATOPTION "QUANTIZE_FORCE=ON" 22 FORMATOPTION "QUANTIZE_FORCE=ON"
23 FORMATOPTION "QUANTIZE_DITHER=OFF" 23 FORMATOPTION "QUANTIZE_DITHER=OFF"
24 FORMATOPTION "QUANTIZE_COLORS=256" 24 FORMATOPTION "QUANTIZE_COLORS=256"
@@ -105,6 +105,7 @@ MAP @@ -105,6 +105,7 @@ MAP
105 "ows_namespace_uri" "http://www.omsug.ca/osgis2004" 105 "ows_namespace_uri" "http://www.omsug.ca/osgis2004"
106 "ows_address" "http://www.mma.gov.br" 106 "ows_address" "http://www.mma.gov.br"
107 "ows_postcode" "" 107 "ows_postcode" ""
  108 + "ows_enable_request" "*"
108 END 109 END
109 QUERYFORMAT text/html 110 QUERYFORMAT text/html
110 LEGENDFORMAT text/html 111 LEGENDFORMAT text/html