(no commit message)

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index b9cdb14b790863a246e18d17b1fe8529bb25317f..0bbc6008c4abaa914c2efb6150cc4fb833880023 100644 (file)
--- 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 db22c0fd28fd33ff465acb1cceabdde47ea1f98c..bcc8118073d2e0f2dae549d3ef7e50b92e474686 100644 (file)
--- 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 c77835a462dc79130d01fd6703efa4823289808e..6985de8b45f7348af48b2977131d9a9b1c39233f 100644 (file)
--- 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;\r
 \r
                $this->vdir = $vdir;\r
-               $this->dir = WS_SHM . '/packager/' . $book_id . '/';\r
+               $this->dir = ROOT . '/fluidbook/packager/' . $book_id . '/';\r
                $this->whole = $whole;\r
 \r
                if (!file_exists($this->dir)) {\r
@@ -51,7 +51,7 @@ class wsPackager {
 \r
                $this->daoBook = new wsDAOBook($core->con);\r
                $this->book = $this->daoBook->selectById($book_id);\r
-               $this->pages = $this->daoBook->getPagesOfBook($book_id,false);\r
+               $this->pages = $this->daoBook->getPagesOfBook($book_id, false);\r
 \r
                $daoTheme = new wsDAOTheme($core->con);\r
                $this->theme = $daoTheme->getThemeOfBook($book_id, true);\r
@@ -156,13 +156,15 @@ class wsPackager {
                        $rename = true;\r
                }\r
 \r
+               if (file_exists($zipfile)) {\r
+                       unlink($zipfile);\r
+               }\r
+\r
                $zip = new cubeCommandLine('zip');\r
                $zip->cd($this->vdir);\r
                $zip->setArg(null, $zipfile);\r
                $zip->setArg('0');\r
-               $zip->setArg('u');\r
                $zip->setArg('r');\r
-               $zip->setArg('X');\r
                $zip->setArg(null, '.');\r
                $zip->execute();\r
 \r
@@ -176,7 +178,6 @@ class wsPackager {
                if (is_null($this->vdir)) {\r
                        $this->vdir = $this->dir . $this->version . '/';\r
                }\r
-               fb($this->vdir);\r
                $this->cleanVdir();\r
                mkdir($this->vdir . '/data', 0777, true);\r
        }\r