[ppa-cvs] CVS: phpPgAdmin all_db.php,1.6,1.7

[Dan W. <kil...@us...>]

Update of /cvsroot/phppgadmin/phpPgAdmin
In directory usw-pr-cvs1:/tmp/cvs-serv7593

Modified Files:
	all_db.php 
Log Message:
Fixed bug #545580 -- only_db setting wasn't being enforced on all_db view

Index: all_db.php
===================================================================
RCS file: /cvsroot/phppgadmin/phpPgAdmin/all_db.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** all_db.php	28 May 2002 21:09:43 -0000	1.6
--- all_db.php	28 May 2002 22:32:14 -0000	1.7
***************
*** 17,41 ****
  }
  
  if ($common_ver < 7.0) {
! 	$sql_get_dbs = "
! 		SELECT datname, usename AS owner, 'unknown' AS enc
! 		FROM pg_database d, pg_user u 
! 		WHERE d.datdba = u.usesysid AND datname NOT LIKE 'template_' $qrUserOnly
! 		UNION
! 		SELECT datname, NULL AS owner, 'unknown' AS enc
! 		FROM pg_database
! 		WHERE datdba NOT IN (SELECT usesysid FROM pg_user) AND datname NOT LIKE 'template_' $qrUserOnly
! 	";
  } else {
! 	$sql_get_dbs = "
! 		SELECT datname, usename AS owner, pg_encoding_to_char(encoding) AS enc
! 		FROM pg_database d, pg_user u 
! 		WHERE d.datdba = u.usesysid AND datname NOT LIKE 'template_' $qrUserOnly
! 		UNION
! 		SELECT datname, NULL AS owner, pg_encoding_to_char(encoding) AS enc
! 		FROM pg_database
! 		WHERE datdba NOT IN (SELECT usesysid FROM pg_user) AND datname NOT LIKE 'template_' $qrUserOnly
! 	";
  }
  
  $dbs = pg_exec($link, pre_query($sql_get_dbs)) or pg_die(pg_errormessage(), $sql_get_dbs, __FILE__, __LINE__);
--- 17,37 ----
  }
  
+ $qrOnlyDB = empty($cfgServer['only_db']) ? "" : " AND datname = '" . $cfgServer['only_db'] . "'";
+ 
  if ($common_ver < 7.0) {
! 	$qrEncoding = "'unknown'";
  } else {
! 	$qrEncoding = "pg_encoding_to_char(encoding)";
  }
+ 
+ $sql_get_dbs = "
+ 	SELECT datname, usename AS owner, pg_encoding_to_char(encoding) AS enc
+ 	FROM pg_database d, pg_user u 
+ 	WHERE d.datdba = u.usesysid AND datname NOT LIKE 'template_' $qrUserOnly $qrOnlyDB
+ 	UNION
+ 	SELECT datname, NULL AS owner, $qrEncoding AS enc
+ 	FROM pg_database
+ 	WHERE datdba NOT IN (SELECT usesysid FROM pg_user) AND datname NOT LIKE 'template_' $qrUserOnly $qrOnlyDB
+ ";
  
  $dbs = pg_exec($link, pre_query($sql_get_dbs)) or pg_die(pg_errormessage(), $sql_get_dbs, __FILE__, __LINE__);