From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 19 Apr 2012 17:11:20 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5b93c771d5f5dff766b709267fce2f14cda234f2;p=cubeextranet.git

---

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