From a8d73a41d575d1d6ff1d1b0df7fcb1bc5dc0a1eb Mon Sep 17 00:00:00 2001 From: soufiane Date: Thu, 30 Nov 2023 15:21:41 +0100 Subject: [PATCH] wip #6527 --- src/Transfer/FTP.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Transfer/FTP.php b/src/Transfer/FTP.php index a43496c..605a90d 100644 --- a/src/Transfer/FTP.php +++ b/src/Transfer/FTP.php @@ -22,7 +22,7 @@ class FTP extends Driver { $lftp = new LFTP(); $lftp->setServer($this->getServer()); $lftp->setSrc($source); - $lftp->setDest(rtrim($this->getServer()->getBasePath(), '/') . '/' . trim($dest, '/') . '/'); + $lftp->setDest($dest); $lftp->setMirror($mirror); $lftp->setDryRun($dryrun); $lftp->execute(); @@ -40,20 +40,18 @@ class FTP extends Driver { 'username' => $data['username'] ?? $this->getServer()->getUsername(), 'password' => $data['password'] ?? $this->getServer()->getPassword(), 'host' => $data['host'] ?? $this->getServer()->getHost(), - 'port' => $data['port'] ?? $this->getServer()->getPort(), + 'port' => array_key_exists('port',$data) ? $data['port'] : $this->getServer()->getPort(), ]; if(!$data['host']) { return self::ERROR_MISSING_HOST; } else { - // Mise en place d'une connexion basique if($data['port'] !== 22) { $ftp = ftp_connect($data['host'], $data['port']) or die(static::ERROR_INVALID_PARAM); } else { $ftp = ftp_connect($data['host']) or die(static::ERROR_INVALID_PARAM); } - // Tentative d'identification if (@ftp_login($ftp, $data['username'], $data['password'])) { ftp_close($ftp); return true; -- 2.39.5