wip #5867 @0.75

diff --git a/.env.dev b/.env.dev
index edb11b44f9522d102d4c710c9e93316923bf5e77..31625a6e571ce4f2ff75ad987c6135faff825c49 100644 (file)
--- a/.env.dev
+++ b/.env.dev
@@ -46,6 +46,7 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 SCORM_CLOUD_APP_ID=VAAROP2RFR
 SCORM_CLOUD_SECRET_KEY=7PHpD9pQk4aIjUnlKgF8s89CGlhkIucZHJ3zMXuQ
+SCORM_CLOUD_PREFIX=toolbox_dev_
 
 SLACK_BOT_TOKEN=xoxb-12192359685-3923048219394-EXUQIBSc3VTO6RKr3Plrn1um
 

diff --git a/.env.prod b/.env.prod
index e6aa1676cc409bb91827b50439be394dd8496c40..699ce8a70068486401a669de38e07a65759df4c4 100644 (file)
--- a/.env.prod
+++ b/.env.prod
@@ -46,6 +46,7 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 SCORM_CLOUD_APP_ID=VAAROP2RFR
 SCORM_CLOUD_SECRET_KEY=7PHpD9pQk4aIjUnlKgF8s89CGlhkIucZHJ3zMXuQ
+SCORM_CLOUD_PREFIX=toolbox_dev_
 
 SLACK_BOT_TOKEN=xoxb-12192359685-3923048219394-EXUQIBSc3VTO6RKr3Plrn1um
 

diff --git a/app/Fluidbook/Packager/ChromeOS.php b/app/Fluidbook/Packager/ChromeOS.php
index 9fcccc1a8e856d656d84ff15166dcf97a7352807..539f5777eee066f7a30599b9ea0d27121049fd8f 100644 (file)
--- a/app/Fluidbook/Packager/ChromeOS.php
+++ b/app/Fluidbook/Packager/ChromeOS.php
@@ -33,6 +33,12 @@ class ChromeOS extends Online
         file_put_contents($this->vdir . '/m/manifest.json', json_encode($manifest));
     }
 
+    public function overrideOptions()
+    {
+        parent::overrideOptions();
+        $this->setOfflineOptions();
+    }
+
     public function makePackage($zip)
     {
         $this->preparePackage();

diff --git a/app/Fluidbook/Packager/OfflineHTML.php b/app/Fluidbook/Packager/OfflineHTML.php
index 798f7a75a5d483a118d777244a4fe9e08f074d45..345fc57a473b91d3b21c2883b995b8af7ca8f26c 100644 (file)
--- a/app/Fluidbook/Packager/OfflineHTML.php
+++ b/app/Fluidbook/Packager/OfflineHTML.php
@@ -6,4 +6,10 @@ class OfflineHTML extends Online
 {
     protected $_allowNetworking = 'internal';
     public $type = 'win_html';
+
+    public function overrideOptions()
+    {
+        parent::overrideOptions();
+        $this->setOfflineOptions();
+    }
 }

diff --git a/app/Fluidbook/Packager/Packager.php b/app/Fluidbook/Packager/Packager.php
index 7fc495d57ab8768a3a1527a4f05af17b5d768c79..06ae359c365745d25f9e71c7a96ecc11555ac345 100644 (file)
--- a/app/Fluidbook/Packager/Packager.php
+++ b/app/Fluidbook/Packager/Packager.php
@@ -125,6 +125,7 @@ class Packager extends \App\Jobs\Base
         foreach ($options as $k => $v) {
             $this->book->getSettings()->set($k, $v);
         }
+        $this->overrideOptions();
 
         $this->theme = $this->book->getTheme();
 
@@ -135,6 +136,18 @@ class Packager extends \App\Jobs\Base
         }
     }
 
+    public function overrideOptions()
+    {
+
+    }
+
+    protected function setOfflineOptions()
+    {
+        $this->book->getSettings()->set('actualHtmlExtension', 'html');
+        $this->book->getSettings()->set('seoVersion', false);
+        $this->book->getSettings()->set('scorm_enable', false);
+    }
+
     public function handle()
     {
         PHP::neverStop();

diff --git a/app/Fluidbook/Packager/WindowsZIP.php b/app/Fluidbook/Packager/WindowsZIP.php
index 8cb62ac8a7d392c83a3f0fb30823dc8bdc076836..8461481d19f6e8b82312f4a725b24816132b9794 100644 (file)
--- a/app/Fluidbook/Packager/WindowsZIP.php
+++ b/app/Fluidbook/Packager/WindowsZIP.php
@@ -64,6 +64,12 @@ class WindowsZIP extends Packager
         $this->signExe();
     }
 
+    public function overrideOptions()
+    {
+        parent::overrideOptions();
+        $this->setOfflineOptions();
+    }
+
     protected function setIcon()
     {
 

diff --git a/app/Jobs/DownloadBase.php b/app/Jobs/DownloadBase.php
index ff8cbe6b16d2687bf4241751f1b1d6c6d9c03db3..d6f4dd695d199bddbe3b5ff285f544901d01fd33 100644 (file)
--- a/app/Jobs/DownloadBase.php
+++ b/app/Jobs/DownloadBase.php
@@ -122,7 +122,7 @@ class DownloadBase extends Base
             $showTextIfNotEmail = false;
             try {
                 if ($this->action === 'scormcloud') {
-                    $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;
                 }
             } catch (\Exception $e) {

diff --git a/app/Services/ScormCloud.php b/app/Services/ScormCloud.php
index 35232cd754cf8bd2510e2954240430b31c18c3b0..3a3327776895026b8f17b105aebc681e743a71d8 100644 (file)
--- a/app/Services/ScormCloud.php
+++ b/app/Services/ScormCloud.php
@@ -7,7 +7,7 @@ use InvalidArgumentException;
 
 class ScormCloud
 {
-    public static function send($url,$courseId,$delete=false)
+    public static function send($url, $courseId, $delete = false)
     {
         $config = new V2\Configuration();
         $appId = env('SCORM_CLOUD_APP_ID');
@@ -17,7 +17,7 @@ class ScormCloud
 
         $courseAPI = new V2\Api\CourseApi();
 
-        if($delete) {
+        if ($delete) {
             try {
                 $courseAPI->deleteCourse($courseId);
             } catch (\Exception $e) {