From d69e88435c32b2618332afe4869b531835093d1f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 18 Dec 2012 23:45:51 +0100 Subject: [PATCH] Add option to have alternative method when ftp does not work --- htdocs/ftp/index.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index 426759d6999..fb433529364 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -657,7 +657,9 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect if ($ok) { - $conn_id = ftp_connect($ftp_server, $ftp_port, (empty($conf->global->FTP_CONNECT_TIMEOUT)?40:$conf->global->FTP_CONNECT_TIMEOUT)); + $connecttimeout=(empty($conf->global->FTP_CONNECT_TIMEOUT)?40:$conf->global->FTP_CONNECT_TIMEOUT); + if (! empty($conf->global->FTP_CONNECT_WITH_SSL)) $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout); + else $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout); if ($conn_id) { if ($ftp_user)