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

---
 class/db.class.php        | 43 +++++++++++++++++++++++++++++++++++++++++++
 inc/database.php          | 19 ++++++++-----------
 restrito/inc/database.php | 19 ++++++++-----------
 3 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100644 class/db.class.php

diff --git a/class/db.class.php b/class/db.class.php
new file mode 100644
index 0000000..d81795b
--- /dev/null
+++ b/class/db.class.php
@@ -0,0 +1,43 @@
+<?php
+/**********************************************************************************
+ Sistema e-SIC Livre: sistema de acesso a informação baseado na lei de acesso.
+ 
+ Copyright (C) 2014 Prefeitura Municipal do Natal
+ 
+ Este programa é software livre; você pode redistribuí-lo e/ou
+ modificá-lo sob os termos da Licença GPL2.
+***********************************************************************************/
+
+class DB {
+	private static $mysqli;
+	private function __construct() {}
+	
+	static function conn() {
+		if (!self::$mysqli) {
+			self::$mysqli = new mysqli('p:'.DBHOST, DBUSER, DBPASS, DBNAME);
+		}
+		return self::$mysqli;
+	}
+	
+	public function execQuery($query) {
+		// Resolve o problema da injeção de SQL:
+		$rs = mysqli_query(DB::conn(), mysqli_real_escape_string(DB::CONN(), $query));
+		return $rs;
+	}
+	
+	public function rs_to_array($result, $numass=MYSQL_BOTH) {
+		$got = array();
+	
+		if(mysqli_num_rows($result) == 0)
+		return $got;
+	
+		mysqli_data_seek($result, 0);
+	
+		while ($row = mysqli_fetch_array($result, $numass)) {
+			array_push($got, $row);
+		}
+	
+		return $got;
+	}
+}
+?>
\ No newline at end of file
diff --git a/inc/database.php b/inc/database.php
index 45bc5ff..df4446a 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -9,6 +9,7 @@
 ***********************************************************************************/
 
 require_once("config.php");
+require_once("../class/db.class.php");
 
 function db_open() {
 
@@ -25,28 +26,24 @@ function db_close($conn) {
 //retorna objeto de conexao com o banco para transações
 function db_open_trans()
 {
-	//conecta ao mysqli
-	$mysqli = new mysqli(DBHOST, DBUSER, DBPASS, DBNAME);
-	
+	$mysqli = DB::conn();
 	/* check connection */
 	if (mysqli_connect_errno()) {
 		die("Falha na conexao: ". mysqli_connect_error());
 	}		
 
 	$mysqli->autocommit(false);
-	
-	return $mysqli;
-
-}
 
+	return $mysqli; // mantido para facilitar a transição do código para a global
 
+}
 
 function execQuery($query) {
-    $conn = db_open();
-
-    $rs = mysql_query($query, $conn); // or die (mysql_error());
+	$conn = db_open();
 
-    db_close($conn);
+	$rs = mysql_query($query, $conn); // or die (mysql_error());
+	
+	db_close($conn);
     return $rs;
 }
 
diff --git a/restrito/inc/database.php b/restrito/inc/database.php
index 45bc5ff..82dca4b 100644
--- a/restrito/inc/database.php
+++ b/restrito/inc/database.php
@@ -9,6 +9,7 @@
 ***********************************************************************************/
 
 require_once("config.php");
+include_once(DIR_CLASSES_LEIACESSO."/db.class.php");
 
 function db_open() {
 
@@ -25,28 +26,24 @@ function db_close($conn) {
 //retorna objeto de conexao com o banco para transações
 function db_open_trans()
 {
-	//conecta ao mysqli
-	$mysqli = new mysqli(DBHOST, DBUSER, DBPASS, DBNAME);
-	
+	$mysqli = DB::conn();
 	/* check connection */
 	if (mysqli_connect_errno()) {
 		die("Falha na conexao: ". mysqli_connect_error());
 	}		
 
 	$mysqli->autocommit(false);
-	
-	return $mysqli;
-
-}
 
+	return $mysqli; // mantido para facilitar a transição do código para a global
 
+}
 
 function execQuery($query) {
-    $conn = db_open();
-
-    $rs = mysql_query($query, $conn); // or die (mysql_error());
+	$conn = db_open();
 
-    db_close($conn);
+	$rs = mysql_query($query, $conn); // or die (mysql_error());
+	
+	db_close($conn);
     return $rs;
 }
 
--
libgit2 0.21.2