From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 13 Feb 2023 18:17:50 +0000 (+0100)
Subject: wip #5700 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=0a08671051f3887a507f788d0f7c9aa4ea1b118c;p=fluidbook-toolbox.git

wip #5700 @0.5
---

diff --git a/app/Fluidbook/Packager/Download.php b/app/Fluidbook/Packager/Download.php
index 4a9a893d6..6c4e0da38 100644
--- a/app/Fluidbook/Packager/Download.php
+++ b/app/Fluidbook/Packager/Download.php
@@ -19,10 +19,8 @@ class Download extends DownloadBase
     protected $type = 'Fluidbook';
     // __('Fluidbook ":title" (#:nb) prêt au téléchargement')
     protected $_subject = 'Fluidbook ":title" (#:nb) prêt au téléchargement';
-    // __('Fluidbook ":title" (#:nb) installé sur hosting')
-    protected $_installHostingSubject = 'Fluidbook ":title" (#:nb) installé sur hosting';
-    // __('Fluidbook ":title" (#:nb) installé sur un serveur FTP')
-    protected $_installFTPSubject = 'Fluidbook ":title" (#:nb) installé sur hosting';
+    // __('Fluidbook ":title" (#:nb) installé sur :server')
+    protected $_installSubject = 'Fluidbook ":title" (#:nb) installé sur :server';
 
     public function __construct($entry, $version, $action, $user)
     {
@@ -96,12 +94,11 @@ class Download extends DownloadBase
                 if (!$dest) {
                     throw new \Exception('No path defined for external server installation');
                 }
-                $subject = __($this->_installHostingSubject, ['title' => $this->_title(), 'nb' => $this->_id()]);
+                $subject = __($this->_installSubject, ['title' => $this->_title(), 'nb' => $this->_id(), 'server' => $server->name]);
                 $path = $this->_compileandpackage(false);
 
                 $driver = $server->getTransferDriver();
-                $cmd = $driver->copy($path, $dest, false, true);
-                $cmd->dd();
+                $driver->copy($path, $dest, false, false);
 
                 $url = $server->makeURL($dest);
                 if (null !== $url) {
diff --git a/composer.lock b/composer.lock
index 33e49a52a..1475e7b71 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1712,13 +1712,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "c29d86d8b3a96982fc4ae82b411beb905f3cca8f"
+                "reference": "612b646c92beff84bb422a48680450270aee7188"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-041f34.tar",
-                "reference": "c29d86d8b3a96982fc4ae82b411beb905f3cca8f",
-                "shasum": "839f34e89c67c6b9c1cd96295dbbaaa1c378a9fb"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-fb9b36.tar",
+                "reference": "612b646c92beff84bb422a48680450270aee7188",
+                "shasum": "28c7f1aff4471fcb5447e05970a75c4950560563"
             },
             "require": {
                 "backpack/backupmanager": "^3.0",
@@ -1800,7 +1800,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2023-02-10T18:28:29+00:00"
+            "time": "2023-02-13T17:05:54+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -2098,13 +2098,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_net.git",
-                "reference": "c7e86c950bac79f1f8f05627c120cdabd77c572a"
+                "reference": "e213e6046d77cc20ee479b8c14f83421d24ee2e1"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-b52505.tar",
-                "reference": "c7e86c950bac79f1f8f05627c120cdabd77c572a",
-                "shasum": "dd64e294afe5c54b0e9fbc5fde179918f756e64d"
+                "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-efc712.tar",
+                "reference": "e213e6046d77cc20ee479b8c14f83421d24ee2e1",
+                "shasum": "f3a041071c026628a35308b157886bcf0ca93395"
             },
             "require": {
                 "cubist/util": "dev-master",
@@ -2128,7 +2128,7 @@
                 }
             ],
             "description": "net cubist composer package",
-            "time": "2023-01-27T14:43:25+00:00"
+            "time": "2023-02-13T17:05:40+00:00"
         },
         {
             "name": "cubist/pdf",
@@ -2223,13 +2223,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_util.git",
-                "reference": "9c379ada28a41672fdaeae328c5d4ab1d1579ddc"
+                "reference": "714ff12cfdb84730b11c28b24bbe40957fb845dc"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-54b85e.tar",
-                "reference": "9c379ada28a41672fdaeae328c5d4ab1d1579ddc",
-                "shasum": "8c7bf70c044f4493e179137292b0f59d79d57fcd"
+                "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-53a8e7.tar",
+                "reference": "714ff12cfdb84730b11c28b24bbe40957fb845dc",
+                "shasum": "a58cedad00a24769293c5a8a9ec483d41aa1443a"
             },
             "require": {
                 "cubist/net": "dev-master",
@@ -2261,7 +2261,7 @@
                 }
             ],
             "description": "Utilities class",
-            "time": "2023-02-10T13:34:52+00:00"
+            "time": "2023-02-13T17:11:35+00:00"
         },
         {
             "name": "cviebrock/eloquent-sluggable",