--- inc/conn.php	2001/04/20 08:25:32	1.1
+++ inc/conn.php	2001/04/25 13:18:50	1.4
@@ -1,15 +1,19 @@
 <?php
 	include("inc/class.DBI");
 	include("inc/stuff.php");
-	function DBOpen($db = "education", $user = "test", $pass = "test") {
+	function DBOpen($db = "education", $user = "dpavlin", $pass = "", $host = "localhost") {
 		global $DBD, $DBH;
 		if ($DBH && $DBH->dbh) return;
-		$DBH = new DBI("dbi:$DBD:$db", $user, $pass);
+		$str = "dbi:$DBD:$db";
+		if ($host) $str .= ";host=$host";
+		$DBH = new DBI($str, $user, $pass);
 		if (!$DBH->dbh) {
-			$err = $DBH->errstr;
+			$err = "";
+			if ($DBH) $DBH->errstr;
 			if (!$err) $err = "???";
-			echo "[Cannot connect to &quot;$db&quot;: $err]<BR>\n";
-			unset($DBH);
+			echo "<PRE>[Cannot connect to &quot;$db&quot;: $err]</PRE><BR>\n";
+			unset($GLOBALS['DBH']);
+			exit;
 		}
 		$DBH->dbh_do("SET DATESTYLE='ISO'");
 	}
@@ -17,11 +21,12 @@
 		global $DBH;
 		if (!$DBH || !$DBH->dbh) return;
 		$DBH->disconnect();
-		unset($DBH);
+		unset($GLOBALS['DBH']);
 	}
 	function &DBQuery($q) {
 		global $DBH;
 		if (!$DBH || !$DBH->dbh) return array();
+		$DBH->errstr = "";
 		$ret = array();
 		if (eregi('^\s*SELECT', $q)) {
 			$sth = $DBH->prepare($q);