(no commit message)

diff --git a/inc/ws/Controlleur/packager/_common.php b/inc/ws/Controlleur/packager/_common.php
index de7a2c8f6cb4cd0c968e81a7f39bd7cda008a8a8..8fdc81c2e46f352c73bd5e99f006858d01add2e8 100644 (file)
--- a/inc/ws/Controlleur/packager/_common.php
+++ b/inc/ws/Controlleur/packager/_common.php
@@ -3,5 +3,6 @@ $__autoload['wsPackager'] = dirname(__FILE__) . '/class.ws.packager.php';
 $__autoload['wsPackagerHTML'] = dirname(__FILE__) . '/class.ws.packager.html.php';\r
 $__autoload['wsPackagerWinEXE'] = dirname(__FILE__) . '/class.ws.packager.win.exe.php';\r
 $__autoload['wsPackagerWinCD'] = dirname(__FILE__) . '/class.ws.packager.win.cd.php';\r
+$__autoload['wsPackagerMacEXE'] = dirname(__FILE__) . '/class.ws.packager.mac.exe.php';\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Controlleur/packager/class.ws.packager.html.php b/inc/ws/Controlleur/packager/class.ws.packager.html.php
index 83cf17c8da1b4eaacee7a8c9f892ffe3eecef255..9a2600e711df13be06fdb4f01478fdd10fb82299 100644 (file)
--- a/inc/ws/Controlleur/packager/class.ws.packager.html.php
+++ b/inc/ws/Controlleur/packager/class.ws.packager.html.php
@@ -90,6 +90,7 @@ class wsPackagerHTML extends wsPackager {
 \r
        public function makePackage()\r
        {\r
+               parent::makePackage();\r
                return $this->zip();\r
        }\r
 \r

diff --git a/inc/ws/Controlleur/packager/class.ws.packager.mac.exe.php b/inc/ws/Controlleur/packager/class.ws.packager.mac.exe.php
new file mode 100644 (file)
index 0000000..9335c35
--- /dev/null
+++ b/inc/ws/Controlleur/packager/class.ws.packager.mac.exe.php
@@ -0,0 +1,28 @@
+<?php\r
+class wsPackagerMacEXE extends wsPackager {\r
+       protected $exeName;\r
+\r
+       public function __construct($book_id)\r
+       {\r
+               parent::__construct($book_id);\r
+               $this->version = 'mac-exe';\r
+\r
+               $this->exeName = cubeText::str2URL(mb_substr($this->book->parametres->title, 0, 16));\r
+       }\r
+\r
+       public function preparePackage()\r
+       {\r
+               parent::preparePackage();\r
+\r
+               $this->copyFluidbookFiles();\r
+               $this->copyOtherFiles(array('Fluidbook.app.zip'));\r
+       }\r
+\r
+       public function makePackage()\r
+       {\r
+               parent::makePackage();\r
+               return $this->zip($this->vdir . 'Fluidbook.app.zip');\r
+       }\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/ws/Controlleur/packager/class.ws.packager.php b/inc/ws/Controlleur/packager/class.ws.packager.php
index 8cccff59bc1f60ae6c78b995b546fbda5d092cec..691a5397381f4a45e011c56b6fff016b7d94b150 100644 (file)
--- a/inc/ws/Controlleur/packager/class.ws.packager.php
+++ b/inc/ws/Controlleur/packager/class.ws.packager.php
@@ -13,6 +13,10 @@ class wsPackager {
                        $packager = new wsPackagerHTML($book_id);\r
                } elseif ($version == 'win-exe') {\r
                        $packager = new wsPackagerWinEXE($book_id);\r
+               } elseif ($version == 'win-cd') {\r
+                       $packager = new wsPackagerWinCD($book_id);\r
+               } elseif ($version == 'mac-exe') {\r
+                       $packager = new wsPackagerMacEXE($book_id);\r
                }\r
 \r
                return $packager->makePackage();\r
@@ -41,7 +45,8 @@ class wsPackager {
                $this->initTempDir();\r
        }\r
 \r
-       public function makePackage(){\r
+       public function makePackage()\r
+       {\r
                $this->preparePackage();\r
        }\r
 \r

diff --git a/inc/ws/Controlleur/packager/class.ws.packager.win.exe.php b/inc/ws/Controlleur/packager/class.ws.packager.win.exe.php
index fc63d067d3ba0563cd44007e930bb6d4a4323bdf..94dcc3cef9d5732bcbea3896d3046688d05cc14e 100644 (file)
--- a/inc/ws/Controlleur/packager/class.ws.packager.win.exe.php
+++ b/inc/ws/Controlleur/packager/class.ws.packager.win.exe.php
@@ -7,7 +7,7 @@ class wsPackagerWinEXE extends wsPackager {
                parent::__construct($book_id);\r
                $this->version = 'win-exe';\r
 \r
-               $this->exeName = cubeText::str2URL(mb_substr($this->book->parametres->title, 0, 16));\r
+               $this->exeName = cubeText::str2URL(mb_substr($this->book->parametres->title, 0, 16)).'.exe';\r
        }\r
 \r
        public function preparePackage()\r
@@ -20,6 +20,7 @@ class wsPackagerWinEXE extends wsPackager {
 \r
        public function makePackage()\r
        {\r
+               parent::makePackage();\r
                return $this->zip();\r
        }\r
 }\r