WIP #440 @5

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index bdb1f5651cdcd8aa852146dd93562be9319f9fbc..5abd570ab0b925be71a6d80d1618403160af244b 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -499,9 +499,9 @@ class wsFlash extends cubeFlashGateway {
                $this->json = false;
                $this->json = true;
 
-               $types = array(1, 2, 3, 4, 5, 6, 7, 11, 13, 14, 15, 16, 17);
+               $types = array(1, 2, 3, 4, 5, 6, 7, 11, 13, 14, 15, 16, 17, 18, 19, 24, 25);
                if (wsDroits::revendeur()) {
-                       $types = array(1, 2, 3, 4, 5, 6, 7, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21);
+                       $types = array(1, 2, 3, 4, 5, 6, 7, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 24, 25);
                }
                if (wsDroits::admin()) {
                        $types = range(1, 30);

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index fc74f946c88dffeede9f0af936576d57c420591e..024ca97754444bab11395076c8cd751822af8806 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1200,7 +1200,7 @@ class wsDAOBook extends commonDAO {
                                        $flex->addBitmap($workingDir . '/' . $link['to'], 'link_datas_' . $id);
                                }
                                $imagesassets[$id] = true;
-                       } else if (in_array($link['type'], array(4, 6, 7, 9, 16, 17))) {
+                       } else if (in_array($link['type'], array(4, 6, 7, 9, 16, 17, 25))) {
                                $workingFile = $workingDir . '/' . $link['to'];
                                if (file_exists($workingFile)) {
                                        $filesToCopy['data/' . $link['to']] = $workingFile;

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index fe563d07117ef86b2b95ec9eb997f4a78faa8141..261bc1952fcba4f7f907fe65eb1dd2afda78f625 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -772,6 +772,11 @@ class wsHTML5Compiler {
                $this->config->bookmarkGroups[] = array('page' => ($link['page']), 'nb' => $link['to'], 'name' => $link['extra']);
        }
 
+       public function addAudiodescription($link) {
+               $this->config->audiodescription[$link['page']] = $link['to'];
+               $this->copyLinkFile($link['to'], 'data/audiodescription/');
+       }
+
        protected function writeJs() {
                $config = $this->writeConfig();
                file_put_contents($this->vdir . '/data/datas.js', $config);

diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 36055e7fdbe7d72b474b955f146290851cca1440..5beea33366e773b6eedf464f2d12e7b4f562392d 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -108,13 +108,13 @@ class wsHTML5Link {
                        case 21:
                        case 6:
                                return self::getMultimediaInstance($id, $init, $compiler);
-                               break;
                        case 23:
                                return new statsTagLink($id, $init, $compiler);
-                               break;
-                       case
-                       24:
+                       case 24:
                                return new phoneLink($id, $init, $compiler);
+                       case 25:
+                               $compiler->addAudiodescription($init);
+                               break;
                        default:
                                return null;
                }