From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 20 Mar 2012 13:08:09 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=0d2b1317f716df26046eb437501eb501e0a3b713;p=cubeextranet.git

---

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index aeec00571..b2967b135 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -412,13 +412,13 @@ class wsDAOBook extends commonDAO {
 	}
 
 	public function setChapters($book_id, $json) {
-		$chapters = json_decode($json,TRUE);
+		$chapters = json_decode($json, TRUE);
 		$res = array();
 
 		foreach ($chapters as $c) {
 			$c['label'] = trim($c['label']);
 			$n = (string) $c['page'];
-			$c['label'] = trim(preg_replace('|' . $n . '$|', '', $c['label']));
+			$c['label'] = trim(preg_replace('|' . $n . '$|iu', '', $c['label']));
 			$res[] = $c;
 		}
 
@@ -766,7 +766,7 @@ class wsDAOBook extends commonDAO {
 			return;
 		}
 
-		$res = $this->compile3($book_id, $complete);
+		$res = $this->compile3($book_id, $complete, $book);
 		$this->compile1($book_id);
 		$this->touchCompile($book_id);
 		return $res;
@@ -1136,7 +1136,7 @@ class wsDAOBook extends commonDAO {
 			$it = new imageTools();
 
 
-			$image = WS_DOCS . '/' . $page['document_id'] . '/html/t36-' . $page['document_page'] . '.jpg';
+			$image = WS_DOCS . '/' . $page['document_id'] . '/html/t150-' . $page['document_page'] . '.jpg';
 
 
 			try {
@@ -1157,6 +1157,8 @@ class wsDAOBook extends commonDAO {
 			$jpg2swf->setArg('o', $tempswf[$i]);
 			$jpg2swf->setArg(null, $tempimage[$i]);
 			$jpg2swf->execute();
+			
+			fb($jpg2swf);
 
 			$swfcombine->setArg(null, $tempswf[$i]);
 		}
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index da091c080..755ad37ad 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -454,6 +454,7 @@ class wsHTML5Compiler {
 		foreach (self::$resolutions as $r) {
 			mkdir($this->vdir . '/data/background/' . $r, 0777, true);
 		}
+		$srcPrefix=$this->backgroundsPrefix;
 		if ($this->backgroundsPrefix == 'p') {
 			$srcPrefix = 'h';
 		}