[Dehs-devel] r140 - in trunk: . www

[atomo64-guest at alioth.debian.org]

Author: atomo64-guest
Date: 2008-06-01 23:45:11 +0000 (Sun, 01 Jun 2008)
New Revision: 140

Modified:
   trunk/dehs.config.inc
   trunk/www/config_www.inc
Log:
Revert changes in www/config_www.inc because www-data can't read the file...
dehs.config.inc: use implode, file returns an array (doh)


Modified: trunk/dehs.config.inc
===================================================================
--- trunk/dehs.config.inc	2008-06-01 23:35:59 UTC (rev 139)
+++ trunk/dehs.config.inc	2008-06-01 23:45:11 UTC (rev 140)
@@ -1,6 +1,6 @@
 <?php
 
-$password = file('/srv/alioth.debian.org/chroot/home/groups/dehs/.pgpass');
+$password = implode('',file('/srv/alioth.debian.org/chroot/home/groups/dehs/.pgpass'));
 
 $dbconn = 'dbname=dehs host=localhost user=dehs password=' .  $password;
 

Modified: trunk/www/config_www.inc
===================================================================
--- trunk/www/config_www.inc	2008-06-01 23:35:59 UTC (rev 139)
+++ trunk/www/config_www.inc	2008-06-01 23:45:11 UTC (rev 140)
@@ -1,12 +1,8 @@
 <?php
-
-$password = file('/srv/alioth.debian.org/chroot/home/groups/dehs/.pgpass');
-
-$db = @pg_connect("dbname=dehs host=localhost user=dehs password=$password");
+$db = @pg_connect("dbname=dehs host=localhost");
 if (!$db) {
-	$db = @pg_pconnect("dbname=dehs host=localhost user=dehs password=$password");
+	$db = @pg_pconnect("dbname=dehs host=localhost");
 }
-unset($password);
 if (!$db) {
 	echo "Db error";
 	die(1);