From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 29 Jun 2011 09:06:07 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=bd79be27b5b50f4e8245e5a85dde6ebf91ac8cc6;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index e2e9d3b15..1432e3492 100644
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -248,9 +248,16 @@ class wsFlash extends cubeFlashGateway {
 		foreach ($pages as $page => $info) {
 			$file = WS_DOCS . '/' . $info['document_id'] . '/p' . $info['document_page'] . '.jpg';
 			if (!file_exists($file)) {
-				continue;
+				$dim = array(0, 0);
+				$info['resolution'] = 150;
+				$info['method'] = 1;
+				$info['objects'] = 1800;
+				$info['quality'] = 85;
+			} else {
+				$dim = getimagesize($file);
 			}
-			$dim = getimagesize($file);
+
+
 
 			$pa = $p->addChild('page');
 			$pa->addAttribute('page', $page);
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ed52de13c..d55eff8c6 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -779,7 +779,7 @@ html{height:100%}' . "\n";
 		$res = '';
 
 		if ($r->count() > 0) {
-			$res .= '<tr><td>' . __('Choisir une tâche') . ' : </td><td>' . form::hidden('book_id', $book_id) . form::hidden('projet_id', $projet_id) . form::combo('tache', $taches,'0', 'hide_new_value') . '</td></tr>';
+			$res .= '<tr><td>' . __('Choisir une tâche') . ' : </td><td>' . form::hidden('book_id', $book_id) . form::hidden('projet_id', $projet_id) . form::combo('tache', $taches, '0', 'hide_new_value') . '</td></tr>';
 			$res .= '<tr class="new"><td>' . __('ou créer une nouvelle tâche') . ' : </td><td>' . form::field('nom', 32, 1024, 'Fluidbook #' . $book->book_id . ' : ' . $book->nom) . ' ' . __('ayant le budget suivant') . ' ' . form::field('budget', 6, 6) . '</td></tr>';
 		} else {
 			$res .= '<tr><td>' . __('Créer une tâche') . ' : </td><td>'
@@ -838,7 +838,7 @@ html{height:100%}' . "\n";
 		if ($book->version == 2) {
 			return;
 		}
-		$pages = $dao->getPagesOfBook($book_id);
+		$pages = $daoBook->getPagesOfBook($book_id);
 		$toUpdate = array();
 		foreach ($pages as $p => $infos) {
 			if ($infos['version'] < 2) {
@@ -852,7 +852,7 @@ html{height:100%}' . "\n";
 		}
 
 		if (count($toUpdate) > 0) {
-			$dao->setChaptersFromOldFluidbook($book_id);
+			$daoBook->setChaptersFromOldFluidbook($book_id);
 			$daoDoc = new wsDAODocument($core->con);
 			$daoDoc->setLinksFromOldFluidbook($book_id);
 		}