wip #6527

diff --git a/src/Transfer/FTP.php b/src/Transfer/FTP.php
index a43496c0742d960d4495e522c50e79b8b7815ccd..605a90d437affaa6fd350b2ac62c2623b8fda342 100644 (file)
--- 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;