From 4f49c8b9beebe3e2a8822e00dda723f85f3b8489 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 31 Jan 2012 17:52:46 -0500
Subject: [PATCH] More DB class improvements

---
 src/databases/db_pdo.php   |  6 ++++++
 src/databases/firebird.php | 15 +++++++++++++++
 src/index.php              |  1 +
 src/windows/add_db.php     | 13 ++++++++++++-
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/databases/db_pdo.php b/src/databases/db_pdo.php
index 484ae49..4d63976 100644
--- a/src/databases/db_pdo.php
+++ b/src/databases/db_pdo.php
@@ -12,6 +12,12 @@
 
 // --------------------------------------------------------------------------
 
+// Make sure PDO exists!
+if( ! function_exists('pdo_drivers'))
+{
+	return FALSE;
+}
+
 /**
  * Base Database class
  *
diff --git a/src/databases/firebird.php b/src/databases/firebird.php
index 3b806ac..0da6156 100644
--- a/src/databases/firebird.php
+++ b/src/databases/firebird.php
@@ -27,8 +27,23 @@ class firebird {
 
 	protected $conn;
 	
+	/**
+	 * Open the link to the database
+	 * 
+	 * @param string $db
+	 * @param string $user 
+	 * @param string $pass
+	 */
 	function __construct($db, $user, $pass)
 	{
 		$this->conn = @ibase_connect($db, $user, $pass);
 	}
+
+	/**
+	 * Close the link to the database
+	 */
+	function __destruct()
+	{
+		@ibase_close($this->conn);
+	}
 }
\ No newline at end of file
diff --git a/src/index.php b/src/index.php
index 4c83880..abbb2ef 100644
--- a/src/index.php
+++ b/src/index.php
@@ -42,6 +42,7 @@ function log_fatal()
 
 register_shutdown_function('log_fatal');
 
+// Make sure php-gtk works
 if ( ! class_exists('gtk')) 
 {
     die("Please load the php-gtk2 module in your php.ini\r\n");
diff --git a/src/windows/add_db.php b/src/windows/add_db.php
index f9c807c..2c4b9e2 100644
--- a/src/windows/add_db.php
+++ b/src/windows/add_db.php
@@ -113,8 +113,19 @@ class Add_DB extends GtkWindow {
 			return FALSE;
 		}
 
-		$drivers = pdo_drivers();
+		// Add PDO drivers
+		foreach(pdo_drivers() as $d)
+		{
+			// Skip sqlite2
+			if($d === 'sqlite2')
+			{
+				continue;
+			}
 
+			$drivers[] = $d;
+		}
+
+		// Add firebird support, if exists
 		if(function_exists('ibase_connect'))
 		{
 			$drivers[] = "Firebird";