(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 19b612440bd6d8d09512e26a11a14762ddb3ae61..b18e87f683eca930e8f49ee56bbf69df77b94adb 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -624,6 +624,13 @@ class wsDAOBook extends commonDAO {
                $flex = new cubeFlexCompiler('FluidbookDatas', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);\r
                $flexLight = new cubeFlexCompiler('FluidbookDatasLight', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);\r
                $flex->addVariable('links', $links , false, true, 'JSONObject');\r
+\r
+               foreach($links as $link) {\r
+                       if ($link['type'] == 15) {\r
+                               $flex->addBitmap($workingDir . '/' . $link['to'], 'link_datas_' . $link['id']);\r
+                       }\r
+               }\r
+\r
                $flex->addVariable('signature', $exportSignature, false, true, 'JSONObject');\r
                $flexLight->addVariable('datas', $book->parametres->toStandardObject(), false, true, 'JSONObject');\r
                $flexLight->addVariable('id', $book_id, false, true, 'uint');\r

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 82096b7e16efda7f53a4fb4b9bc824f614481977..8ac704cf957f2fb04e6ed438449349f1c5b6a149 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -253,7 +253,6 @@ class wsDAODocument extends commonDAO {
 \r
                        $c->rulers = json_encode(array());\r
                        $c->insert();\r
-                       fb($c->getInsert());\r
                }\r
 \r
                $c = $this->con->openCursor('books');\r
@@ -298,6 +297,7 @@ class wsDAODocument extends commonDAO {
                                foreach($l as $link) {\r
                                        $link = (array)$link;\r
                                        $link['page'] = $p;\r
+                                       $link['id'] = $i;\r
                                        $links[] = $link;\r
                                }\r
                        }\r