lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: FTP login

Browse Source
This commit is contained in:
Laurent Destailleur 2012-12-18 20:58:50 +01:00
parent dff532159d
commit c0b3690a11
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/ftp/index.php
View File

@ -155,7 +155,7 @@ if ($_REQUEST['action'] == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes'
if (! $conn_id) if (! $conn_id)
{ {
$newsectioniso=utf8_decode($section); $newsectioniso=utf8_decode($section);
$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso); $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
$conn_id=$resultarray['conn_id']; $conn_id=$resultarray['conn_id'];
$ok=$resultarray['ok']; $ok=$resultarray['ok'];
$mesg=$resultarray['mesg']; $mesg=$resultarray['mesg'];
@ -200,7 +200,7 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
if (! $conn_id) if (! $conn_id)
{ {
$newsectioniso=utf8_decode($section); $newsectioniso=utf8_decode($section);
$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso); $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
$conn_id=$resultarray['conn_id']; $conn_id=$resultarray['conn_id'];
$ok=$resultarray['ok']; $ok=$resultarray['ok'];
$mesg=$resultarray['mesg']; $mesg=$resultarray['mesg'];
@ -253,7 +253,7 @@ if ($_REQUEST['action'] == 'confirm_deletesection' && $_REQUEST['confirm'] == 'y
if (! $conn_id) if (! $conn_id)
{ {
$newsectioniso=utf8_decode($section); $newsectioniso=utf8_decode($section);
$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso); $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
$conn_id=$resultarray['conn_id']; $conn_id=$resultarray['conn_id'];
$ok=$resultarray['ok']; $ok=$resultarray['ok'];
$mesg=$resultarray['mesg']; $mesg=$resultarray['mesg'];
@ -293,7 +293,7 @@ if ($_REQUEST['action'] == 'download')
if (! $conn_id) if (! $conn_id)
{ {
$newsectioniso=utf8_decode($section); $newsectioniso=utf8_decode($section);
$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso); $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
$conn_id=$resultarray['conn_id']; $conn_id=$resultarray['conn_id'];
$ok=$resultarray['ok']; $ok=$resultarray['ok'];
$mesg=$resultarray['mesg']; $mesg=$resultarray['mesg'];
@ -470,7 +470,7 @@ else
// set up a connection or die // set up a connection or die
if (! $conn_id) if (! $conn_id)
{ {
$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section); $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive);
$conn_id=$resultarray['conn_id']; $conn_id=$resultarray['conn_id'];
$ok=$resultarray['ok']; $ok=$resultarray['ok'];
$mesg=$resultarray['mesg']; $mesg=$resultarray['mesg'];
@ -645,7 +645,7 @@ llxFooter();
*/ */
function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive=0) function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive=0)
{ {
global $langs; global $langs, $conf;
$ok=1; $ok=1;
@ -657,7 +657,7 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
if ($ok) if ($ok)
{ {
$conn_id = ftp_connect($ftp_server, $ftp_port, 20); $conn_id = ftp_connect($ftp_server, $ftp_port, (empty($conf->global->FTP_CONNECT_TIMEOUT)?40:$conf->global->FTP_CONNECT_TIMEOUT));
if ($conn_id) if ($conn_id)
{ {
if ($ftp_user) if ($ftp_user)