Download as
Browse Code »

Commit 822621db25d177fc540d4f4a618030a490284483

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

Correção na acentuação

Showing 1 changed file with 9 additions and 5 deletions   Show diff stats
admin/hiperbolica.php
  Diff comments   View file @822621d
@@ -3,11 +3,14 @@ error_reporting(0); @@ -3,11 +3,14 @@ error_reporting(0);
3 include("../ms_configura.php"); 3 include("../ms_configura.php");
4 include("$locaplic/admin/php/admin.php"); 4 include("$locaplic/admin/php/admin.php");
5 include("$locaplic/admin/php/conexao.php"); 5 include("$locaplic/admin/php/conexao.php");
  6 +$encoding = "UTF-8";
6 if($convUTF) 7 if($convUTF)
7 $xml = "<"."\x3F"."xml version='1.0' encoding='UTF-8' "."\x3F".">"; 8 $xml = "<"."\x3F"."xml version='1.0' encoding='UTF-8' "."\x3F".">";
8 -else$xml = "<"."\x3F"."xml version='1.0' encoding='ISO-8859-1' "."\x3F".">";  
9 -  
10 - 9 +else
  10 +{
  11 + $xml = "<"."\x3F"."xml version='1.0' encoding='ISO-8859-1' "."\x3F".">";
  12 + $encoding = "ISO-8859-1";
  13 +}
11 $xml .= "<capa>"; 14 $xml .= "<capa>";
12 $menus = pegaDados("SELECT * from i3geoadmin_menus order by nome_menu ",$locaplic); 15 $menus = pegaDados("SELECT * from i3geoadmin_menus order by nome_menu ",$locaplic);
13 $xml .= '<termo cor="#FFFFFF" id="00" nome="Dados geo">'; 16 $xml .= '<termo cor="#FFFFFF" id="00" nome="Dados geo">';
@@ -141,8 +144,9 @@ echo $xml; @@ -141,8 +144,9 @@ echo $xml;
141 144
142 function h_converteTexto($i) 145 function h_converteTexto($i)
143 { 146 {
144 - $encoding = mb_detect_encoding($i, 'UTF-8, UTF-7, ASCII, ISO-8859-1');  
145 - return mb_convert_encoding($i,"UTF-8",$encoding); 147 + global $encoding;
  148 + $s = mb_detect_encoding($i, 'UTF-8, UTF-7, ASCII, ISO-8859-1');
  149 + return mb_convert_encoding($i,$encoding,$s);
146 } 150 }
147 151
148 ?> 152 ?>