hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-08 02:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix ftp pull task error

Browse Source
This commit is contained in:
aina-esokia
2018-07-16 11:27:41 +04:00
parent 57bc44e0d6
commit 0050908cd3
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/TaskManager/Job/FtpPullJob.php
View File

@@ -94,8 +94,8 @@ class FtpPullJob extends AbstractJob
} }
$ftp = $app['phraseanet.ftp.client']($host, $port, 90, $ssl, $proxy, $proxyport); $ftp = $app['phraseanet.ftp.client']($host, $port, 90, $ssl, $proxy, $proxyport);
$ftp->passive($passive);
$ftp->login($user, $password); $ftp->login($user, $password);
$ftp->passive($passive);
$ftp->chdir($ftpPath); $ftp->chdir($ftpPath);
$list_1 = $ftp->list_directory(true); $list_1 = $ftp->list_directory(true);

4
lib/classes/ftpclient.php
View File

@@ -401,6 +401,10 @@ class ftpclient
$current_dir = $this->pwd(); $current_dir = $this->pwd();
$contents = ftp_rawlist($this->connexion, $current_dir, ! ! $recursive); $contents = ftp_rawlist($this->connexion, $current_dir, ! ! $recursive);
if($contents === false){
throw new Exception('Vérifier les paramètres ftp ou mettre en mode passive');
}
$list = []; $list = [];
foreach ($contents as $content) { foreach ($contents as $content) {