(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 67ce9e3ff81e1c8a923cb6d4155455f314707170..ff305017edc75d106d74463f233c19bf7d5fbaa0 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -832,12 +832,12 @@ class wsDAOBook extends commonDAO {
                        $res.=$this->compileHTML5($book_id);\r
                        $this->touchCompile($book_id, 'html5');\r
                }\r
-                               if ($v1 || $v2) {\r
+               if ($v1 || $v2) {\r
                        fb(time(), 'Compile PDF & Widget');\r
                        $this->compilePDF($book, $pages);\r
                        $this->compileWidget($book, $pages);\r
                }\r
-               \r
+\r
                fb(time(), 'End Compile');\r
                return $res;\r
        }\r
@@ -1003,10 +1003,13 @@ class wsDAOBook extends commonDAO {
                        }\r
                }\r
 \r
-               if ($book->parametres->ongletsSWF != '') {\r
-                       $ongletSWF = $workingDir . '/' . $book->parametres->ongletsSWF;\r
-                       if (file_exists($ongletSWF)) {\r
-                               $filesToCopy['data/' . $book->parametres->ongletsSWF] = $ongletSWF;\r
+               $externalsOptions = array('ongletsSWF', 'tabs2DSWF');\r
+               foreach ($externalsOptions as $e) {\r
+                       if (isset($book->parametres->$e) && $book->parametres->$e != '') {\r
+                               $f = $workingDir . '/' . $book->parametres->$e;\r
+                               if (file_exists($f)) {\r
+                                       $filesToCopy['data/' . $book->parametres->$e] = $f;\r
+                               }\r
                        }\r
                }\r
 \r