From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 7 Nov 2023 06:31:16 +0000 (+0100)
Subject: Merge branch 'backpack5' into quiz2
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d525a95908947893d35ecc3b85ac3fe049d42ea6;p=fluidbook-toolbox.git

Merge branch 'backpack5' into quiz2

# Conflicts:
#	composer.json
#	composer.lock
---

d525a95908947893d35ecc3b85ac3fe049d42ea6
diff --cc app/Fluidbook/Packager/Download.php
index ff91d6ccc,c9b1ef2c1..a6a477c14
--- a/app/Fluidbook/Packager/Download.php
+++ b/app/Fluidbook/Packager/Download.php
@@@ -97,8 -104,9 +104,9 @@@ class Download extends DownloadBas
  
                  if ($this->action === 'scormcloud') {
                      try {
 -                        $scormURL = ScormCloud::send($url, 'toolbox_' . $this->type . '_' . $this->_id());
 +                        $scormURL = ScormCloud::send($url, env('SCORM_CLOUD_PREFIX', 'toolbox_') . $this->type . '_' . $this->_id());
                          $actions[__('Tester sur SCORM Cloud')] = $scormURL;
+                         $res[] = $url;
                      } catch (\Exception $e) {
  
                      }
diff --cc composer.json
index 865e6deee,bcf4980f5..b7fdb85d6
--- a/composer.json
+++ b/composer.json
@@@ -52,8 -52,9 +52,10 @@@
          "rickselby/laravel-gate-cache": "^3.6",
          "rodneyrehm/plist": "^2.0",
          "rustici-software/scormcloud-api-v2-client-php": "^2.1.0",
+         "simplesoftwareio/simple-qrcode": "^4.2",
 +        "ryangjchandler/standalone-blade": "^0.2.0",
-         "symfony/http-client": "^v6.3.0"
+         "symfony/http-client": "^v6.3.0",
+         "voku/simple_html_dom": "^4.8"
      },
      "require-dev": {
          "spatie/laravel-ignition": "^2.1.3",