(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 2c4e0be0498bb0134f9d48808eb2586f9bad0f55..0622ce6ec9d4745a7ff3e49ddc143117972fb11a 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -115,6 +115,9 @@ class wsFlash extends cubeFlashGateway {
                $php->setArg('HTTP_HOST', $_SERVER['HTTP_HOST']);\r
                $php->setNohup(true);\r
                $php->execute('exec');\r
+               \r
+               fb($php->commande);\r
+               fb($php->output);\r
 \r
                $this->xml->addChild('command', html::escapeHTML($php->command));\r
                exit;\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index b37d2e86796514ffa70811c9d9945c3bdd089e5a..f7cabebb77467391d194563a923f1e58c23116e4 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -349,7 +349,7 @@ class wsHTML5Compiler {
                $lines[] = 'index.html* index.html';
                $lines[] = '';
                $lines[] = 'CACHE:';
-               $assets = array('images', 'style', 'swf', 'data/style', 'data/images', 'data/fluidbook.js');
+               $assets = array('images', 'style', 'swf', 'data/style', 'data/images', 'data/fluidbook.js','data/datas.js');
 
                $pages = $this->book->parametres->pages + 1;
 
@@ -690,9 +690,9 @@ class wsHTML5Compiler {
        }
 
        protected function writeJs() {
-               $config = $this->writeConfig();
+               file_put_contents($this->vdir . '/data/datas.js', $this->writeConfig());
                $finals = array('fluidbook' => $this->jsFiles, 'widget' => $this->widgetJsFiles);
-
+               fb($this->vdir . '/data/datas.js');
 
                foreach ($finals as $jsfinal => $files) {
                        $mintime = 0;
@@ -735,7 +735,7 @@ class wsHTML5Compiler {
                        file_put_contents($this->vdir . '/data/' . $jsfinal . '.js', $js);
                }
 
-               file_put_contents($this->vdir . '/data/datas.js', $config);
+               
                if ($this->phonegap) {
                        $this->copy($this->assets . '/js/libs/phonegap/cordova-' . $this->phonegap . '.js', $this->vdir . '/data/cordova.js');
                }

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 163719d72fb24d7121d11016a4fda4d331df7bde..152bc0d6578ed98c9132a3c2ce78a61af2ea6054 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -201,7 +201,7 @@ class wsPackagerHTML extends wsPackager {
                        $this->copy(WS_COMPILE_ASSETS . '/_html5/' . $f, $dest . '/' . $f);\r
                }\r
 \r
-               $filesToDelete = array('indext.html', 'indexu.html', 'data/datas.js');\r
+               $filesToDelete = array('indext.html', 'indexu.html');\r
                if ($this->book->parametres->mobileVersion == 'html5') {\r
                        $filesToDelete[] = 'data/background/*/t*.jpg';\r
                        $filesToDelete[] = 'data/background/contents/p*.html';\r