hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-25 19:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1531 from jygaulier/PHRAS-750_ftp-proxy-auth

Browse Source 
#PHRAS-750 #time 10m
This commit is contained in:
jygaulier
2015-10-07 18:49:42 +02:00
parent 741bb26980 7d5b779ae6
commit 2fddc3fd96
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/classes/task/period/ftp.php
View File

@@ -18,6 +18,8 @@ class task_period_ftp extends task_appboxAbstract
{ {
protected $proxy; protected $proxy;
protected $proxyport; protected $proxyport;
protected $proxyuser;
protected $proxypwd;
/** /**
* *
@@ -273,6 +275,8 @@ class task_period_ftp extends task_appboxAbstract
{ {
$this->proxy = (string) $sx_task_settings->proxy; $this->proxy = (string) $sx_task_settings->proxy;
$this->proxyport = (string) $sx_task_settings->proxyport; $this->proxyport = (string) $sx_task_settings->proxyport;
$this->proxyuser = (string) $sx_task_settings->proxyuser;
$this->proxypwd = (string) $sx_task_settings->proxypwd;
parent::loadSettings($sx_task_settings); parent::loadSettings($sx_task_settings);
} }
@@ -376,7 +380,10 @@ class task_period_ftp extends task_appboxAbstract
try { try {
$ssl = ($ftp_export['ssl'] == '1'); $ssl = ($ftp_export['ssl'] == '1');
$ftp_client = $this->dependencyContainer['phraseanet.ftp.client']($ftp_server, 21, 300, $ssl, $this->proxy, $this->proxyport); $ftp_client = $this->dependencyContainer['phraseanet.ftp.client'](
$ftp_server, 21, 300, $ssl, $this->proxy, $this->proxyport,
$this->proxyuser, $this->proxypwd
);
$ftp_client->login($ftp_user_name, $ftp_user_pass); $ftp_client->login($ftp_user_name, $ftp_user_pass);
if ($ftp_export["passif"] == "1") { if ($ftp_export["passif"] == "1") {