From 51034ae5f5a5291a45c30cd78b4eeb5dadedd84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20M=C3=BCller?= <om@omnis.ch>
Date: Tue, 21 Aug 2001 07:32:44 +0000
Subject: [PATCH]         * lib.inc.php3: fixed the socket patch, should work
 now

---
 ChangeLog    |  1 +
 lib.inc.php3 | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eb27465fc..32606fa99 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2001-08-21  Olivier Müller  <om@omnis.ch>
 	* db_stats.php3: added list of 20 biggest db's
+	* lib.inc.php3: fixed the socket patch, should work now
 
 2001-08-21  Loïc Chapeaux  <lolo@phpheaven.net>
 	* db_stats.php3: ensured the script is XHTML1.0 compliant and fits the
diff --git a/lib.inc.php3 b/lib.inc.php3
index db9f3da13..a8de36d58 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -266,9 +266,10 @@ if (!defined('__LIB_INC__')){
                 $server_port   = (empty($cfgServer['port']))
                                ? ''
                                : ':' . $cfgServer['port'];
-                $server_socket = (empty($cfgServer['socket']) || PMA_INT_VERSION < 30010)
+                $server_socket = (empty($cfgServer['socket']) || PMA_INT_VERSION >= 30010)
                                ? ''
                                : ':' . $cfgServer['socket'];
+
                 $dbh           = @$connect_func(
                                      $cfgServer['host'] . $server_port . $server_socket,
                                      $cfgServer['stduser'],
@@ -359,11 +360,20 @@ if (!defined('__LIB_INC__')){
         } // end Advanced authentication
 
         // Do connect to the user's database
-        if (empty($cfgServer['port'])) {
-            $link = $connect_func($cfgServer['host'], $cfgServer['user'], $cfgServer['password']) or mysql_die();
-        } else {
-            $link = $connect_func($cfgServer['host'] . ':' . $cfgServer['port'], $cfgServer['user'], $cfgServer['password']) or mysql_die();
-        }
+
+        $server_port   = (empty($cfgServer['port']))
+                       ? ''
+                       : ':' . $cfgServer['port'];
+        $server_socket = (empty($cfgServer['socket']) || PMA_INT_VERSION >= 30010)
+                       ? ''
+                       : ':' . $cfgServer['socket'];
+
+        $dbh           = $connect_func(
+                             $cfgServer['host'] . $server_port . $server_socket,
+                             $cfgServer['user'],
+                             $cfgServer['password']
+                         ) or mysql_die();
+
     } // end server connecting
 
     /**