From d34ead47453525859c630bd260269c6fa16e89f6 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 8 Feb 2012 13:51:48 +0000
Subject: [PATCH]

---
 inc/ws/DAO/class.ws.dao.book.php           | 35 +++++++++++++++-------
 inc/ws/Metier/class.ws.book.parametres.php |  3 +-
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 69ea3c6b5..f043e1859 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -552,8 +552,8 @@ class wsDAOBook extends commonDAO {
 		if ($r->compiledate < $r->changedate) {
 			return false;
 		}
-		
-		if(!file_exists(WS_BOOKS.'/finalv1/'.$book_id.'/index.swf')){
+
+		if (!file_exists(WS_BOOKS . '/finalv1/' . $book_id . '/index.swf')) {
 			return false;
 		}
 
@@ -715,8 +715,8 @@ class wsDAOBook extends commonDAO {
 		$finalDir = WS_BOOKS . '/finalv1/' . $book_id . '/';
 		$packager = new wsPackagerV1($book_id, $finalDir, false);
 		$packager->makePackage(false);
-		
-		mkdir($finalDir,0777,true);
+
+		mkdir($finalDir, 0777, true);
 	}
 
 	public function compile3($book_id, $complete) {
@@ -1062,18 +1062,31 @@ class wsDAOBook extends commonDAO {
 
 		$tempimage = array();
 		$tempswf = array();
+		$timg = array();
 
 
 		for ($i = $from; $i <= $to; $i++) {
 			$page = $pages[$i];
 
-			$tempimage[$i] = cubeFiles::tempnam();
+			$timg[$i] = $tempimage[$i] = cubeFiles::tempnam();
 			$tempswf[$i] = cubeFiles::tempnam();
 
 			$it = new imageTools();
-			$it->loadImage(WS_DOCS . '/' . $page['document_id'] . '/html/t36-' . $page['document_page'] . '.jpg');
-			$it->resize($book->parametres->widgetSize, 10000);
-			$it->output('jpeg', $tempimage[$i], 100);
+
+
+			$image = WS_DOCS . '/' . $page['document_id'] . '/html/t36-' . $page['document_page'] . '.jpg';
+
+
+			try {
+				$it->loadImage($image);
+				$it->resize($book->parametres->widgetSize, 10000);
+				$it->output('jpeg', $tempimage[$i], 100);
+			} catch (Exception $e) {
+				$tempimage[$i] = $image;
+			}
+
+
+
 
 			$jpg2swf = new cubeCommandLine('jpeg2swf');
 			$jpg2swf->setEnv('PATH', '/bin:/usr/bin:/usr/local/bin');
@@ -1086,8 +1099,10 @@ class wsDAOBook extends commonDAO {
 		}
 		$swfcombine->execute();
 
-		foreach ($tempimage as $t) {
-			unlink($t);
+		foreach ($timg as $t) {
+			if (file_exists($t)) {
+				unlink($t);
+			}
 		}
 		foreach ($tempswf as $t) {
 			unlink($t);
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 3f4886574..afcb38263 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -58,8 +58,9 @@ class wsBookParametres extends wsParametres {
 			'hint' => __("0 : Publication à plat") . "\n" . __('2 : Valeur par défaut'));
 		$this->fields['extraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Marge supplémentaire horizontale'), 'grade' => 3);
 		$this->fields['extraYSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Marge supplémentaire verticale'), 'grade' => 3);
+		$this->fields['centerBook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Centrer la publication sur les couvertures'), 'grade' => 2);
 		$this->forms['3d_mode'] = array('label' => __('Options de visualisation'),
-			'fieldsnames' => array('visualisationMode', 'pagesBaseAngle', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode'));
+			'fieldsnames' => array('visualisationMode', 'pagesBaseAngle','centerBook', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode'));
 
 
 		$this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'));
-- 
2.39.5