From 4e33083a9ccd2f756860d6ba86d370865d502097 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 26 Sep 2013 07:50:17 +0000
Subject: [PATCH]

---
 inc/ws/Controlleur/class.ws.services.php      | 7 ++++---
 inc/ws/Util/class.ws.exporter.php             | 2 ++
 inc/ws/Util/html5/class.ws.html5.compiler.php | 3 ++-
 inc/ws/Util/packager/class.ws.packager.php    | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 176a8f1a3..d7dbef522 100644
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -771,16 +771,17 @@ class wsServices extends cubeFlashGateway {
 
 	protected function _getRegExpManifest($r, $book, $theme, $resolution) {
 		$reg = array();
-		$reg['loading'] = array('^' . $r . 'style/(.*).css$', '^' . $r . 'index.html$', '^' . $r . 'data/style/(.*)$', '^' . $r . 'data/(.*).js$', '^' . $r . 'data/images/' . $theme->parametres->logoLoader . '$', '^' . $r . 'style/fonts/(.*).ttf$', '^' . $r . 'data/images/interface-down.svg$');
-		$reg['extras'] = array('^' . $r . 'data/links/(.*)$', '^' . $r . 'data/(.*).pdf$', '^' . $r . 'cover.jpg$');
+		$reg['loading'] = array('^' . $r . 'style/(.*).css$', '^' . $r . 'index.html$', '^' . $r . 'data/style/(.*)$', '^' . $r . 'data/(.*).js$', '^' . $r . 'data/images/' . $theme->parametres->logoLoader . '$', '^' . $r . 'style/fonts/(.*).ttf$', '^' . $r . 'data/images/interface-down.svg$', '^' . $r . 'plugins/(.*)$');
+		$reg['extras'] = array('^' . $r . 'data/links/(.*).mp4$', '^' . $r . 'data/links/(.*).ogv$', '^' . $r . 'data/links/(.*).webm$', '^' . $r . 'data/(.*).pdf$', '^' . $r . 'cover.jpg$');
 		$reg['thumbnails'] = array('^' . $r . 'data/thumbnails/p(\d+).jpg$');
 		for ($i = 1; $i <= $book->parametres->pages; $i++) {
 			$var = 'content_' . $i;
 			$reg[$var] = array('^' . $r . 'data/background/\d+/t' . $i . '.jpg$', '^' . $r . 'data/contents/p' . $i . '.svg$');
 		}
-		$reg['urgents'] = array('^' . $r . 'images/(.*)$', '^' . $r . 'data/images/(.*)$');
+		$reg['urgents'] = array('^' . $r . 'images/(.*)$', '^' . $r . 'data/images/(.*)$', '^' . $r . 'data/links/(.*).jpg$', '^' . $r . 'data/links/(.*).png$');
 		$reg['loading'] = array_merge($reg['loading'], $reg['urgents']);
 
+
 		$exclude = array();
 		if ($resolution == 150) {
 			$er = 300;
diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 8de9f9553..e380b5b67 100644
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -250,6 +250,8 @@ class wsExporter {
 
 		$packager = new wsPackagerPhonegap($this->book_id, $d, true, false, $this->version);
 		$packager->home = true;
+		$packager->book->parametres->mobileVideosPath = '';
+
 		return $packager->makePackage(false);
 	}
 
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index f36343b8d..6ba012087 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -192,6 +192,7 @@ class wsHTML5Compiler {
 
 		$this->daoBook = new wsDAOBook($core->con);
 		$this->book = $this->daoBook->selectById($book_id);
+		$this->book->parametres->mobileVideosPath = '';
 		$this->pages = $this->daoBook->getPagesOfBook($book_id);
 
 		if ($this->book->parametres->mobileVersion == 'html5-images') {
@@ -509,7 +510,7 @@ class wsHTML5Compiler {
 		}
 
 		$scripts = array();
-		$scripts[] = '<script type="text/javascript" charset="utf-8" src="http://argo.fluidbook.com:8234/target/target-script-min.js#fb_html5_'.$this->book_id.'"></script>';
+		$scripts[] = '<script type="text/javascript" charset="utf-8" src="http://argo.fluidbook.com:8234/target/target-script-min.js#fb_html5_' . $this->book_id . '"></script>';
 		foreach ($this->debugJsFiles as $js) {
 			$scripts[] = '<script type="text/javascript" charset="utf-8" src="' . $js . '"></script>';
 		}
diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index f96592959..3245a794b 100644
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -4,7 +4,7 @@ class wsPackager {
 
 	protected $dir;
 	protected $vdir;
-	protected $book;
+	public $book;
 	protected $pages;
 	protected $theme;
 	protected $version;
-- 
2.39.5