(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php
index d7aac95f9336d5f242562497e8a478a5889ab59e..55a0e7bb1e8e0dc25e724cfe569062428b981e41 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.core.php
+++ b/inc/extranet/Controlleur/class.extranet.core.php
@@ -340,6 +340,7 @@ class extranetCore extends cubeCore {
                $db->books->date_status('integer', 0, false);\r
                $db->books->parametres('text', 0, false);\r
                $db->books->chapters('text',0,false);\r
+               $db->books->links('text',0,false);\r
                $db->books->date('integer', 0, false);\r
                // Clés\r
                $db->books->primary('pk_books', 'book_id');\r

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 0c37aef827a7d06788d9bea104e713ba7462211c..af82a84c3511340466a94d615ccd805f46946f1d 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -165,9 +165,9 @@ class wsFlash extends cubeFlashGateway {
                        $t->addAttribute('nom', $theme->nom);\r
                        if (isset($book) && $theme->theme_id == $book->theme) {\r
                                $t->addAttribute('selected', '1');\r
-                               $mine=true;\r
-                       }else{\r
-                               $mine=false;\r
+                               $mine = true;\r
+                       } else {\r
+                               $mine = false;\r
                        }\r
                        if ($core->user->ws_grade == 4) {\r
                                $right = 'w';\r
@@ -179,7 +179,7 @@ class wsFlash extends cubeFlashGateway {
                                $right = '-';\r
                        }\r
                        $t->addAttribute('right', $right);\r
-                       $t->addAttribute('books', ($theme->nbBooks)-($mine?'1':'0'));\r
+                       $t->addAttribute('books', ($theme->nbBooks) - ($mine?'1':'0'));\r
                }\r
        }\r
 \r
@@ -299,6 +299,25 @@ class wsFlash extends cubeFlashGateway {
                $this->xml->addChild('chapters', json_encode($book->chapters));\r
        }\r
 \r
+       public function getLinks()\r
+       {\r
+               global $core;\r
+               $dao = new wsDAOBook($core->con);\r
+               $book = $dao->selectById($this->args['book_id']);\r
+               $this->xml->addChild('links', json_encode($book->links));\r
+               $pages = $dao->getPagesOfBook($this->args['book_id']);\r
+               $nb_pages = count($pages);\r
+               $this->xml->addChild('pages', $nb_pages);\r
+\r
+               $daoDoc = new wsDAODocument($core->con);\r
+               $firstDoc = $daoDoc->selectById($pages[1]['document_id']);\r
+               $size = $firstDoc->generalInfos['size'];\r
+\r
+               $this->xml->addChild('width', $size[0]);\r
+               $this->xml->addChild('height', $size[1]);\r
+               fb($book->links);\r
+       }\r
+\r
        public function formatSize($val)\r
        {\r
                $str = files::size($val);\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 2fbd80a42d6d9abf6a4a3f3d60cd4bcc3a21c815..4cb9ca96ecacef39775f3034e9d990a95b38204e 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -23,6 +23,12 @@ class wsDAOBook extends extranetDAO {
                        $book->chapters = json_decode($r->chapters, false);\r
                }\r
 \r
+               if ($r->links == '') {\r
+                       $book->links = $this->getLinksFromCSV($r->book_id);\r
+               } else {\r
+                       $book->links = json_decode($r->links, false);\r
+               }\r
+\r
                $p = unserialize($r->parametres);\r
                if (!$p || $p->isEmpty()) {\r
                        $p = new wsBookParametres($book);\r
@@ -248,6 +254,43 @@ class wsDAOBook extends extranetDAO {
                $c->chapters = json_encode(json_decode($json, false));\r
                $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
        }\r
+\r
+       public function getLinksFromCSV($book_id)\r
+       {\r
+               $pages = $this->getPagesOfBook($book_id);\r
+               $res = array();\r
+               foreach($pages as $page => $p) {\r
+                       $csv = ROOT . '/docs/' . $p['document_id'] . '/p' . $p['document_page'] . '.csv';\r
+                       $fp = fopen($csv, 'rb');\r
+\r
+                       while (true) {\r
+                               $line = fgetcsv($fp, 512, ';', '"');\r
+                               // End of file\r
+                               if (!$line) {\r
+                                       break;\r
+                               }\r
+                               // Commentaire || ligne vide\r
+                               if (substr($line[0], 0, 1) == '#' || is_null($line[0])) {\r
+                                       continue;\r
+                               }\r
+                               $link = array();\r
+                               $cols = array('page' => '', 'type' => '', 'to' => '','left'=>'', 'top' => '', 'width' => '', 'height' => '', 'target' => '_blank', 'video_loop' => '1', 'video_auto_start' => '1', 'video_controls' => '1', 'video_sound_on' => '1');\r
+                               $k = 0;\r
+                               foreach($cols as $col => $default) {\r
+                                       if (isset($line[$k])) {\r
+                                               $link[$col] = $line[$k];\r
+                                       } else {\r
+                                               $link[$col] = $default;\r
+                                       }\r
+                                       $k++;\r
+                               }\r
+                               $link['page'] = $page;\r
+                               $res[] = $link;\r
+                               fb($link);\r
+                       }\r
+               }\r
+               return $res;\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.book.php b/inc/ws/Metier/class.ws.book.php
index dd3b20046f4c0c79db6b1318b5c0a3fa51625d17..5ca097864256f08db03e5492035963851fe5ef29 100644 (file)
--- a/inc/ws/Metier/class.ws.book.php
+++ b/inc/ws/Metier/class.ws.book.php
@@ -26,6 +26,7 @@ class wsBook extends cubeMetier {
        protected $pages;\r
 \r
        protected $chapters;\r
+       protected $links;\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/swf/_src/assets/fleches-fb3d.png b/swf/_src/assets/fleches-fb3d.png
new file mode 100644 (file)
index 0000000..4cb8651
Binary files /dev/null and b/swf/_src/assets/fleches-fb3d.png differ

diff --git a/swf/_src/wsComposer.fla b/swf/_src/wsComposer.fla
index f98be38ea0e1d55073859eaf3ad320b545d17a89..3c47a9df403c7f6171821ebf802a13433ac4b318 100644 (file)
Binary files a/swf/_src/wsComposer.fla and b/swf/_src/wsComposer.fla differ