From 375bb0314d2d227f6900fec10c5a69f29e84d682 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 3 Oct 2009 12:20:42 +0000
Subject: [PATCH] should not use mysql_connect() directly

---
 server_synchronize.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/server_synchronize.php b/server_synchronize.php
index cd3eb4d34..745ad1c1f 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -58,7 +58,6 @@ if ((isset($_REQUEST['submit_connect']))) {
       ${"{$con}_socket"}   = $_REQUEST[$con.'_socket'];
       ${"{$con}_db"}       = $_REQUEST[$con.'_db'];
       ${"{$con}_type"}	   = $_REQUEST[$con.'_type'];
-      ${"{$con}_url"}	   = '';
       
       if (${"{$con}_type"}=='cur') {
 	${"{$con}_connection"} = null;
@@ -67,18 +66,15 @@ if ((isset($_REQUEST['submit_connect']))) {
       }
       
       if (isset(${"{$con}_socket"}) && !empty(${"{$con}_socket"})) {
-	${"{$con}_url"}              = ':'.${"{$con}_socket"};
 	${"{$con}_server"}['socket'] = ${"{$con}_socket"};
       } else {
-	${"{$con}_url"} = ${"{$con}_host"};
 	${"{$con}_server"}['host'] = ${"{$con}_host"};
 	if (isset(${"{$con}_port"}) && !empty(${"{$con}_port"}) && ((int)${"{$con}_port"}*1)>0) {
-	  ${"{$con}_url"}           .= ':' . ${"{$con}_port"};
 	  ${"{$con}_server"}['port'] = ${"{$con}_port"};
 	}
       }
             
-      ${"{$con}_connection"} = @mysql_connect(${"{$con}_url"}, ${"{$con}_username"}, ${"{$con}_password"});
+      ${"{$con}_connection"} = PMA_DBI_connect(${"{$con}_username"}, ${"{$con}_password"}, $is_controluser = false, ${"{$con}_server"});
     }
     
     if ((!$src_connection && $src_type=='rmt') || (!$trg_connection && $trg_type=='rmt')) {