(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index bd1c2f1430bcaa0b65622de4ca820debff59c103..f4e8d60204787e322a6a83953403e0f19d26d8fe 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -424,7 +424,7 @@ class wsFlash extends cubeFlashGateway {
                global $core;\r
                $dao = new wsDAOBook($core->con);\r
                $book = $dao->selectById($this->args['book_id']);\r
-               $this->xml->addChild('chapters', json_encode($book->chapters));\r
+               $this->xml->addChild('chapters', html::escapeHTML(json_encode($book->chapters)));\r
        }\r
 \r
        public function getLinks()\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index a2ee69deb96449085c4adfd8b66b76084b2b31d6..71856ab5ee962a8365559d364c8d77a233e8ca92 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -406,6 +406,13 @@ html{height:100%}' . "\n";
                }\r
        }\r
 \r
+       public static function testOldLink($args)\r
+       {\r
+               global $core;\r
+               $daoDoc = new wsDAODocument($core->con);\r
+               $daoDoc->setLinksFromOldFluidbook($args[1]);\r
+       }\r
+\r
        protected static function updateDocument($document_id)\r
        {\r
                global $core;\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 80450b3bd849d5eb6783d42f3ad9410340732ba9..f35d5774f3184804d50e6eaaa3094a4d7a0f35fe 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -319,7 +319,7 @@ class wsDAOBook extends commonDAO {
 \r
        public function setChaptersFromOldFluidbook($book_id)\r
        {\r
-               $xml = simplexml_load_file('http://ws.fluidbook.com/books/' . $book_id . '/links.xml');\r
+               $xml = simplexml_load_file('http://ws.fluidbook.com/books/' . $book_id . '/data/links.xml');\r
                $res = array();\r
                $chapters = $xml->xpath('//chapters');\r
                foreach($chapters as $ch) {\r

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 3793f62750a5f50ec156445293accae24b7705e2..d9dd18f8f6213c7aa0357d2ea3de75a4b635ff31 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -31,6 +31,9 @@ class wsDAODocument extends commonDAO {
 \r
                for($page = 1;$page <= $document->generalInfos['pages'];$page++) {\r
                        $csv = WS_DOCS . '/' . $document->document_id . '/p' . $page . '.csv';\r
+                       if(!file_exists($csv)){\r
+                               continue;\r
+                       }\r
                        $c->update = filemtime($csv);\r
                        $fp = fopen($csv, 'rb');\r
                        $links = array();\r
@@ -106,6 +109,10 @@ class wsDAODocument extends commonDAO {
                        }\r
                        $c->insert();\r
                }\r
+\r
+               $c = $this->con->openCursor('books');\r
+               $c->changedate = TIME;\r
+               $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
        }\r
 \r
        public function setLinksFromOldFluidbook($book_id)\r
@@ -144,26 +151,40 @@ class wsDAODocument extends commonDAO {
                $res = array();\r
                $lpages = array();\r
                foreach($links as $l) {\r
+                       if ((string)$l->page == '') {\r
+                               continue;\r
+                       }\r
+\r
                        $link = array();\r
-                       $link['page'] = (string)$l['page'];\r
+                       $link['page'] = (string)$l->page;\r
                        $link['numerotation'] = false;\r
-                       $link['left'] = intval((string)$l['startX']);\r
-                       $link['width'] = intval((string)$l['endX']) - $link['left'];\r
+                       $link['left'] = intval((string)$l->startX);\r
+                       $link['width'] = intval((string)$l->endX) - $link['left'];\r
                        if ($link['left'] > $width) {\r
                                $link['page']++;\r
                                $link['left'] -= $width;\r
                        }\r
                        $page = $link['page'];\r
-                       $link['top'] = intval((string)$l['startY']);\r
-                       $link['height'] = intval((string)$l['endY']) - $link['top'];\r
+                       $link['top'] = intval((string)$l->startY);\r
+                       $link['height'] = intval((string)$l->endY) - $link['top'];\r
                        $link['infobulle'] = '';\r
                        $link['target'] = '_blank';\r
-                       $link['to'] = (string)$l['linkTo'];\r
-                       $link['type'] = intval((string)$l['linkType']);\r
-                       $link['video_loop'] = ((string)$l['loopFlag'] == '1');\r
+                       $link['to'] = (string)$l->linkTo;\r
+                       $link['type'] = intval((string)$l->linkType);\r
+                       $link['video_loop'] = ((string)$l->loopFlag == '1');\r
                        $link['video_auto_start'] = true;\r
-                       $link['video_controls'] = ((string)$l['playerActive'] == '1');\r
-                       $link['video_sound_on'] = ((string)$l['soundOn'] == '1');\r
+                       $link['video_controls'] = ((string)$l->playerActive == '1');\r
+                       $link['video_sound_on'] = ((string)$l->soundOn == '1');\r
+\r
+                       if ($link['type'] == '4' || $link['type'] == '6') {\r
+                               if (!stristr($link['to'], ':/')) {\r
+                                       $dir = WS_BOOKS . '/working/' . $book_id . '/';\r
+                                       if (!file_exists($dir)) {\r
+                                               mkdir($dir, 0755, true);\r
+                                       }\r
+                                       copy('http://ws.fluidbook.com/books/' . $book_id . '/data/' . $link['to'], $dir . '/' . $link['to']);\r
+                               }\r
+                       }\r
 \r
                        if (!isset($lpages[$page])) {\r
                                $lpages[$page] = array();\r
@@ -184,6 +205,10 @@ class wsDAODocument extends commonDAO {
                        $c->rulers = json_encode(array());\r
                        $c->insert();\r
                }\r
+\r
+               $c = $this->con->openCursor('books');\r
+               $c->changedate = TIME;\r
+               $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
        }\r
 \r
        public function getLinksAndRulers($book_id, &$links, &$rulers)\r
@@ -202,6 +227,7 @@ class wsDAODocument extends commonDAO {
                $rulers = array();\r
 \r
                $sql = 'SELECT *,CONCAT(document_id,\',\',document_page) AS doc_page FROM document_links WHERE (document_id,document_page) IN(' . implode(',', $couples) . ') ORDER BY `update` DESC, FIELD(doc_page,' . implode(',', $couples_order) . ') LIMIT ' . count($pages);\r
+               fb($sql);\r
                $r = $this->con->select($sql);\r
                $i = 1;\r
                while ($r->fetch()) {\r