From 8cfe827682b6fca1bebfcd2a3e567378aa698129 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 17 Apr 2023 11:09:18 +0200 Subject: [PATCH] wip #5867 @0.75 --- .env.dev | 1 + .env.prod | 1 + app/Fluidbook/Packager/ChromeOS.php | 6 ++++++ app/Fluidbook/Packager/OfflineHTML.php | 6 ++++++ app/Fluidbook/Packager/Packager.php | 13 +++++++++++++ app/Fluidbook/Packager/WindowsZIP.php | 6 ++++++ app/Jobs/DownloadBase.php | 2 +- app/Services/ScormCloud.php | 4 ++-- 8 files changed, 36 insertions(+), 3 deletions(-) diff --git a/.env.dev b/.env.dev index edb11b44f..31625a6e5 100644 --- 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 e6aa1676c..699ce8a70 100644 --- 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 9fcccc1a8..539f5777e 100644 --- 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 798f7a75a..345fc57a4 100644 --- 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 7fc495d57..06ae359c3 100644 --- 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 8cb62ac8a..8461481d1 100644 --- 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 ff8cbe6b1..d6f4dd695 100644 --- 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 35232cd75..3a3327776 100644 --- 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) { -- 2.39.5