(no commit message)

diff --git a/inc/ws/Controlleur/packager/_common.php b/inc/ws/Controlleur/packager/_common.php
index 8fdc81c2e46f352c73bd5e99f006858d01add2e8..e5bca614a58b4da94cdbb729636dbb3444bf3a95 100644 (file)
--- a/inc/ws/Controlleur/packager/_common.php
+++ b/inc/ws/Controlleur/packager/_common.php
@@ -4,5 +4,6 @@ $__autoload['wsPackagerHTML'] = dirname(__FILE__) . '/class.ws.packager.html.php
 $__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
+$__autoload['wsPackagerWinINST'] = dirname(__FILE__) . '/class.ws.packager.win.inst.php';\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Controlleur/packager/class.ws.packager.mac.exe.php b/inc/ws/Controlleur/packager/class.ws.packager.mac.exe.php
index 9335c357e2762dd7bb6f69e9d99de5e4e352de62..d93ec19ff9c3a22ca701258e8a3c46c8f813892d 100644 (file)
--- a/inc/ws/Controlleur/packager/class.ws.packager.mac.exe.php
+++ b/inc/ws/Controlleur/packager/class.ws.packager.mac.exe.php
@@ -10,7 +10,7 @@ class wsPackagerMacEXE extends wsPackager {
                $this->exeName = cubeText::str2URL(mb_substr($this->book->parametres->title, 0, 16));\r
        }\r
 \r
-       public function preparePackage()\r
+       protected function preparePackage()\r
        {\r
                parent::preparePackage();\r
 \r

diff --git a/inc/ws/Controlleur/packager/class.ws.packager.php b/inc/ws/Controlleur/packager/class.ws.packager.php
index 691a5397381f4a45e011c56b6fff016b7d94b150..7bcd01c9027c4651ca5c72d8391a4e041a4f0915 100644 (file)
--- a/inc/ws/Controlleur/packager/class.ws.packager.php
+++ b/inc/ws/Controlleur/packager/class.ws.packager.php
@@ -15,6 +15,8 @@ class wsPackager {
                        $packager = new wsPackagerWinEXE($book_id);\r
                } elseif ($version == 'win-cd') {\r
                        $packager = new wsPackagerWinCD($book_id);\r
+               } elseif ($version == 'win-ins') {\r
+                       $packager = new wsPackagerWinINST($book_id);\r
                } elseif ($version == 'mac-exe') {\r
                        $packager = new wsPackagerMacEXE($book_id);\r
                }\r
@@ -83,11 +85,39 @@ class wsPackager {
                }\r
        }\r
 \r
+       protected function getBaseFile()\r
+       {\r
+               return $this->version . '-' . date('Ymdhis', TIME) . '-' . cubeText::str2URL($this->book->parametres->title);\r
+       }\r
+\r
+       protected function getRelativeBase()\r
+       {\r
+               return '/packager/download/' . $this->getBaseFile();\r
+       }\r
+\r
+       protected function getURLBase($ext = '')\r
+       {\r
+               $res = '/fluidbook' . $this->getRelativeBase() ;\r
+               if ($ext != '') {\r
+                       $res .= '.' . $ext;\r
+               }\r
+               return $res;\r
+       }\r
+\r
+       protected function getPathBase($ext = '')\r
+       {\r
+               $res = WS_FILES . $this->getRelativeBase();\r
+               if ($ext != '') {\r
+                       $res .= '.' . $ext;\r
+               }\r
+\r
+               return $res;\r
+       }\r
+\r
        protected function zip($zipfile = null)\r
        {\r
-               $base = '/packager/download/' . $this->version . '-' . date('Ymdhis') . '-' . cubeText::str2URL($this->book->parametres->title) . '.zip';\r
-               $url = '/fluidbook' . $base;\r
-               $final = WS_FILES . $base ;\r
+               $url = $this->getURLBase('zip');\r
+               $final = $this->getPathBase('zip');\r
                $rename = false;\r
                if (is_null($zipfile)) {\r
                        $zipfile = $final;\r

diff --git a/inc/ws/Controlleur/packager/class.ws.packager.win.cd.php b/inc/ws/Controlleur/packager/class.ws.packager.win.cd.php
index 9ea107a49b73845ca3046908536589fb393eeec4..d70a06b916ebfa6ad1faab734669276d22fe8bc3 100644 (file)
--- a/inc/ws/Controlleur/packager/class.ws.packager.win.cd.php
+++ b/inc/ws/Controlleur/packager/class.ws.packager.win.cd.php
@@ -6,7 +6,7 @@ class wsPackagerWinCD extends wsPackagerWinEXE {
                $this->version = 'win-cd';\r
        }\r
 \r
-       public function preparePackage()\r
+       protected function preparePackage()\r
        {\r
                parent::preparePackage();\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 94dcc3cef9d5732bcbea3896d3046688d05cc14e..2ebd4e4fe5ed022b67ae1589c39539d041cc9364 100644 (file)
--- a/inc/ws/Controlleur/packager/class.ws.packager.win.exe.php
+++ b/inc/ws/Controlleur/packager/class.ws.packager.win.exe.php
@@ -10,7 +10,7 @@ class wsPackagerWinEXE extends wsPackager {
                $this->exeName = cubeText::str2URL(mb_substr($this->book->parametres->title, 0, 16)).'.exe';\r
        }\r
 \r
-       public function preparePackage()\r
+       protected function preparePackage()\r
        {\r
                parent::preparePackage();\r
 \r

diff --git a/inc/ws/Controlleur/packager/class.ws.packager.win.inst.php b/inc/ws/Controlleur/packager/class.ws.packager.win.inst.php
new file mode 100644 (file)
index 0000000..52958bc
--- /dev/null
+++ b/inc/ws/Controlleur/packager/class.ws.packager.win.inst.php
@@ -0,0 +1,54 @@
+<?php\r
+class wsPackagerWinINST extends wsPackagerWinEXE {\r
+       protected $nsi;\r
+\r
+       public function __construct($book_id)\r
+       {\r
+               parent::__construct($book_id);\r
+               $this->version = 'win-ins';\r
+       }\r
+\r
+       protected function preparePackage()\r
+       {\r
+               parent::preparePackage();\r
+\r
+               $this->copyFluidbookFiles();\r
+               $this->copyOtherFiles(array('Fluidbook.exe' => $this->exeName));\r
+\r
+               $this->makeNSI();\r
+       }\r
+\r
+       protected function makeNSI()\r
+       {\r
+               $winvdir = trim($this->vdir, '/');\r
+               $winvdir = str_replace('/', '\\' , $winvdir);\r
+               $winvdir = "\\" . $winvdir;\r
+\r
+               $nsi = file_get_contents(WS_COMPILE_ASSETS . '/script.nsi');\r
+               $nsi = str_replace('$name', utf8_decode($this->book->parametres->title), $nsi);\r
+               $nsi = str_replace('$htmldir', utf8_decode(WS_COMPILE_ASSETS), $nsi);\r
+               $nsi = str_replace('$fname', str_replace('.exe', '', $this->exeName), $nsi);\r
+               $nsi = str_replace('$fdir', $winvdir, $nsi);\r
+               $nsi = str_replace('$titre', utf8_decode($this->book->parametres->title), $nsi);\r
+               $nsi = str_replace('$lang', 'English', $nsi);\r
+               $nsi = str_replace('$nsisdir', '/usr/local/nsis/nsis-2.46/share/nsis', $nsi);\r
+               $nsi = str_replace('$output', $this->getPathBase('exe'), $nsi);\r
+\r
+               $this->nsi = $nsi;\r
+       }\r
+       public function makePackage()\r
+       {\r
+               $this->preparePackage();\r
+               $url = 'http://installer.fluidbook.com/make.php?nsi=' . base64_encode($this->nsi) ;\r
+               fb($url);\r
+\r
+               file_get_contents('http://installer.fluidbook.com/make.php?nsi=' . base64_encode($this->nsi) . '&junk=' . TIME);\r
+               return $this->getURLBase('exe');\r
+       }\r
+\r
+       public function __destruct()\r
+       {\r
+       }\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index d303ba612f19679df384e0a2fd0ebbfc728fb903..06bc476907525602799799123bf4978addfbcd0f 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -677,7 +677,6 @@ class wsDAOBook extends commonDAO {
 \r
                $filesToCopy['FluidbookDatas.swf'] = $compilerDir . '/FluidbookDatas.swf';\r
                $filesToCopy['FluidbookDatasLight.swf'] = $compilerDir . '/FluidbookDatasLight.swf';\r
-               $filesToCopy['index.swf'] = WS_COMPILE_ASSETS . '/index.swf';\r
                // Copy of files\r
                // Check if dest dir exists\r
                if (!file_exists($finalDir . 'data')) {\r