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

Merge pull request #2681 from aynsix/PHRAS-2092-admin-task-ftp-pull

Browse Source 
PHRAS-2092 admin / task-manager / ftp-pull task : generate errors and stops
This commit is contained in:
Nicolas Maillat
2018-07-16 16:37:33 +02:00
committed by GitHub
parent c9c6906308 0050908cd3
commit c90a5ec4f4
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->passive($passive);
$ftp->login($user, $password);
$ftp->passive($passive);
$ftp->chdir($ftpPath);
$list_1 = $ftp->list_directory(true);

4
lib/classes/ftpclient.php
View File

@@ -401,6 +401,10 @@ class ftpclient
$current_dir = $this->pwd();
$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 = [];
foreach ($contents as $content) {