wait #4428 @0.5

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index da40f93fde83ef257da3591f806aae3217ce7b8e..36b32541bafc6f9eef73c9612b6f1418ce904b6f 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -258,8 +258,8 @@ class wsFlash extends cubeFlashGateway
     public function uploadLinkContent()
     {
         global $core;
-        $daoBook=new wsDAOBook($core->con);
-        $book=$daoBook->selectById($this->args['book_id'] );
+        $daoBook = new wsDAOBook($core->con);
+        $book = $daoBook->selectById($this->args['book_id']);
 
         foreach ($_FILES as $varname => $infos) {
             if ($infos['error']) {
@@ -272,10 +272,6 @@ class wsFlash extends cubeFlashGateway
                 $dir = '';
             }
 
-            if ($dir != '') {
-                $dir = $dir . '/';
-            }
-
             $fname = cubeFiles::tidyName($infos['name']);
             $dir = $book->getAssetDir($dir);
             if (!file_exists($dir)) {

diff --git a/inc/ws/Metier/class.ws.book.php b/inc/ws/Metier/class.ws.book.php
index 7e4fd5a865a8136debf83629b42d41f07ece6838..5049d22ee6909659f8324ef891f1c4233f825d3c 100644 (file)
--- a/inc/ws/Metier/class.ws.book.php
+++ b/inc/ws/Metier/class.ws.book.php
@@ -98,7 +98,7 @@ class wsBook extends cubeMetier
 \r
     public function getThumbFile($page, $format)\r
     {\r
-        $thumbpdf = $this->getAssetDir(). $this->parametres->pdfThumbnails;\r
+        $thumbpdf = $this->getAssetDir() . $this->parametres->pdfThumbnails;\r
         if ($this->parametres->pdfThumbnails && file_exists($thumbpdf)) {\r
             return wsPDFConvert::getThumbFromPDF($thumbpdf, $page, $format);\r
         }\r
@@ -112,7 +112,7 @@ class wsBook extends cubeMetier
 \r
     public function getAssetDirId()\r
     {\r
-        return $this->parametres->assetsDir === '' ? $this->book_id : trim($this->parametres->assetsDir);\r
+        return !$this->parametres->assetsDir ? $this->book_id : trim($this->parametres->assetsDir);\r
     }\r
 \r
     public static function getAssetDirOfBook($book_id, $sub = '')\r

diff --git a/inc/ws/Util/class.ws.util.php b/inc/ws/Util/class.ws.util.php
index 397f80f5be0cbee17d40ae1f60343678b4fa0ba8..6b97fd336a6c1a1df33d2bcece97cfcdeb326ee7 100644 (file)
--- a/inc/ws/Util/class.ws.util.php
+++ b/inc/ws/Util/class.ws.util.php
@@ -355,7 +355,7 @@ class wsUtil
 \r
 \r
         if ($book->parametres->pdfReplace) {\r
-            $replace = WS_BOOKS . '/working/' . $book->book_id . '/' . $book->parametres->pdfReplace;\r
+            $replace = $book->getAssetDir().$book->parametres->pdfReplace;\r
             if (file_exists($replace) && filesize($replace) > 0) {\r
                 if (!file_exists($normalPDF) || filemtime($normalPDF) < filemtime($replace) || filesize($normalPDF) != filesize($replace)) {\r
                     self::copy($replace, $normalPDF);\r