From: ioguix <ioguix>
Date: Mon, 18 Feb 2008 21:42:47 +0000 (+0000)
Subject: document additional options for ssl connectiong, mainly needed by old libpq clients
X-Git-Tag: REL_4-2-BETA-2~16
X-Git-Url: http://git.postgresql.org/gitweb/review?a=commitdiff_plain;h=4ac2b0f94637c425cce32285a46793e02450ab9d;p=phppgadmin.git

document additional options for ssl connectiong, mainly needed by old libpq clients
---

diff --git a/classes/database/Connection.php b/classes/database/Connection.php
index 90d0f72a..935e979e 100755
--- a/classes/database/Connection.php
+++ b/classes/database/Connection.php
@@ -3,7 +3,7 @@
 /**
  * Class to represent a database connection
  *
- * $Id: Connection.php,v 1.14 2007/09/11 11:39:58 xzilla Exp $
+ * $Id: Connection.php,v 1.15 2008/02/18 21:42:47 ioguix Exp $
  */
 
 include_once('./classes/database/ADODB_base.php');
@@ -32,9 +32,12 @@ class Connection {
 		else
 			$pghost = "{$host}:{$port}";
 
-		// Add sslmode to $pghost if set
-		if ($sslmode !== null && $sslmode != '')
-			$pghost .= ':'.$sslmode;
+		// Add sslmode to $pghost as needed
+                if (($sslmode == 'disable') || ($sslmode == 'allow') || ($sslmode == 'prefer') || ($sslmode == 'require')) {
+                        $pghost .= ':'.$sslmode;
+                } elseif ($sslmode == 'legacy') {
+                        $pghost .= ' requiressl=1';
+                }
 
 		$this->conn->connect($pghost, $user, $password, $database);
 	}