wip #1233 @0:15

diff --git a/inc/ws/Util/packager/class.ws.packager.mac.exe.php b/inc/ws/Util/packager/class.ws.packager.mac.exe.php
index 0dbe800add343b01d5aa59aad0ffc19c2150690a..4da84c196bde3b070ba9e7a3833660bff807c4d5 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.mac.exe.php
+++ b/inc/ws/Util/packager/class.ws.packager.mac.exe.php
@@ -1,27 +1,26 @@
 <?php\r
+\r
 class wsPackagerMacEXE extends wsPackager {\r
        protected $exeName;\r
 \r
-       public function __construct($book_id)\r
-       {\r
+       public function __construct($book_id) {\r
                parent::__construct($book_id);\r
                $this->version = 'mac-exe';\r
+               $this->book->parametres->alwaysHTML5 = false;\r
 \r
                $this->exeName = cubeText::str2URL(mb_substr($this->book->parametres->title, 0, 30));\r
        }\r
 \r
-       protected function preparePackage()\r
-       {\r
+       protected function preparePackage() {\r
                parent::preparePackage();\r
 \r
                $this->copyFluidbookFiles();\r
                $this->copyOtherFiles(array('Fluidbook.app.zip'));\r
        }\r
 \r
-       public function makePackage($zip)\r
-       {\r
+       public function makePackage($zip) {\r
                parent::makePackage($zip);\r
-               $res=$this->zip($this->vdir . 'Fluidbook.app.zip');\r
+               $res = $this->zip($this->vdir . 'Fluidbook.app.zip');\r
                $this->postPackage();\r
                return $res;\r
        }\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.cd.php b/inc/ws/Util/packager/class.ws.packager.win.cd.php
index 333648642e33501315c07357b999faaf8892adea..a21310e7b8d7eb15648838df54029ce671b3b79a 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.cd.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.cd.php
@@ -4,6 +4,7 @@ class wsPackagerWinCD extends wsPackagerMacEXE {
 \r
        public function __construct($book_id) {\r
                parent::__construct($book_id);\r
+               $this->book->parametres->alwaysHTML5=false;\r
                $this->version = 'win-cd';\r
        }\r
 \r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.php b/inc/ws/Util/packager/class.ws.packager.win.exe.php
index d5d640e43851b3e1ed548f2b7fcdf25688b5e9d1..819c1a8e3de75a3484a77e6b3a2b20400fbc635b 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.exe.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.exe.php
@@ -7,6 +7,7 @@ class wsPackagerWinEXE extends wsPackager {
        public function __construct($book_id) {\r
                parent::__construct($book_id);\r
                $this->version = 'win-exe';\r
+               $this->book->parametres->alwaysHTML5=false;\r
 \r
                if ($this->book->parametres->offlineTitle == "") {\r
                        $this->exeName = cubeText::str2URL(mb_substr($this->book->parametres->title, 0, 30)) . '.exe';\r
@@ -29,6 +30,4 @@ class wsPackagerWinEXE extends wsPackager {
                return $res;\r
        }\r
 \r
-}\r
-\r
-?>
\ No newline at end of file
+}
\ No newline at end of file

diff --git a/inc/ws/Util/packager/class.ws.packager.win.inst.php b/inc/ws/Util/packager/class.ws.packager.win.inst.php
index 010a1b7c49ebd349e8d4d9af23044ab7e91e02d3..e5f943394c603f833c370de75229996c26712f04 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.inst.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.inst.php
@@ -7,6 +7,7 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
        public function __construct($book_id) {\r
                parent::__construct($book_id);\r
                $this->version = 'win-ins';\r
+               $this->book->parametres->alwaysHTML5 = false;\r
        }\r
 \r
        protected function preparePackage() {\r