Commit 824ad84dec5ba62cd7643658ff58618b7c123725
1 parent
0ebce9ec
Exists in
master
and in
7 other branches
--no commit message
Showing
5 changed files
with
22 additions
and
10 deletions
Show diff stats
admin/php/editormapfile.php
... | ... | @@ -97,10 +97,10 @@ switch (strtoupper($funcao)) |
97 | 97 | {$map_file = $locaplic."/aplicmap/geral1windows.map";} |
98 | 98 | else{ |
99 | 99 | if(file_exists('/var/www/i3geo/aplicmap/geral1debian.map')){ |
100 | - $map_file = ms_newMapObj("aplicmap/geral1debian.map"); | |
100 | + $map_file = ms_newMapObj("/var/www/i3geo/aplicmap/geral1debian.map"); | |
101 | 101 | } |
102 | 102 | else |
103 | - {$map_file = ms_newMapObj("aplicmap/geral1.map");} | |
103 | + {$map_file = ms_newMapObj($locaplic."/aplicmap/geral1.map");} | |
104 | 104 | } |
105 | 105 | $m = new Legenda($map_file,$locaplic); |
106 | 106 | retornaJSON($m->listaSimbolos($tipo,$dir_tmp,"",$onclick)); | ... | ... |
admin/php/parsemapfile.php
... | ... | @@ -65,7 +65,7 @@ $objlayertypes[7] = "MS_LAYER_TILEINDEX"; |
65 | 65 | $objlayertypes[8] = "MS_LAYER_CHART"; |
66 | 66 | |
67 | 67 | $codigoLayer = $id; |
68 | -$mapfile = "../../temas/".$codigoLayer.".map"; | |
68 | +$mapfile = $locaplic."/temas/".$codigoLayer.".map"; | |
69 | 69 | $mapa = ms_newMapObj($mapfile); |
70 | 70 | if(!isset($tipoparse) || $tipoparse=="") |
71 | 71 | {mapfile();exit;} | ... | ... |
classesphp/flamingoogc.php
... | ... | @@ -63,7 +63,7 @@ foreach ($_GET as $k=>$v) |
63 | 63 | } |
64 | 64 | |
65 | 65 | $req->setParameter("VeRsIoN","1.1.0"); |
66 | -$oMap = ms_newMapobj("../aplicmap/ogcws.map"); | |
66 | +$oMap = ms_newMapobj($locaplic."/aplicmap/ogcws.map"); | |
67 | 67 | $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); |
68 | 68 | $proto = $protocolo[0] . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") ? "s" : "") . "://"; |
69 | 69 | $server = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']; | ... | ... |
pacotes/gvsig/gvsig2mapfile/upload.php
1 | 1 | <?php |
2 | 2 | require_once("../../../classesphp/pega_variaveis.php"); |
3 | +require_once("../../../classesphp/funcoes_gerais.php"); | |
4 | +$versao = versao(); | |
5 | +$versao = $versao["principal"]; | |
3 | 6 | error_reporting(E_ALL); |
4 | 7 | if (isset($_FILES['i3GEOuploadfile']['name'])) |
5 | 8 | { |
6 | 9 | require_once ("../../../ms_configura.php"); |
7 | 10 | include_once("class.gvsig2mapfile.php"); |
8 | - $mapn = ms_newMapObj("../../../aplicmap/geral1windows.map"); | |
11 | + if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) | |
12 | + {$mapn = ms_newMapObj($locaplic."/aplicmap/geral1windowsv".$versao.".map");} | |
13 | + else | |
14 | + { | |
15 | + if(file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){ | |
16 | + $mapn = ms_newMapObj("/var/www/i3geo/aplicmap/geral1debianv".$versao.".map"); | |
17 | + } | |
18 | + else | |
19 | + {$mapn = ms_newMapObj($locaplic."/aplicmap/geral1v".$versao.".map");} | |
20 | + } | |
9 | 21 | //echo "<p>Carregando o arquivo...</p>"; |
10 | 22 | //verifica nomes |
11 | 23 | verificaNome($_FILES['i3GEOuploadfile']['name']); | ... | ... |
testamapfile.php
... | ... | @@ -142,18 +142,18 @@ function verifica($map,$solegenda) |
142 | 142 | if ($tema != "") |
143 | 143 | { |
144 | 144 | if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) |
145 | - {$mapa = ms_newMapObj("aplicmap/geral1windowsv".$versao.".map");} | |
145 | + {$mapa = ms_newMapObj($locaplic."/aplicmap/geral1windowsv".$versao.".map");} | |
146 | 146 | else |
147 | 147 | { |
148 | 148 | if(file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){ |
149 | - $mapa = ms_newMapObj("aplicmap/geral1debianv".$versao.".map"); | |
149 | + $mapa = ms_newMapObj("/var/www/i3geo/aplicmap/geral1debianv".$versao.".map"); | |
150 | 150 | } |
151 | 151 | else |
152 | - {$mapa = ms_newMapObj("aplicmap/geral1v".$versao.".map");} | |
152 | + {$mapa = ms_newMapObj($locaplic."/aplicmap/geral1v".$versao.".map");} | |
153 | 153 | } |
154 | - if(@ms_newMapObj($tema)) | |
154 | + if(@ms_newMapObj($locaplic."/".$tema)) | |
155 | 155 | { |
156 | - $nmapa = ms_newMapObj($tema); | |
156 | + $nmapa = ms_newMapObj($locaplic."/".$tema); | |
157 | 157 | } |
158 | 158 | else |
159 | 159 | { | ... | ... |