fix #2857 @1.5

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 976fc3ae46479240573bee5d2009e66005c15760..2c74f16add4e49b9c95cd6a18dd73b64be6c6ca1 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -427,15 +427,16 @@ class wsServices extends cubeFlashGateway
         return array('url' => $destURL, 'file' => $destFile);
     }
 
-    public function getPDFComplexBaseDocument($book)
+    public function getPDFComplexBaseDocument($book, $force = false)
     {
         global $core;
-        switch ($book->parametres->bookmarkUsePDF) {
+        $mode = $force ? $force : $book->parametres->bookmarkUsePDF;
+        switch ($mode) {
             case 'download':
-                return WS_BOOKS . '/working/' . $book->book_id . '/' . $book->parametres->pdfReplace;
+                $res = WS_BOOKS . '/working/' . $book->book_id . '/' . $book->parametres->pdfReplace;
                 break;
             case 'thumbnails':
-                return WS_BOOKS . '/working/' . $book->book_id . '/' . $book->parametres->pdfThumbnails;
+                $res = WS_BOOKS . '/working/' . $book->book_id . '/' . $book->parametres->pdfThumbnails;
                 break;
             case 'pages':
             default:
@@ -445,9 +446,12 @@ class wsServices extends cubeFlashGateway
                     $pages = $daoBook->getPagesOfBook($book->book_id);
                     $daoBook->compilePDF($book, $pages);
                 }
-                return $normal;
+                $res = $normal;
                 break;
         }
+        if (!file_exists($res) || is_dir($res)) {
+            return $this->getPDFComplexBaseDocument($book, 'pages');
+        }
         return $res;
     }