1 files changed, 44 insertions, 25 deletions

diff --git a/includes/database.inc b/includes/database.inc
index 8aa5787fa..be3bdbf17 100644
--- a/includes/database.inc
+++ b/includes/database.inc
@@ -1,44 +1,63 @@
 <?php
 
-function db_connect($host, $user, $pass, $name) {
-  mysql_pconnect($host, $user, $pass) or die(mysql_error());
-  mysql_select_db($name) or die ("unable to select database");
-  // NOTE: we are using a persistent connection!
-}
+require_once 'DB.php';
 
+/*
+** Setup a database connection:
+*/
 
-function db_query($query, $debug = 0) {
-  $result = mysql_query($query);
-  if ($debug) print "<P>query: $query<BR>error:". mysql_error() ."</P>";
-  if ($result) return $result;
-  else watchdog("error", "database: ". mysql_error() ."\nquery: ". htmlspecialchars($query));
+$db_handle = DB::connect($db_url);
+if (DB::isError($db_handle)) {
+  die ("Database problem: ". $db_handle->getMessage());
 }
+$db_handle->setFetchMode(DB_FETCHMODE_ASSOC);
 
-function db_fetch_object($qid) {
-  if ($qid) return mysql_fetch_object($qid);
-}
+function db_query($sql, $debug = 0) {
+  global $db_handle;
 
-function db_num_rows($qid) {
-  if ($qid) return mysql_num_rows($qid);
+  $result = $db_handle->query($sql);
+  if (DB::isError($result)) {
+    //if ($debug) {
+      print "<p>query: $sql<br />error:". $result->getMessage() ."</p>";
+    //}
+    watchdog("error", "database: ". $result->getMessage() ."\nquery: ". htmlspecialchars($sql));
+  }
+  return $result;
 }
 
-function db_fetch_row($qid) {
-  if ($qid) return mysql_fetch_row($qid);
+function db_fetch_object($result) {
+  if ($result) {
+    return $result->fetchRow(DB_FETCHMODE_OBJECT);
+  }
 }
 
-function db_fetch_array($qid) {
-  if ($qid) return mysql_fetch_array($qid, MYSQL_ASSOC);
+function db_fetch_array($result) {
+  if ($result) {
+    return $result->fetchRow(DB_FETCHMODE_ASSOC);
+  }
 }
 
-function db_result($qid, $field = 0) {
-  if ($qid) return mysql_result($qid, $field);
+function db_num_rows($result) {
+  if ($result) {
+    return $result->numRows($result);
+  }
 }
 
-function db_insert_id() {
-  return mysql_insert_id();
+function db_result($result, $field = 0) {
+  if ($result) {
+    $tmp = $result->fetchRow(DB_FETCHMODE_ASSOC);
+    return $tmp[$field];
+  }
 }
 
-// Setup database connection:
-db_connect($db_host, $db_user, $db_pass, $db_name);
+function db_error($result) {
+  global $db_handle;
+
+  if (DB::isError($db_handle)) {
+    return 1;
+  }
+
+  return 0;
+}
 
 ?>
\ No newline at end of file