(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index aeec005711c027107dc7583e555a237089bd66e3..b2967b13527aa2fa3e78c649d59cec4ead219f78 100644 (file)
--- 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 {
        }\r
 \r
        public function setChapters($book_id, $json) {\r
-               $chapters = json_decode($json,TRUE);\r
+               $chapters = json_decode($json, TRUE);\r
                $res = array();\r
 \r
                foreach ($chapters as $c) {\r
                        $c['label'] = trim($c['label']);\r
                        $n = (string) $c['page'];\r
-                       $c['label'] = trim(preg_replace('|' . $n . '$|', '', $c['label']));\r
+                       $c['label'] = trim(preg_replace('|' . $n . '$|iu', '', $c['label']));\r
                        $res[] = $c;\r
                }\r
 \r
@@ -766,7 +766,7 @@ class wsDAOBook extends commonDAO {
                        return;\r
                }\r
 \r
-               $res = $this->compile3($book_id, $complete);\r
+               $res = $this->compile3($book_id, $complete, $book);\r
                $this->compile1($book_id);\r
                $this->touchCompile($book_id);\r
                return $res;\r
@@ -1136,7 +1136,7 @@ class wsDAOBook extends commonDAO {
                        $it = new imageTools();\r
 \r
 \r
-                       $image = WS_DOCS . '/' . $page['document_id'] . '/html/t36-' . $page['document_page'] . '.jpg';\r
+                       $image = WS_DOCS . '/' . $page['document_id'] . '/html/t150-' . $page['document_page'] . '.jpg';\r
 \r
 \r
                        try {\r
@@ -1157,6 +1157,8 @@ class wsDAOBook extends commonDAO {
                        $jpg2swf->setArg('o', $tempswf[$i]);\r
                        $jpg2swf->setArg(null, $tempimage[$i]);\r
                        $jpg2swf->execute();\r
+                       \r
+                       fb($jpg2swf);\r
 \r
                        $swfcombine->setArg(null, $tempswf[$i]);\r
                }\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index da091c080c9397790fe752e15ba5b91a9be4c7d2..755ad37ad2ecfb1348d520cb43fad7e4c0c82003 100644 (file)
--- 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';
                }