(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 0709e3bf8c14004e1220f090a8fbc6637b15e2be..faa3ccbecf0dbbd1fa2da7728e7ab8193c7c6acf 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -876,7 +876,6 @@ class wsAjax extends cubeAjax {
        }\r
 \r
        public static function exportbookExe($args, &$x) {\r
-               fb($_POST);\r
 \r
                $dest = array('dir' => null, 'file' => null);\r
                if (isset($_POST['destination']) && is_array($_POST['destination'])) {\r

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index e380b5b6755bfb54022c14eb6da60c31dc843a89..f8f77b0926ffe82cbdb04438be4c53b1fcec380c 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -388,7 +388,9 @@ class wsExporter {
        }
 
        protected function _download() {
-               $this->x->addRedirection(wsPackager::package($this->book_id, $this->version));
+               $r = wsPackager::package($this->book_id, $this->version);
+               fb($r);
+               $this->x->addRedirection($r);
        }
 
        protected function _getVersion($version) {
@@ -429,5 +431,4 @@ class wsExporter {
        }
 
 }
-
 ?>

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 b909d74a8580f5ea5c514001c79466a6086fb2dc..1a5d7976a4aaeeaf90f14d63139a18dd534d3745 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.inst.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.inst.php
@@ -51,17 +51,17 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
 \r
        public function makePackage($zip) {\r
                $this->preparePackage();\r
-               if (SERVER == 'dictator') {\r
-                       $url = 'http://installer.fluidbook.com/make.php?nsi=' . base64_encode($this->nsi) . '&junk=' . TIME;\r
-                       file_get_contents($url);\r
-               } else {\r
-                       $tmp=cubeFiles::tempnam();\r
-                       file_put_contents($tmp, $this->nsi);\r
-                       $makensis=new cubeCommandLine('makensis');\r
-                       $makensis->setArg(null,$tmp);\r
-                       $makensis->execute();\r
-                       unlink($tmp);\r
-               }\r
+\r
+               $tmp = cubeFiles::tempnam();\r
+               file_put_contents($tmp, $this->nsi);\r
+               $makensis = new cubeCommandLine('makensis');\r
+               $makensis->setArg(null, $tmp);\r
+               $makensis->execute();\r
+\r
+               fb($this->nsi);\r
+               fb($makensis->command);\r
+               fb($makensis->output);\r
+               unlink($tmp);\r
 \r
 \r
                return $this->getURLBase('exe');\r