start of DB driver abstraction class (we'll need similar mechanisms for the GD/ImageMagick photo stuff and perhaps also for abstracting alternate "social networks")

4 files changed, 134 insertions, 1 deletions

diff --git a/include/dba_driver.php b/include/dba_driver.php
new file mode 100644
index 000000000..a1d4dfab3
--- /dev/null
+++ b/include/dba_driver.php
@@ -0,0 +1,10 @@
+<?php /** @file */
+
+abstract class dba_driver {
+
+	abstract protected function connect($server,$user,$pass,$db);
+	abstract protected function q($sql);
+	abstract protected function escape($str);
+	abstract protected function close();
+
+}
\ No newline at end of file
diff --git a/include/dba_mysql.php b/include/dba_mysql.php
new file mode 100644
index 000000000..f3622ee8e
--- /dev/null
+++ b/include/dba_mysql.php
@@ -0,0 +1,63 @@
+<?php
+
+require_once('include/dba_driver.php');
+
+
+abstract class dba_mysql extends dba_driver {
+
+	protected function connect($server,$user,$pass,$db) {
+		$this->db = mysql_connect($server,$user,$pass);
+		if($this->db && mysql_select_db($db,$this->db)) {
+			$this->connected = true;
+		}
+		if($this->connected) {
+			return true;
+		}
+		return false;
+	}
+
+
+	protected function q($sql) {
+		if((! $this->db) || (! $this->connected))
+			return false;
+
+		$this->error = '';
+		$result = @mysql_query($sql,$this->db);
+
+
+		if(mysql_errno($this->db))
+			$this->error = mysql_error($this->db);
+
+		if($result === false || $this->error) {
+			logger('dba_mysql: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
+			if(file_exists('dbfail.out'))
+				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
+		}
+
+		if(($result === true) || ($result === false))
+			return $result;
+
+		$r = array();
+		if(mysql_num_rows($result)) {
+			while($x = mysql_fetch_array($result,MYSQL_ASSOC))
+				$r[] = $x;
+			mysql_free_result($result);
+			if($this->debug)
+				logger('dba_mysql: ' . printable(print_r($r,true)));
+		}
+		return $r;
+	}
+
+	protected function escape($str) {
+		if($this->db && $this->connected) {
+			return @mysql_real_escape_string($str,$this->db);
+		}
+	}
+
+	protected function close() {
+		if($this->db)
+			mysql_close($this->db);
+		$this->connected = false;
+	}
+
+}	
diff --git a/include/dba_mysqli.php b/include/dba_mysqli.php
new file mode 100644
index 000000000..24b8aad6e
--- /dev/null
+++ b/include/dba_mysqli.php
@@ -0,0 +1,60 @@
+<?php /** @file */
+
+require_once('include/dba_driver.php');
+
+abstract class dba_mysqli extends dba_driver {
+
+	protected function connect($server,$user,$pass,$db) {
+		$this->db = @new mysqli($server,$user,$pass,$db);
+		if(! mysqli_connect_errno()) {
+			$this->connected = true;
+		}
+		if($this->connected) {
+			return true;
+		}
+		return false;
+	}
+
+	protected function q($sql) {
+		if((! $this->db) || (! $this->connected))
+			return false;
+
+		$this->error = '';
+		$result = @$this->db->query($sql);
+
+		if($this->db->errno)
+			$this->error = $this->db->error;
+
+		if($result === false || $this->error) {
+			logger('dba_mysqli: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
+			if(file_exists('dbfail.out'))
+				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
+		}
+
+		if(($result === true) || ($result === false))
+			return $result;
+
+		$r = array();
+		if($result->num_rows) {
+			while($x = $result->fetch_array(MYSQLI_ASSOC))
+				$r[] = $x;
+			$result->free_result();
+			if($this->debug)
+				logger('dba_mysqli: ' . printable(print_r($r,true)));
+		}
+		return $r;
+	}
+
+	protected function escape($str) {
+		if($this->db && $this->connected) {
+			return @$this->db->real_escape_string($str);
+		}
+	}
+
+	protected function close() {
+		if($this->db)
+			$this->db->close();
+		$this->connected = flase;
+	}
+
+}
\ No newline at end of file
diff --git a/version.inc b/version.inc
index 4839c76d4..94e7ff86f 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-04-16.285
+2013-04-17.286