Download as
Browse Code »

Commit 50cca08e2ed3a5ed126ba5e70c71eb92d9830192

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

Correção na geração de miniaturas no sistema de administração

Showing 14 changed files with 291 additions and 39 deletions   Show diff stats
.buildpath 0 → 100644
  Diff comments   View file @50cca08
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<buildpath>
  3 + <buildpathentry kind="src" path=""/>
  4 + <buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
  5 +</buildpath>
.project 0 → 100644
  Diff comments   View file @50cca08
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<projectDescription>
  3 + <name>i3geo</name>
  4 + <comment></comment>
  5 + <projects>
  6 + </projects>
  7 + <buildSpec>
  8 + <buildCommand>
  9 + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
  10 + <arguments>
  11 + </arguments>
  12 + </buildCommand>
  13 + <buildCommand>
  14 + <name>org.eclipse.wst.validation.validationbuilder</name>
  15 + <arguments>
  16 + </arguments>
  17 + </buildCommand>
  18 + <buildCommand>
  19 + <name>org.eclipse.dltk.core.scriptbuilder</name>
  20 + <arguments>
  21 + </arguments>
  22 + </buildCommand>
  23 + </buildSpec>
  24 + <natures>
  25 + <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
  26 + <nature>org.eclipse.php.core.PHPNature</nature>
  27 + </natures>
  28 + <filteredResources>
  29 + <filter>
  30 + <id>1331581444157</id>
  31 + <name></name>
  32 + <type>30</type>
  33 + <matcher>
  34 + <id>org.eclipse.ui.ide.multiFilter</id>
  35 + <arguments>1.0-name-matches-false-false-*compacto*</arguments>
  36 + </matcher>
  37 + </filter>
  38 + </filteredResources>
  39 +</projectDescription>
.settings/.jsdtscope 0 → 100644
  Diff comments   View file @50cca08
@@ -0,0 +1,158 @@ @@ -0,0 +1,158 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<classpath>
  3 + <classpathentry kind="src" path="admin/js"/>
  4 + <classpathentry excluding="compactados/" kind="src" path="classesjs"/>
  5 + <classpathentry kind="src" path="classesjs/compactados"/>
  6 + <classpathentry kind="src" path="documentacao/javascript"/>
  7 + <classpathentry kind="src" path="exemplos/atlas"/>
  8 + <classpathentry excluding="depreciados/conectarwfs/|imprimir/|depreciados/exemplo/|template/|depreciados/inserexy/|depreciados/downloadbase/|depreciados/|scielo/|conectargeorss/|conectarwms/|navegacaodir_depreciado/|buscarapida/|wmstime/|nuvemtagsflash/" kind="src" path="ferramentas"/>
  9 + <classpathentry kind="src" path="ferramentas/buscarapida"/>
  10 + <classpathentry kind="src" path="ferramentas/conectargeorss"/>
  11 + <classpathentry kind="src" path="ferramentas/conectarwms"/>
  12 + <classpathentry excluding="conectarwfs/|exemplo/|inserexy/|downloadbase/" kind="src" path="ferramentas/depreciados"/>
  13 + <classpathentry kind="src" path="ferramentas/depreciados/conectarwfs"/>
  14 + <classpathentry kind="src" path="ferramentas/depreciados/downloadbase"/>
  15 + <classpathentry kind="src" path="ferramentas/depreciados/exemplo"/>
  16 + <classpathentry kind="src" path="ferramentas/depreciados/inserexy"/>
  17 + <classpathentry kind="src" path="ferramentas/imprimir"/>
  18 + <classpathentry kind="src" path="ferramentas/navegacaodir_depreciado"/>
  19 + <classpathentry kind="src" path="ferramentas/nuvemtagsflash"/>
  20 + <classpathentry kind="src" path="ferramentas/scielo"/>
  21 + <classpathentry kind="src" path="ferramentas/template"/>
  22 + <classpathentry kind="src" path="ferramentas/wmstime"/>
  23 + <classpathentry kind="src" path="mashups"/>
  24 + <classpathentry kind="src" path="pacotes/balloon-tooltips/htdocs_depreciado/js"/>
  25 + <classpathentry kind="src" path="pacotes/balloon-tooltips/htdocs/js"/>
  26 + <classpathentry excluding="JSON/" kind="src" path="pacotes/cpaint"/>
  27 + <classpathentry kind="src" path="pacotes/cpaint/JSON"/>
  28 + <classpathentry kind="src" path="pacotes/cswclient/lib/scripts"/>
  29 + <classpathentry kind="src" path="pacotes/eudock/js"/>
  30 + <classpathentry kind="src" path="pacotes/jsobjects/jsUI-Global"/>
  31 + <classpathentry kind="src" path="pacotes/jsobjects/jsUI-Treeview"/>
  32 + <classpathentry kind="src" path="pacotes/jsts/lib"/>
  33 + <classpathentry kind="src" path="pacotes/mobileesp"/>
  34 + <classpathentry kind="src" path="pacotes/openflashchart"/>
  35 + <classpathentry kind="src" path="pacotes/openlayers"/>
  36 + <classpathentry excluding="maps/" kind="src" path="pacotes/proj4js/demo"/>
  37 + <classpathentry kind="src" path="pacotes/proj4js/demo/maps"/>
  38 + <classpathentry kind="src" path="pacotes/proj4js/docs/NaturalDocs/javascript"/>
  39 + <classpathentry excluding="projCode/|defs/" kind="src" path="pacotes/proj4js/lib"/>
  40 + <classpathentry kind="src" path="pacotes/proj4js/lib/defs"/>
  41 + <classpathentry kind="src" path="pacotes/proj4js/lib/projCode"/>
  42 + <classpathentry kind="src" path="pacotes/richdraw"/>
  43 + <classpathentry excluding="scripts/" kind="src" path="pacotes/simile/timeline_2.3.0/timeline_ajax"/>
  44 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_ajax/scripts"/>
  45 + <classpathentry excluding="scripts/l10n/zh/|scripts/l10n/en/|scripts/l10n/it/|scripts/l10n/cs/|scripts/l10n/nl/|scripts/l10n/fr/|scripts/l10n/es/|scripts/l10n/se/|scripts/l10n/vi/|scripts/l10n/tr/|scripts/l10n/ru/|scripts/l10n/de/" kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js"/>
  46 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/cs"/>
  47 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/de"/>
  48 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/en"/>
  49 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/es"/>
  50 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/fr"/>
  51 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/it"/>
  52 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/nl"/>
  53 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/ru"/>
  54 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/se"/>
  55 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/tr"/>
  56 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/vi"/>
  57 + <classpathentry kind="src" path="pacotes/simile/timeline_2.3.0/timeline_js/scripts/l10n/zh"/>
  58 + <classpathentry kind="src" path="pacotes/simile/timeline_local_example_1.0/local_example"/>
  59 + <classpathentry kind="src" path="pacotes/tme/javascript"/>
  60 + <classpathentry kind="src" path="pacotes/wpcumulus"/>
  61 + <classpathentry kind="src" path="pacotes/yui270/assets"/>
  62 + <classpathentry kind="src" path="pacotes/yui270/build/animation"/>
  63 + <classpathentry kind="src" path="pacotes/yui270/build/autocomplete"/>
  64 + <classpathentry kind="src" path="pacotes/yui270/build/button"/>
  65 + <classpathentry kind="src" path="pacotes/yui270/build/calendar"/>
  66 + <classpathentry kind="src" path="pacotes/yui270/build/carousel"/>
  67 + <classpathentry kind="src" path="pacotes/yui270/build/charts"/>
  68 + <classpathentry kind="src" path="pacotes/yui270/build/colorpicker"/>
  69 + <classpathentry kind="src" path="pacotes/yui270/build/connection"/>
  70 + <classpathentry kind="src" path="pacotes/yui270/build/container"/>
  71 + <classpathentry kind="src" path="pacotes/yui270/build/cookie"/>
  72 + <classpathentry kind="src" path="pacotes/yui270/build/datasource"/>
  73 + <classpathentry kind="src" path="pacotes/yui270/build/datatable"/>
  74 + <classpathentry kind="src" path="pacotes/yui270/build/dom"/>
  75 + <classpathentry kind="src" path="pacotes/yui270/build/dragdrop"/>
  76 + <classpathentry kind="src" path="pacotes/yui270/build/editor"/>
  77 + <classpathentry kind="src" path="pacotes/yui270/build/element"/>
  78 + <classpathentry kind="src" path="pacotes/yui270/build/event"/>
  79 + <classpathentry kind="src" path="pacotes/yui270/build/get"/>
  80 + <classpathentry kind="src" path="pacotes/yui270/build/history"/>
  81 + <classpathentry kind="src" path="pacotes/yui270/build/imagecropper"/>
  82 + <classpathentry kind="src" path="pacotes/yui270/build/imageloader"/>
  83 + <classpathentry kind="src" path="pacotes/yui270/build/json"/>
  84 + <classpathentry kind="src" path="pacotes/yui270/build/layout"/>
  85 + <classpathentry kind="src" path="pacotes/yui270/build/logger"/>
  86 + <classpathentry kind="src" path="pacotes/yui270/build/menu"/>
  87 + <classpathentry kind="src" path="pacotes/yui270/build/paginator"/>
  88 + <classpathentry kind="src" path="pacotes/yui270/build/profiler"/>
  89 + <classpathentry kind="src" path="pacotes/yui270/build/profilerviewer"/>
  90 + <classpathentry kind="src" path="pacotes/yui270/build/progressbar"/>
  91 + <classpathentry kind="src" path="pacotes/yui270/build/resize"/>
  92 + <classpathentry kind="src" path="pacotes/yui270/build/selector"/>
  93 + <classpathentry kind="src" path="pacotes/yui270/build/slider"/>
  94 + <classpathentry kind="src" path="pacotes/yui270/build/stylesheet"/>
  95 + <classpathentry kind="src" path="pacotes/yui270/build/tabview"/>
  96 + <classpathentry kind="src" path="pacotes/yui270/build/treeview"/>
  97 + <classpathentry kind="src" path="pacotes/yui270/build/uploader"/>
  98 + <classpathentry kind="src" path="pacotes/yui270/build/utilities"/>
  99 + <classpathentry kind="src" path="pacotes/yui270/build/yahoo"/>
  100 + <classpathentry kind="src" path="pacotes/yui270/build/yahoo-dom-event"/>
  101 + <classpathentry kind="src" path="pacotes/yui270/build/yuiloader"/>
  102 + <classpathentry kind="src" path="pacotes/yui270/build/yuiloader-dom-event"/>
  103 + <classpathentry kind="src" path="pacotes/yui270/build/yuitest"/>
  104 + <classpathentry kind="src" path="pacotes/yui290/assets"/>
  105 + <classpathentry kind="src" path="pacotes/yui290/build/animation"/>
  106 + <classpathentry kind="src" path="pacotes/yui290/build/autocomplete"/>
  107 + <classpathentry kind="src" path="pacotes/yui290/build/button"/>
  108 + <classpathentry kind="src" path="pacotes/yui290/build/calendar"/>
  109 + <classpathentry kind="src" path="pacotes/yui290/build/carousel"/>
  110 + <classpathentry kind="src" path="pacotes/yui290/build/charts"/>
  111 + <classpathentry kind="src" path="pacotes/yui290/build/colorpicker"/>
  112 + <classpathentry kind="src" path="pacotes/yui290/build/connection"/>
  113 + <classpathentry kind="src" path="pacotes/yui290/build/container"/>
  114 + <classpathentry kind="src" path="pacotes/yui290/build/cookie"/>
  115 + <classpathentry kind="src" path="pacotes/yui290/build/datasource"/>
  116 + <classpathentry kind="src" path="pacotes/yui290/build/datatable"/>
  117 + <classpathentry kind="src" path="pacotes/yui290/build/datemath"/>
  118 + <classpathentry kind="src" path="pacotes/yui290/build/dom"/>
  119 + <classpathentry kind="src" path="pacotes/yui290/build/dragdrop"/>
  120 + <classpathentry kind="src" path="pacotes/yui290/build/editor"/>
  121 + <classpathentry kind="src" path="pacotes/yui290/build/element"/>
  122 + <classpathentry kind="src" path="pacotes/yui290/build/element-delegate"/>
  123 + <classpathentry kind="src" path="pacotes/yui290/build/event"/>
  124 + <classpathentry kind="src" path="pacotes/yui290/build/event-delegate"/>
  125 + <classpathentry kind="src" path="pacotes/yui290/build/event-mouseenter"/>
  126 + <classpathentry kind="src" path="pacotes/yui290/build/event-simulate"/>
  127 + <classpathentry kind="src" path="pacotes/yui290/build/get"/>
  128 + <classpathentry kind="src" path="pacotes/yui290/build/history"/>
  129 + <classpathentry kind="src" path="pacotes/yui290/build/imagecropper"/>
  130 + <classpathentry kind="src" path="pacotes/yui290/build/imageloader"/>
  131 + <classpathentry kind="src" path="pacotes/yui290/build/json"/>
  132 + <classpathentry kind="src" path="pacotes/yui290/build/layout"/>
  133 + <classpathentry kind="src" path="pacotes/yui290/build/logger"/>
  134 + <classpathentry kind="src" path="pacotes/yui290/build/menu"/>
  135 + <classpathentry kind="src" path="pacotes/yui290/build/paginator"/>
  136 + <classpathentry kind="src" path="pacotes/yui290/build/profiler"/>
  137 + <classpathentry kind="src" path="pacotes/yui290/build/profilerviewer"/>
  138 + <classpathentry kind="src" path="pacotes/yui290/build/progressbar"/>
  139 + <classpathentry kind="src" path="pacotes/yui290/build/resize"/>
  140 + <classpathentry kind="src" path="pacotes/yui290/build/selector"/>
  141 + <classpathentry kind="src" path="pacotes/yui290/build/slider"/>
  142 + <classpathentry kind="src" path="pacotes/yui290/build/storage"/>
  143 + <classpathentry kind="src" path="pacotes/yui290/build/stylesheet"/>
  144 + <classpathentry kind="src" path="pacotes/yui290/build/swf"/>
  145 + <classpathentry kind="src" path="pacotes/yui290/build/swfdetect"/>
  146 + <classpathentry kind="src" path="pacotes/yui290/build/swfstore"/>
  147 + <classpathentry kind="src" path="pacotes/yui290/build/tabview"/>
  148 + <classpathentry kind="src" path="pacotes/yui290/build/treeview"/>
  149 + <classpathentry kind="src" path="pacotes/yui290/build/uploader"/>
  150 + <classpathentry kind="src" path="pacotes/yui290/build/utilities"/>
  151 + <classpathentry kind="src" path="pacotes/yui290/build/yahoo"/>
  152 + <classpathentry kind="src" path="pacotes/yui290/build/yahoo-dom-event"/>
  153 + <classpathentry kind="src" path="pacotes/yui290/build/yuiloader"/>
  154 + <classpathentry kind="src" path="pacotes/yui290/build/yuiloader-dom-event"/>
  155 + <classpathentry kind="src" path="pacotes/yui290/build/yuitest"/>
  156 + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
  157 + <classpathentry kind="output" path=""/>
  158 +</classpath>
.settings/org.eclipse.wst.jsdt.ui.superType.container 0 → 100644
  Diff comments   View file @50cca08
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +org.eclipse.wst.jsdt.launching.JRE_CONTAINER
0 \ No newline at end of file 2 \ No newline at end of file
.settings/org.eclipse.wst.jsdt.ui.superType.name 0 → 100644
  Diff comments   View file @50cca08
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +Global
0 \ No newline at end of file 2 \ No newline at end of file
.settings/org.eclipse.wst.xsl.core.prefs 0 → 100644
  Diff comments   View file @50cca08
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
  1 +CHECK_CALL_TEMPLATES=2
  2 +CHECK_XPATHS=2
  3 +CIRCULAR_REF=2
  4 +DUPLICATE_PARAMETER=2
  5 +EMPTY_PARAM=1
  6 +MISSING_INCLUDE=2
  7 +MISSING_PARAM=1
  8 +NAME_ATTRIBUTE_EMPTY=2
  9 +NAME_ATTRIBUTE_MISSING=2
  10 +TEMPLATE_CONFLICT=2
  11 +eclipse.preferences.version=1
admin/index.html
  Diff comments   View file @50cca08
1 -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" >  
2 -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 1 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/strict.dtd">
  2 +<html>
3 <head> 3 <head>
  4 +<meta http-equiv="Category" content="i3Geo Mapa interativo MMA geoprocessamento sig mobile">
4 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1"> 5 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
  6 +
5 <link rel="stylesheet" type="text/css" href="html/admin.css"> 7 <link rel="stylesheet" type="text/css" href="html/admin.css">
6 <script src="../pacotes/cpaint/cpaint2.inc.compressed.js" type="text/javascript"></script> 8 <script src="../pacotes/cpaint/cpaint2.inc.compressed.js" type="text/javascript"></script>
7 <script type="text/javascript" src="js/core.js"></script> 9 <script type="text/javascript" src="js/core.js"></script>
admin/php/menutemas.php
  Diff comments   View file @50cca08
@@ -1243,9 +1243,10 @@ function removeCabecalho($arq,$symbolset=true) @@ -1243,9 +1243,10 @@ function removeCabecalho($arq,$symbolset=true)
1243 } 1243 }
1244 function atualizaMiniatura(){ 1244 function atualizaMiniatura(){
1245 global $tema,$locaplic; 1245 global $tema,$locaplic;
  1246 + $tipo = "foo";
1246 include_once("../../classesphp/funcoes_gerais.php"); 1247 include_once("../../classesphp/funcoes_gerais.php");
1247 require("../../geraminiatura.php"); 1248 require("../../geraminiatura.php");
1248 verificaMiniatura($tema,"todos",true); 1249 verificaMiniatura($tema,"todos",true);
1249 - exit; 1250 + return "ok";
1250 } 1251 }
1251 ?> 1252 ?>
1252 \ No newline at end of file 1253 \ No newline at end of file
aplicmap/geral1debianv6.map
  Diff comments   View file @50cca08
@@ -47,13 +47,14 @@ MAP @@ -47,13 +47,14 @@ MAP
47 FORMATOPTION "INTERLACE=OFF" 47 FORMATOPTION "INTERLACE=OFF"
48 END 48 END
49 49
50 - OUTPUTFORMAT  
51 - NAME svg  
52 - MIMETYPE "image/svg+xml"  
53 - DRIVER cairo/svg  
54 - #FORMATOPTION "COMPRESSED_OUTPUT=TRUE"  
55 - #FORMATOPTION "FULL_RESOLUTION=TRUE"  
56 - END 50 + #OUTPUTFORMAT
  51 + # NAME svg
  52 + # MIMETYPE "image/svg+xml"
  53 + # DRIVER cairo/svg
  54 + ##FORMATOPTION "COMPRESSED_OUTPUT=TRUE"
  55 + ##FORMATOPTION "FULL_RESOLUTION=TRUE"
  56 + #END
  57 +
57 OUTPUTFORMAT 58 OUTPUTFORMAT
58 NAME jpeg 59 NAME jpeg
59 DRIVER "AGG/JPEG" 60 DRIVER "AGG/JPEG"
aplicmap/geral1fedorav6.map
  Diff comments   View file @50cca08
@@ -47,13 +47,14 @@ MAP @@ -47,13 +47,14 @@ MAP
47 FORMATOPTION "INTERLACE=OFF" 47 FORMATOPTION "INTERLACE=OFF"
48 END 48 END
49 49
50 - OUTPUTFORMAT  
51 - NAME svg  
52 - MIMETYPE "image/svg+xml"  
53 - DRIVER cairo/svg  
54 - #FORMATOPTION "COMPRESSED_OUTPUT=TRUE"  
55 - #FORMATOPTION "FULL_RESOLUTION=TRUE"  
56 - END 50 + #OUTPUTFORMAT
  51 + # NAME svg
  52 + # MIMETYPE "image/svg+xml"
  53 + # DRIVER cairo/svg
  54 + # #FORMATOPTION "COMPRESSED_OUTPUT=TRUE"
  55 + # #FORMATOPTION "FULL_RESOLUTION=TRUE"
  56 + #END
  57 +
57 OUTPUTFORMAT 58 OUTPUTFORMAT
58 NAME jpeg 59 NAME jpeg
59 DRIVER "AGG/JPEG" 60 DRIVER "AGG/JPEG"
geraminiatura.php
  Diff comments   View file @50cca08
@@ -79,10 +79,14 @@ if (!function_exists(&#39;ms_GetVersion&#39;)) @@ -79,10 +79,14 @@ if (!function_exists(&#39;ms_GetVersion&#39;))
79 else 79 else
80 {dl('php_mapscript.so');} 80 {dl('php_mapscript.so');}
81 } 81 }
82 -include("ms_configura.php");  
83 -include("classesphp/funcoes_gerais.php");  
84 -require_once("classesphp/pega_variaveis.php");  
85 -include_once ("classesphp/carrega_ext.php"); 82 +//para o caso de ser feito um include desse programa
  83 +if(!isset($locaplic))
  84 +{$locaplic = "";}
  85 +include($locaplic."/ms_configura.php");
  86 +if(!function_exists("versao"))
  87 +{include($locaplic."/classesphp/funcoes_gerais.php");}
  88 +require_once($locaplic."/classesphp/pega_variaveis.php");
  89 +include_once ($locaplic."/classesphp/carrega_ext.php");
86 $versao = versao(); 90 $versao = versao();
87 $versao = $versao["principal"]; 91 $versao = $versao["principal"];
88 // 92 //
@@ -130,7 +134,11 @@ if($tipo == &quot;mini&quot; || $tipo == &quot;todos&quot; || $tipo == &quot;grande&quot; || $tipo == &quot;&quot;) @@ -130,7 +134,11 @@ if($tipo == &quot;mini&quot; || $tipo == &quot;todos&quot; || $tipo == &quot;grande&quot; || $tipo == &quot;&quot;)
130 // 134 //
131 function verificaMiniatura($map,$tipo,$admin=false) 135 function verificaMiniatura($map,$tipo,$admin=false)
132 { 136 {
133 - global $locaplic,$versao; 137 + global $locaplic,$versao,$base;
  138 + if($versao == ""){
  139 + $versao = versao();
  140 + $versao = $versao["principal"];
  141 + }
134 //echo $map."<br>";return; 142 //echo $map."<br>";return;
135 ms_ResetErrorList(); 143 ms_ResetErrorList();
136 $tema = ""; 144 $tema = "";
@@ -142,15 +150,42 @@ function verificaMiniatura($map,$tipo,$admin=false) @@ -142,15 +150,42 @@ function verificaMiniatura($map,$tipo,$admin=false)
142 {$tema = $locaplic.'/temas/'.$map.".map";} 150 {$tema = $locaplic.'/temas/'.$map.".map";}
143 if ($tema != "") 151 if ($tema != "")
144 { 152 {
145 - if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN'))  
146 - {$mapa = ms_newMapObj("$locaplic/aplicmap/geral1windowsv".$versao.".map");} 153 + if(isset($base) && $base != ""){
  154 + if(file_exists($base))
  155 + {$f = $base;}
  156 + else
  157 + {$f = $locaplic."/aplicmap/".$base.".map";}
  158 + if(!file_exists($base)){
  159 + echo "<span style=color:red >ARQUIVO $base NÂO FOI ENCONTRADO. CORRIJA ISSO EM ms_configura.php";
  160 + exit;
  161 + }
  162 + }
147 else 163 else
148 - {$mapa = ms_newMapObj("$locaplic/aplicmap/geral1v".$versao.".map");} 164 + {
  165 + $f = "";
  166 + if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN'))
  167 + {$f = $locaplic."/aplicmap/geral1windowsv".$versao.".map";}
  168 + else
  169 + {
  170 + if($f == "" && file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){
  171 + $f = "/var/www/i3geo/aplicmap/geral1debianv".$versao.".map";
  172 + }
  173 + if($f == "" && file_exists('/var/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){
  174 + $f = "/var/www/html/i3geo/aplicmap/geral1fedorav".$versao.".map";
  175 + }
  176 + if($f == "" && file_exists('/opt/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){
  177 + $f = "/opt/www/html/i3geo/aplicmap/geral1v".$versao.".map";
  178 + }
  179 + if($f == "")
  180 + {$f = $locaplic."/aplicmap/geral1v".$versao.".map";}
  181 + }
  182 + }
  183 + $mapa = ms_newMapObj($f);
149 if(@ms_newMapObj($tema)) 184 if(@ms_newMapObj($tema))
150 {$nmapa = ms_newMapObj($tema);} 185 {$nmapa = ms_newMapObj($tema);}
151 else 186 else
152 { 187 {
153 - echo "erro no arquivo $map <br>"; 188 + echo "erro no arquivo $tema <br>";
154 return; 189 return;
155 } 190 }
156 $temasn = $nmapa->getAllLayerNames(); 191 $temasn = $nmapa->getAllLayerNames();
@@ -162,9 +197,9 @@ function verificaMiniatura($map,$tipo,$admin=false) @@ -162,9 +197,9 @@ function verificaMiniatura($map,$tipo,$admin=false)
162 ms_newLayerObj($mapa, $layern); 197 ms_newLayerObj($mapa, $layern);
163 autoClasses($layern,$mapa,$locaplic); 198 autoClasses($layern,$mapa,$locaplic);
164 if ($layern->data == "") 199 if ($layern->data == "")
165 - $dados = $layern->connection; 200 + {$dados = $layern->connection;}
166 else 201 else
167 - $dados = $layern->data; 202 + {$dados = $layern->data;}
168 $pegarext = $teman; 203 $pegarext = $teman;
169 } 204 }
170 if (isset($postgis_mapa)) 205 if (isset($postgis_mapa))
@@ -184,20 +219,16 @@ function verificaMiniatura($map,$tipo,$admin=false) @@ -184,20 +219,16 @@ function verificaMiniatura($map,$tipo,$admin=false)
184 } 219 }
185 } 220 }
186 } 221 }
187 - }  
188 - 222 + }
189 zoomTemaMiniatura($pegarext,$mapa); 223 zoomTemaMiniatura($pegarext,$mapa);
190 if ($tipo == "mini" || $tipo == "todos") 224 if ($tipo == "mini" || $tipo == "todos")
191 - {  
192 - 225 + {
193 $mapa->setsize(50,50); 226 $mapa->setsize(50,50);
194 $sca = $mapa->scalebar; 227 $sca = $mapa->scalebar;
195 $sca->set("status",MS_OFF); 228 $sca->set("status",MS_OFF);
196 $objImagemM = @$mapa->draw(); 229 $objImagemM = @$mapa->draw();
197 -  
198 - if ($objImagemM == "" || $objImagemM == MS_FAILURE)  
199 - {echo "Problemas ao gerar o mapa<br>";return;}  
200 - 230 + //if ($objImagemM == "" || $objImagemM == MS_FAILURE)
  231 + //{echo "Problemas ao gerar o mapa<br>";return;}
201 $weboM = $mapa->web; 232 $weboM = $mapa->web;
202 $urlM = $weboM->imageurl."/".$map; 233 $urlM = $weboM->imageurl."/".$map;
203 } 234 }
@@ -207,8 +238,8 @@ function verificaMiniatura($map,$tipo,$admin=false) @@ -207,8 +238,8 @@ function verificaMiniatura($map,$tipo,$admin=false)
207 $sca = $mapa->scalebar; 238 $sca = $mapa->scalebar;
208 $sca->set("status",MS_OFF); 239 $sca->set("status",MS_OFF);
209 $objImagemG = @$mapa->draw(); 240 $objImagemG = @$mapa->draw();
210 - if ($objImagemG == "" || $objImagemG == MS_FAILURE)  
211 - {echo "Problemas ao gerar o mapa<br>";return;} 241 + //if ($objImagemG == "" || $objImagemG == MS_FAILURE)
  242 + //{echo "Problemas ao gerar o mapa<br>";return;}
212 $weboG = $mapa->web; 243 $weboG = $mapa->web;
213 $urlG = $weboG->imageurl."/".$map; 244 $urlG = $weboG->imageurl."/".$map;
214 } 245 }
temas/miniaturas/locali.map.grande.png 0 → 100644
View file @50cca08

19.9 KB
temas/miniaturas/locali.map.mini.png 0 → 100644
View file @50cca08

2.11 KB
testainstal.php
  Diff comments   View file @50cca08
@@ -59,7 +59,8 @@ i3geo/testainstal.php @@ -59,7 +59,8 @@ i3geo/testainstal.php
59 error_reporting(E_ALL); 59 error_reporting(E_ALL);
60 60
61 //echo "<pre>\n"; 61 //echo "<pre>\n";
62 -echo "<b>TESTE DE INSTALACAO DO i3Geo</b><br>\n"; 62 +echo "<span style=font-size:10px >Observação: se você estiver usando Linux e a biblioteca CAIRO estiver instalada corretamente no Mapserver, edite os arquivos i3geo/aplicmap/geral1fedorav6.map e geral1debianv6.map para remover os comentários do OUTPUTFORMAT que utiliza SVG com o drive Cairo</span><br>\n";
  63 +echo "<br><b>TESTE DE INSTALACAO DO i3Geo</b><br>\n";
63 //ip 64 //ip
64 $ip = "UNKNOWN"; 65 $ip = "UNKNOWN";
65 if (getenv("HTTP_CLIENT_IP")) $ip = getenv("HTTP_CLIENT_IP"); 66 if (getenv("HTTP_CLIENT_IP")) $ip = getenv("HTTP_CLIENT_IP");