From 8f64ce9d072b4c7a4bb4765843eafa34657ff7d8 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 30 Nov 2012 16:29:36 +0000 Subject: [PATCH] --- inc/ws/Util/packager/class.ws.packager.v1.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php index 9090e2a7a..f1d155289 100644 --- a/inc/ws/Util/packager/class.ws.packager.v1.php +++ b/inc/ws/Util/packager/class.ws.packager.v1.php @@ -24,7 +24,7 @@ class wsPackagerV1 extends wsPackagerHTML { } protected function compile() { - + } protected function copyFluidbookFiles() { @@ -94,6 +94,11 @@ class wsPackagerV1 extends wsPackagerHTML { $link['left'] = $link['left'] + $this->size[0]; } + if ($link['type'] == 4 && !$link['inline']) { + $link['type'] = 1; + $link['to'].='$' . $link['video_width'] . '$' . $link['video_height']; + } + if ($link['type'] > 6) { if ($link['type'] == 15) { $link['type'] = 6; @@ -106,7 +111,7 @@ class wsPackagerV1 extends wsPackagerHTML { $link['to'] = $this->__virtualToPhysical($link['to']); } - if ($this->_copyWorkingFile($link['to']) && !in_array($link['type'], array( 4, 6))) { + if ($this->_copyWorkingFile($link['to']) && !in_array($link['type'], array(4, 6))) { $link['to'] = 'data/' . $link['to']; } @@ -269,7 +274,7 @@ class wsPackagerV1 extends wsPackagerHTML { } protected function _copyWorkingFile($file, $dir = null) { - + $e = explode("$", $file); $file = array_shift($e); if (is_null($dir)) { @@ -278,7 +283,7 @@ class wsPackagerV1 extends wsPackagerHTML { $src = $this->workingDir . '/' . $file; if (file_exists($src) && is_file($src)) { - $res= $this->copy($src, $dir . $file); + $res = $this->copy($src, $dir . $file); return $res; } return false; -- 2.39.5