From: vincent@cubedesigners.com Date: Wed, 30 Jan 2019 15:58:31 +0000 (+0000) Subject: wip #2859 @0.25 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b1cb8e3d4a584102769a102e1925f60960b375bd;p=cubeextranet.git wip #2859 @0.25 --- diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php index dabc40742..e8b711252 100644 --- a/inc/ws/Controlleur/class.ws.services.php +++ b/inc/ws/Controlleur/class.ws.services.php @@ -378,12 +378,11 @@ class wsServices extends cubeFlashGateway return false; } - $destDir = WS_CACHE . '/exportpdf/' . $book->cid; if (!file_exists($destDir)) { mkdir($destDir, 0777, true); } - $fname = md5(implode(',%ù', $range)) . '.pdf'; + $fname = md5($baseDocument) . '-' . md5(implode(',%ù', $range)) . '.pdf'; $destFile = $destDir . '/' . $fname; $destURL = '/fluidbook/cache/exportpdf/' . $book->cid . '/' . $fname; @@ -421,8 +420,6 @@ class wsServices extends cubeFlashGateway public function getPDFComplexBaseDocument($book) { global $core; - - switch ($book->parametres->bookmarkUsePDF) { case 'download': return WS_BOOKS . '/working/' . $book->book_id . '/' . $book->parametres->pdfReplace;