From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 5 Jan 2011 16:04:19 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b2c62458a096958924c7640bfd959bf968fccfb7;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php
index 136f94978..6ceb8cd44 100644
--- a/inc/ws/Controlleur/class.ws.conversion.session.php
+++ b/inc/ws/Controlleur/class.ws.conversion.session.php
@@ -72,11 +72,17 @@ class wsConversionSession {
 			$this->updateCountPages();
 			$this->currentDoc = $dao->updateFromObject($this->currentDoc);
 
-			for($i = 1;$i <= $doc->generalInfos['pages'];$i++) {
-				$this->currentDocPage = $i;
-				$this->totalDocPage = $doc->generalInfos['pages'];
+			if ($this->documentsPages[$doc->document_id] == 'all') {
+				$docPages = range(1, $doc->generalInfos['pages']);
+			} else {
+				$docPages = $this->documentsPages[$doc->document_id];
+			}
+
+			foreach($docPages as $i=>$page) {
+				$this->currentDocPage = $i+1;
+				$this->totalDocPage = count($docPages);
 				$this->setProgress(($this->processedPages / $this->totalPages) * 100);
-				$this->currentDoc->processOnePage($i, false);
+				$this->currentDoc->processOnePage($page, false);
 				$this->processedPages++;
 			}
 			$doc = $dao->updateFromObject($doc);
diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 1aedfd88d..901b2ac19 100644
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -57,6 +57,7 @@ class wsFlash extends cubeFlashGateway {
 			$document->copyOriginal($infos['tmp_name']);
 			$this->xml->addChild('document_id', $document->document_id);
 			$_SESSION['conversionSession'][$document->document_id] = 'all';
+			$_SESSION['conversionSessionReload'] = false;
 		}
 	}
 
@@ -66,6 +67,7 @@ class wsFlash extends cubeFlashGateway {
 
 		$dao = new wsDAODocument($core->con);
 		$_SESSION['conversionSession'] = $this->args['documents'];
+		$_SESSION['conversionSessionReload'] = true;
 		foreach($this->args['documents'] as $id => $pages) {
 			$doc = $dao->selectById($id);
 			$doc->conversionInfos->updatePages($pages, $this->args['resolution'], $this->args['quality'], $this->args['method'], $this->args['objects']);
@@ -77,10 +79,11 @@ class wsFlash extends cubeFlashGateway {
 	{
 		$_SESSION['sessionConversionGUID'] = $sessionConversionGUID = uniqid('conversion_', true);
 		$session = new wsConversionSession($sessionConversionGUID);
-		$session->reload = false;
+		$session->reload = $_SESSION['conversionSessionReload'];
 		$session->setDocuments($_SESSION['conversionSession']);
 		$session->setBook($this->args['book_id']);
 		unset($_SESSION['conversionSession']);
+		unset($_SESSION['conversionSessionReload']);
 		$session->serialize();
 
 		$http = new cubeHTTP($_SERVER['HTTP_HOST']);
diff --git a/inc/ws/Metier/class.ws.document.conversioninfos.php b/inc/ws/Metier/class.ws.document.conversioninfos.php
index e39735f5e..ab95a1639 100644
--- a/inc/ws/Metier/class.ws.document.conversioninfos.php
+++ b/inc/ws/Metier/class.ws.document.conversioninfos.php
@@ -31,7 +31,7 @@ class wsDocumentConversionInfos {
 	public function updatePages($pages, $resolution, $quality, $method, $objects)
 	{
 		foreach($pages as $page) {
-			$this->updatePage($page, $resolution, $quality, $method, $objcts);
+			$this->updatePage($page, $resolution, $quality, $method, $objects);
 		}
 	}
 
diff --git a/swf/_src/assets/picto_reload.png b/swf/_src/assets/picto_reload.png
new file mode 100644
index 000000000..67de2c6cc
Binary files /dev/null and b/swf/_src/assets/picto_reload.png differ
diff --git a/swf/_src/composerLibrary.swc b/swf/_src/composerLibrary.swc
index 8a3497e29..029669f9d 100644
Binary files a/swf/_src/composerLibrary.swc and b/swf/_src/composerLibrary.swc differ
diff --git a/swf/_src/wsComposerLibrary.fla b/swf/_src/wsComposerLibrary.fla
index b5f3d0c43..c5fb39ccd 100644
Binary files a/swf/_src/wsComposerLibrary.fla and b/swf/_src/wsComposerLibrary.fla differ