--- inc/conn.inc	2001/09/19 09:31:19	1.4
+++ inc/conn.inc	2001/11/20 08:48:14	1.7
@@ -1,7 +1,9 @@
 <?
-	require('class.DBI');
+//	require('class.DBI');
+	require("dbi_pgsql.php");
+
 	$db="plivasi";
-	$dbh = new DBI("dbi:pg:$db","dpavlin","");
+	$dbh = new DBI($db,"dpavlin","");
 
 	if (!$WAP && ( strstr($accept,"text/vnd.wap.wml") || strstr($accept,"hdml;version=3.0") ) ) {
 		Header("Location: wap.php");
@@ -20,7 +22,7 @@
 	$sth->execute();
 	global $menu_item;
 	if ($row=$sth->fetchrow_hash()) {
-		$menu_item=$row[0];
+		$menu_item=str_replace("\\n"," ",$row[0]);
 	}
 
 	// generate random numbers of pictures on top-right corner
@@ -30,8 +32,10 @@
 
 	// parse /preview url
 
+	global $visible_is_true;
+
 	$preview_url="/preview";
-	if (substr($globals[request_uri],0,strlen($preview_url)) == $preview_url) {
+	if (substr($GLOBALS[REQUEST_URI],0,strlen($preview_url)) == $preview_url) {
 		$is_preview=1;
 		$visible_is_true = "true";	// visible can be true or false
 	} else {