wait #7802 @2

diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php
index e24f145296b0045c9ef1caa00896592f4b7585de..9f9e2766dbfdc48b6cbe3c5bbc601a1b088e86bf 100644 (file)
--- a/app/Fluidbook/Compiler/Compiler.php
+++ b/app/Fluidbook/Compiler/Compiler.php
@@ -1289,8 +1289,6 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
 
     protected function writeScorm()
     {
-
-
         if (!$this->fluidbookSettings->scorm_title) {
             $this->fluidbookSettings->scorm_title = $this->fluidbookSettings->title;
         }

diff --git a/app/Fluidbook/Packager/Online.php b/app/Fluidbook/Packager/Online.php
index c66a348cedb9d0a85c6c5bca1a9d6e57241a182a..d87e45836563a13e9ebd6789a571563e5bf9a478 100644 (file)
--- a/app/Fluidbook/Packager/Online.php
+++ b/app/Fluidbook/Packager/Online.php
@@ -18,7 +18,7 @@ class Online extends Packager
     {
         parent::preparePackage();
 
-        $this->book->getSettings()->set('scorm_enable', $this->scormVariant);
+        $this->book->getSettings()->set('scorm_enable', $this->variant === 'scorm');
 
         $this->_ext = $this->book->getSettings()->get('htmlExtension');
         $this->book->getSettings()->set('actualHtmlExtension', $this->_ext);

diff --git a/app/Fluidbook/Packager/Packager.php b/app/Fluidbook/Packager/Packager.php
index d83961ac1a553bf8cf73db3fcd37cce2551e9155..b4e48ed370f5c22597b2f7c39dd560e555592623 100644 (file)
--- a/app/Fluidbook/Packager/Packager.php
+++ b/app/Fluidbook/Packager/Packager.php
@@ -25,7 +25,7 @@ class Packager extends \App\Jobs\Base
     public $book;
     /** @var FluidbookTheme */
     protected $theme;
-    protected $scormVariant = false;
+    protected $variant = 'online';
     protected $book_id;
     protected $themeRoot;
     protected $zip;
@@ -129,7 +129,6 @@ class Packager extends \App\Jobs\Base
         $this->vdir = $vdir;
         $this->dir = Files::mkdir($this->packager_path('/' . $book_id));
 
-
         $forceCompile = false;
         if (count($options)) {
             $options['forceCompileOnDownload'] = true;
@@ -188,7 +187,7 @@ class Packager extends \App\Jobs\Base
      */
     protected function compile($forceCompile = false)
     {
-        $compiler = new Compiler($this->book, $this->scormVariant);
+        $compiler = new Compiler($this->book, $this->variant);
         $compiler->handle();
     }
 
@@ -323,7 +322,7 @@ class Packager extends \App\Jobs\Base
             $dest = $this->vdir;
         }
 
-        $compiler = new Compiler($book, $this->scormVariant, false, "latest", null, false, false, false, null, $hybrid);
+        $compiler = new Compiler($book, $this->variant, false, "latest", null, false, false, false, null, $hybrid);
         $compiler->handle();
 
         $rsync = new CommandLine\Rsync(rtrim($compiler->getFinalPath(), '/'), $dest, true);

diff --git a/app/Fluidbook/Packager/Scorm.php b/app/Fluidbook/Packager/Scorm.php
index c7f4c0d14bc770b93d33f4c21c1b42a428628292..108e0ec77accf3ccf6e279a6f89038b98fb77b31 100644 (file)
--- a/app/Fluidbook/Packager/Scorm.php
+++ b/app/Fluidbook/Packager/Scorm.php
@@ -3,8 +3,7 @@
 namespace App\Fluidbook\Packager;
 class Scorm extends Online
 {
-    protected $scormVariant = true;
-
+    protected $variant = 'scorm';
     public $type = 'scorm';
 
     protected function preparePackage()