Commit 819ee8f5ff2b137277052bfaaa491d30e352e9df
1 parent
5e8d265d
Exists in
master
and in
7 other branches
Correção na substituição de string
Showing
1 changed file
with
6 additions
and
19 deletions
Show diff stats
ferramentas/tabela/relatorio.php
| @@ -3,13 +3,16 @@ session_name("i3GeoPHP"); | @@ -3,13 +3,16 @@ session_name("i3GeoPHP"); | ||
| 3 | if (isset($g_sid)) | 3 | if (isset($g_sid)) |
| 4 | {session_id($g_sid);} | 4 | {session_id($g_sid);} |
| 5 | session_start(); | 5 | session_start(); |
| 6 | +include("../../classesphp/pega_variaveis.php"); | ||
| 6 | foreach(array_keys($_SESSION) as $k) | 7 | foreach(array_keys($_SESSION) as $k) |
| 7 | { | 8 | { |
| 8 | eval("\$".$k."='".$_SESSION[$k]."';"); | 9 | eval("\$".$k."='".$_SESSION[$k]."';"); |
| 9 | } | 10 | } |
| 10 | $postgis_mapa = $_SESSION["postgis_mapa"]; | 11 | $postgis_mapa = $_SESSION["postgis_mapa"]; |
| 11 | include("../../classesphp/carrega_ext.php"); | 12 | include("../../classesphp/carrega_ext.php"); |
| 12 | -include("../../classesphp/pega_variaveis.php"); | 13 | +include("../../classesphp/funcoes_gerais.php"); |
| 14 | + | ||
| 15 | +substituiCon($map_file,$postgis_mapa); | ||
| 13 | $temp = explode(",",$nomesrel); | 16 | $temp = explode(",",$nomesrel); |
| 14 | $colunas = array(); | 17 | $colunas = array(); |
| 15 | foreach($temp as $t) | 18 | foreach($temp as $t) |
| @@ -31,6 +34,7 @@ if($itemagruparel != "" && !in_array($itemagruparel,$itensrel)) | @@ -31,6 +34,7 @@ if($itemagruparel != "" && !in_array($itemagruparel,$itensrel)) | ||
| 31 | 34 | ||
| 32 | $mapa = ms_newMapObj($map_file); | 35 | $mapa = ms_newMapObj($map_file); |
| 33 | $layer = $mapa->getlayerbyname($temarel); | 36 | $layer = $mapa->getlayerbyname($temarel); |
| 37 | + | ||
| 34 | $existesel = "nao"; | 38 | $existesel = "nao"; |
| 35 | if (file_exists($map_file."qy")) | 39 | if (file_exists($map_file."qy")) |
| 36 | {$mapa->loadquery($map_file."qy");} | 40 | {$mapa->loadquery($map_file."qy");} |
| @@ -71,6 +75,7 @@ for ($i = 0; $i < $res_count; $i++) | @@ -71,6 +75,7 @@ for ($i = 0; $i < $res_count; $i++) | ||
| 71 | } | 75 | } |
| 72 | } | 76 | } |
| 73 | $fechou = $layer->close(); | 77 | $fechou = $layer->close(); |
| 78 | +restauraCon($map_file,$postgis_mapa); | ||
| 74 | ?> | 79 | ?> |
| 75 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> | 80 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
| 76 | <html> | 81 | <html> |
| @@ -250,23 +255,5 @@ function calculaarea($geo) | @@ -250,23 +255,5 @@ function calculaarea($geo) | ||
| 250 | return $area / 10000; | 255 | return $area / 10000; |
| 251 | } | 256 | } |
| 252 | } | 257 | } |
| 253 | -/* | ||
| 254 | -function: versao | ||
| 255 | 258 | ||
| 256 | -Retorna a versão do Mapserver. | ||
| 257 | -*/ | ||
| 258 | - function versao() | ||
| 259 | - { | ||
| 260 | - $v = "5.0.0"; | ||
| 261 | - $vs = explode(" ",ms_GetVersion()); | ||
| 262 | - for ($i=0;$i<(count($vs));$i++) | ||
| 263 | - { | ||
| 264 | - if(strtolower($vs[$i]) == "version") | ||
| 265 | - {$v = $vs[$i+1];} | ||
| 266 | - } | ||
| 267 | - $versao["completa"] = $v; | ||
| 268 | - $v = explode(".",$v); | ||
| 269 | - $versao["principal"] = $v[0]; | ||
| 270 | - return $versao; | ||
| 271 | - } | ||
| 272 | ?> | 259 | ?> |
| 273 | \ No newline at end of file | 260 | \ No newline at end of file |