From 744efac81a8d703075af0d00bbd89056e65183f2 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 30 Apr 2013 10:02:28 +0000
Subject: [PATCH]

---
 inc/ws/Controlleur/class.ws.flash.php           | 3 +++
 inc/ws/Util/html5/class.ws.html5.compiler.php   | 8 ++++----
 inc/ws/Util/packager/class.ws.packager.html.php | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 2c4e0be04..0622ce6ec 100644
--- 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']);
 		$php->setNohup(true);
 		$php->execute('exec');
+		
+		fb($php->commande);
+		fb($php->output);
 
 		$this->xml->addChild('command', html::escapeHTML($php->command));
 		exit;
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index b37d2e867..f7cabebb7 100644
--- 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 163719d72..152bc0d65 100644
--- 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);
 		}
 
-		$filesToDelete = array('indext.html', 'indexu.html', 'data/datas.js');
+		$filesToDelete = array('indext.html', 'indexu.html');
 		if ($this->book->parametres->mobileVersion == 'html5') {
 			$filesToDelete[] = 'data/background/*/t*.jpg';
 			$filesToDelete[] = 'data/background/contents/p*.html';
-- 
2.39.5