From 3131af77675beb4a28ce6985032a55efaba1896d Mon Sep 17 00:00:00 2001
From: Leandro Arndt <leandro.arndt@cgu.gov.br>
Date: Thu, 18 Dec 2014 23:32:23 -0200
Subject: [PATCH] Classe DB

---
 cadastro/formulario.php   | 19 +++++++++++--------
 inc/database.php          |  2 +-
 restrito/inc/database.php |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/cadastro/formulario.php b/cadastro/formulario.php
index 8e9a387..6595725 100644
--- a/cadastro/formulario.php
+++ b/cadastro/formulario.php
@@ -7,6 +7,9 @@
  Este programa é software livre; você pode redistribuí-lo e/ou
  modificá-lo sob os termos da Licença GPL2.
 ***********************************************************************************/
+
+include_once("../class/db.class.php");
+
 ?>
 <script language="JavaScript" src="<?php echo URL_BASE_SISTEMA;?>js/XmlHttpLookup.js"></script>
 
@@ -61,8 +64,8 @@
 				<td align="left">
                                         <select name="idfaixaetaria" id="idfaixaetaria">
                                                 <option value="">----</option>		
-                                                <?php $rsFxt = execQuery("select * from lda_faixaetaria order by nome"); ?>
-                                                <?php while($rowfxt=mysql_fetch_array($rsFxt)){?>
+                                                <?php $rsFxt = DB::execQuery("select * from lda_faixaetaria order by nome"); ?>
+                                                <?php while($rowfxt=mysqli_fetch_array($rsFxt)){?>
                                                             <option value="<?php echo $rowfxt['idfaixaetaria'];?>" <?php echo $rowfxt['idfaixaetaria']==$idfaixaetaria?"selected":""; ?>><?php echo $rowfxt['nome'];?></option>
                                                 <?php }?>
                                         </select>
@@ -74,8 +77,8 @@
 				<td align="left">
                                         <select name="idescolaridade" id="idescolaridade">
                                                 <option value="">----</option>		
-                                                <?php $rsEsc = execQuery("select * from lda_escolaridade order by nome"); ?>
-                                                <?php while($rowesc=mysql_fetch_array($rsEsc)){?>
+                                                <?php $rsEsc = DB::execQuery("select * from lda_escolaridade order by nome"); ?>
+                                                <?php while($rowesc=mysqli_fetch_array($rsEsc)){?>
                                                             <option value="<?php echo $rowesc['idescolaridade'];?>" <?php echo $rowesc['idescolaridade']==$idescolaridade?"selected":""; ?>><?php echo $rowesc['nome'];?></option>
                                                 <?php }?>
                                         </select>
@@ -93,8 +96,8 @@
 				<td align="left">
                                         <select name="idtipotelefone" id="idtipotelefone">
                                                 <option value="">----</option>		
-                                                <?php $rstel = execQuery("select * from lda_tipotelefone order by nome"); ?>
-                                                <?php while($rowtel=mysql_fetch_array($rstel)){?>
+                                                <?php $rstel = DB::execQuery("select * from lda_tipotelefone order by nome"); ?>
+                                                <?php while($rowtel=mysqli_fetch_array($rstel)){?>
                                                             <option value="<?php echo $rowtel['idtipotelefone'];?>" <?php echo $rowtel['idtipotelefone']==$idtipotelefone?"selected":""; ?>><?php echo $rowtel['nome'];?></option>
                                                 <?php }?>
                                         </select>
@@ -149,8 +152,8 @@
 					<td><input type="text" name="cidade" onmouseover="this.title=this.value" id="cidade" value="<?php echo $cidade;?>" maxlength="255" size="35">
 						<select name="uf" id="uf">
 							<option value="">- UF -</option>		
-							<?php $rsuf = execQuery("select sigla from gen_estados order by sigla"); ?>
-							<?php while($rowuf=mysql_fetch_array($rsuf)){?>
+							<?php $rsuf = DB::execQuery("select sigla from gen_estados order by sigla"); ?>
+							<?php while($rowuf=mysqli_fetch_array($rsuf)){?>
 								  <option value="<?php echo $rowuf['sigla'];?>" <?php echo $rowuf['sigla']==$uf?"selected":""; ?>><?php echo $rowuf['sigla'];?></option>
 							<?php }?>
 						</select>
diff --git a/inc/database.php b/inc/database.php
index df4446a..c2e134a 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -34,7 +34,7 @@ function db_open_trans()
 
 	$mysqli->autocommit(false);
 
-	return $mysqli; // mantido para facilitar a transição do código para a global
+	return true;
 
 }
 
diff --git a/restrito/inc/database.php b/restrito/inc/database.php
index 82dca4b..c7ebebc 100644
--- a/restrito/inc/database.php
+++ b/restrito/inc/database.php
@@ -34,7 +34,7 @@ function db_open_trans()
 
 	$mysqli->autocommit(false);
 
-	return $mysqli; // mantido para facilitar a transição do código para a global
+	return true;
 
 }
 
--
libgit2 0.21.2