From 67866ea08673740e3555143536a6c855e281a8db Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 19 Jun 2012 13:16:28 +0000
Subject: [PATCH]

---
 inc/ws/Util/html5/class.ws.html5.compiler.php | 11 -----------
 inc/ws/Util/html5/class.ws.html5.links.php    |  3 ++-
 inc/ws/Util/packager/class.ws.packager.php    | 11 ++++++-----
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index b9cdb14b7..0bbc6008c 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -238,17 +238,6 @@ class wsHTML5Compiler {
 						continue;
 					}
 					$p = str_replace($dest . '/', '', $path);
-					foreach ($ignore as $i) {
-						if (preg_match('|' . $i . '|i', $p, $matches)) {
-							continue 2;
-						} else {
-							$ext = strtolower(files::getExtension($p));
-							if (in_array($ext, $videosExtensions)) {
-								$videos[$ext][] = $path->getFilename();
-								continue 2;
-							}
-						}
-					}
 					$lines[] = $p;
 				}
 			}
diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index db22c0fd2..bcc811807 100644
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -319,13 +319,14 @@ class fileLink extends normalLink {
 class multimediaLink extends wsHTML5Link {
 
 	public function getHTMLContent() {
-		$this->copyExternalFile($this->to);
+		//$this->copyExternalFile($this->to);
 		$w = $this->width * $this->compiler->getCssScale();
 		$h = $this->height * $this->compiler->getCssScale();
 		if ($this->alternative != '') {
 			$this->copyExternalFile($this->alternative);
 		}
 		$alt = $this->alternative == '' ? '' : '<img src="' . wsHTML5Link::getUniversalLocation($this->alternative) . '" width="' . $w . '" height="' . $h . '" />';
+		return $alt;
 		return cubeMedia::flashObject(wsHTML5Link::getUniversalLocation($this->to), $w, $h, array(), '', '', 9, '#ffffff', $alt, 'true', 'default', 'transparent');
 	}
 
diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index c77835a46..6985de8b4 100644
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -42,7 +42,7 @@ class wsPackager {
 		$this->book_id = $book_id;
 
 		$this->vdir = $vdir;
-		$this->dir = WS_SHM . '/packager/' . $book_id . '/';
+		$this->dir = ROOT . '/fluidbook/packager/' . $book_id . '/';
 		$this->whole = $whole;
 
 		if (!file_exists($this->dir)) {
@@ -51,7 +51,7 @@ class wsPackager {
 
 		$this->daoBook = new wsDAOBook($core->con);
 		$this->book = $this->daoBook->selectById($book_id);
-		$this->pages = $this->daoBook->getPagesOfBook($book_id,false);
+		$this->pages = $this->daoBook->getPagesOfBook($book_id, false);
 
 		$daoTheme = new wsDAOTheme($core->con);
 		$this->theme = $daoTheme->getThemeOfBook($book_id, true);
@@ -156,13 +156,15 @@ class wsPackager {
 			$rename = true;
 		}
 
+		if (file_exists($zipfile)) {
+			unlink($zipfile);
+		}
+
 		$zip = new cubeCommandLine('zip');
 		$zip->cd($this->vdir);
 		$zip->setArg(null, $zipfile);
 		$zip->setArg('0');
-		$zip->setArg('u');
 		$zip->setArg('r');
-		$zip->setArg('X');
 		$zip->setArg(null, '.');
 		$zip->execute();
 
@@ -176,7 +178,6 @@ class wsPackager {
 		if (is_null($this->vdir)) {
 			$this->vdir = $this->dir . $this->version . '/';
 		}
-		fb($this->vdir);
 		$this->cleanVdir();
 		mkdir($this->vdir . '/data', 0777, true);
 	}
-- 
2.39.5