From 38cf49bdc22a8e91f58caf4db912d38ece08e5e8 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 12 Apr 2012 15:34:23 +0000
Subject: [PATCH]

---
 inc/ws/DAO/class.ws.dao.book.php           | 24 +++++++++++++++++++++-
 inc/ws/Metier/class.ws.book.parametres.php |  4 ++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 9afd1f3b6..2f8fc18ac 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -781,13 +781,19 @@ class wsDAOBook extends commonDAO {
 			return;
 		}
 
+		fb(time(), 'Start compile 3');
 		$res = $this->compile3($book_id, $complete, $book);
-		$this->compile1($book_id);
+		fb(time(), 'Start compile 1');
+		if ($book->parametres->version == 1) {
+			$this->compile1($book_id);
+		}
 		$this->touchCompile($book_id);
+		fb(time(), 'End compile');
 		return $res;
 	}
 
 	public function compile1($book_id) {
+
 		$finalDir = WS_BOOKS . '/finalv1/' . $book_id . '/';
 		$packager = new wsPackagerV1($book_id, $finalDir, false);
 		$packager->makePackage(false);
@@ -809,12 +815,16 @@ class wsDAOBook extends commonDAO {
 		$book = $this->selectById($book_id);
 		$pages = $this->getPagesOfBook($book_id);
 
+		fb(time(), 'prepare flex');
+
 		$flex = new cubeFlexCompiler('FluidbookDatas', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH, 10);
 		$flexLight = new cubeFlexCompiler('FluidbookDatasLight', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH, 10);
 
 		$filesToCopy = array();
 		$this->compileFlex($book_id, $complete, $compilerDir, $finalDir, $filesToCopy, $book, $pages, $flex, $flexLight);
 
+		fb(time(), 'compile flex');
+
 		$res .= $flex->compile() . "\n\n-------------------\n\n";
 		$flexLight->addVariable('datasSize', filesize($compilerDir . '/FluidbookDatas.swf'));
 		$res .= $flexLight->compile();
@@ -822,12 +832,16 @@ class wsDAOBook extends commonDAO {
 		$filesToCopy['data/fd.swf'] = $compilerDir . '/FluidbookDatas.swf';
 		$filesToCopy['data/fdl.swf'] = $compilerDir . '/FluidbookDatasLight.swf';
 
+		fb(time(), 'flex compiled');
+
 		// Copy of files
 		// Check if dest dir exists
 		if (!file_exists($finalDir . 'data')) {
 			mkdir($finalDir . 'data', 0777, true);
 		}
 
+		fb(time(), 'copy files');
+
 		foreach ($filesToCopy as $local => $source) {
 			$localPath = $finalDir . $local;
 			if (!file_exists($localPath) || filemtime($localPath) < filemtime($source) || filesize($localPath) != filesize($source) || filemtime($localPath) < $book->composition_update) {
@@ -838,11 +852,14 @@ class wsDAOBook extends commonDAO {
 			}
 		}
 
+		fb(time(), 'Compile PDF');
 
 		$this->compilePDF($book, $pages);
 		if ($book->parametres->mobileVersion != 'pdf') {
+			fb(time(), 'Compile HTML5');
 			$this->compileHTML5($book_id);
 		}
+		fb(time(), 'Compile widget');
 		$this->compileWidget($book, $pages);
 		$this->touchCompile($book_id);
 
@@ -921,7 +938,12 @@ class wsDAOBook extends commonDAO {
 		$hash .= round($size[0], 4);
 		$hash = sha1($hash);
 
+		fb(time(), 'texts and indexes');
+
 		$this->makeTextsIndexes($book, $pages, $index, $textes);
+
+		fb(time(), 'texts and links');
+
 		$daoDoc->getLinksAndRulers($book_id, $links, $rulers);
 
 		$imagesassets = array();
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 01dfb3eec..ff93a49cd 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -47,8 +47,8 @@ class wsBookParametres extends wsParametres {
 		// .
 		// .
 		$this->fields['friend'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Envoyer à un ami'));
-		$this->fields['email_title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre de l'email") . ' "' . __('Envoyer à un ami') . '"');
-		$this->fields['email_body'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Corps de l'email") . ' "' . __('Envoyer à un ami') . '"');
+		$this->fields['email_title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre de l'email") . ' "' . __('Envoyer à un ami') . '"', 'hint' => __('Laisser vide pour utiliser la valeur par défaut'));
+		$this->fields['email_body'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Corps de l'email") . ' "' . __('Envoyer à un ami') . '"', 'hint' => __('Laisser vide pour utiliser la valeur par défaut'));
 		$this->fields['email_editable'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Permettre au lecteur de modifier le corps de l'email"));
 		$this->fields['askAcknowledge'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Demander au destinataire un accusé de réception"), 'grade' => 3);
 		$this->fields['facebook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Facebook'));
-- 
2.39.5