fix #2287 @1

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 9a798d35d08f44dd59926c6f44b8b35ec181799b..166f750294fe78079941399312d6fbcc3e33fcc3 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -350,7 +350,7 @@ class wsServices extends cubeFlashGateway
                }
 
                if (is_null($book)) {
-                       return;
+                       return false;
                }
 
                // Normalize range
@@ -371,11 +371,11 @@ class wsServices extends cubeFlashGateway
                $baseDocument = $this->getPDFComplexBaseDocument($book);
 
                if (!file_exists($baseDocument)) {
-                       return;
+                       return false;
                }
 
                if (!count($range)) {
-                       return;
+                       return false;
                }
 
 
@@ -425,7 +425,7 @@ class wsServices extends cubeFlashGateway
 
                switch ($book->parametres->bookmarkUsePDF) {
                        case 'download':
-                               return WS_BOOKS . '/working/' . $book->book_id . '/' . $book->parametres->pdfName;
+                               return WS_BOOKS . '/working/' . $book->book_id . '/' . $book->parametres->pdfReplace;
                                break;
                        case 'thumbnails':
                                return WS_BOOKS . '/working/' . $book->book_id . '/' . $book->parametres->pdfThumbnails;
@@ -473,6 +473,11 @@ class wsServices extends cubeFlashGateway
 
                $dest = $this->getPDFComplex($book, $this->args['range']);
 
+               if ($dest === false) {
+                       http_response_code(404);
+                       exit;
+               }
+
                if (!$print) {
                        // Return the url of the resulting pdf
                        http::redirect($dest['url']);