From: Vincent Vanwaelscappel Date: Thu, 21 Oct 2021 10:24:58 +0000 (+0200) Subject: wait #4809 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7748caf069f588e7c65aa0894fd1633e134d708e;p=odl.git wait #4809 @0.5 --- diff --git a/app/Jobs/ProcessFluidbook.php b/app/Jobs/ProcessFluidbook.php index ca6c5aa..402b066 100644 --- a/app/Jobs/ProcessFluidbook.php +++ b/app/Jobs/ProcessFluidbook.php @@ -107,31 +107,18 @@ class ProcessFluidbook extends Compiler $res = []; foreach ($links as $k => $link) { $e = explode(':', $link['to']); + $ee = explode('/', $e[0]); + if ($e[0] === 'pdf') { - $ee = explode('#', $e[1]); + $cc = explode('#', $e[1]); $link['type'] = 16; - $link['to'] = $this->_getAssetFile($ee[0]); + $link['to'] = $this->_getAssetFile($cc[0]); $link['target'] = '_popupiframe'; - $link['pdfpage'] = $ee[1] ?? 1; + $link['pdfpage'] = $cc[1] ?? 1; $link['infobulle'] = "Consulter le document"; - } else if (stripos($e[0], 'video/') === 0) { - $link['type'] = 4; - $link['inline'] = $e[0] === 'video/inline'; - $link['to'] = $this->_getAssetFile($e[1]); - if ($link['inline']) { - $link['video_auto_start'] = false; - $link['video_controls'] = true; - $link['loop'] = false; - $link['sound'] = true; - } else { - $link['video_auto_start'] = true; - $link['video_controls'] = true; - $link['loop'] = false; - $link['sound'] = true; - } - } else if (stripos($e[0], 'audio/') === 0) { - $link['type'] = 17; - $link['inline'] = $e[0] === 'audio/inline'; + } else if ($ee[0] === 'video' || $ee[0] === 'audio') { + $link['type'] = $ee[0] === 'video' ? 4 : 17; + $link['inline'] = $ee[1] === 'inline'; $link['to'] = $this->_getAssetFile($e[1]); if ($link['inline']) { $link['video_auto_start'] = false; @@ -145,7 +132,7 @@ class ProcessFluidbook extends Compiler $link['sound'] = true; } } else if (stripos($e[0], 'slideshow/') === 0) { - $link['inline'] = $e[0] === 'slideshow/inline'; + $link['inline'] = $ee[1] === 'inline'; $link['to'] = $this->_zipAssets($e[1]); if ($link['inline']) { $link['type'] = 15;