(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php
index 136f94978d858b7081b4bceabf0fa01bfe78d4ce..6ceb8cd44a5a578ae3d1a2c4e4b47d9a018682c9 100644 (file)
--- 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();\r
                        $this->currentDoc = $dao->updateFromObject($this->currentDoc);\r
 \r
-                       for($i = 1;$i <= $doc->generalInfos['pages'];$i++) {\r
-                               $this->currentDocPage = $i;\r
-                               $this->totalDocPage = $doc->generalInfos['pages'];\r
+                       if ($this->documentsPages[$doc->document_id] == 'all') {\r
+                               $docPages = range(1, $doc->generalInfos['pages']);\r
+                       } else {\r
+                               $docPages = $this->documentsPages[$doc->document_id];\r
+                       }\r
+\r
+                       foreach($docPages as $i=>$page) {\r
+                               $this->currentDocPage = $i+1;\r
+                               $this->totalDocPage = count($docPages);\r
                                $this->setProgress(($this->processedPages / $this->totalPages) * 100);\r
-                               $this->currentDoc->processOnePage($i, false);\r
+                               $this->currentDoc->processOnePage($page, false);\r
                                $this->processedPages++;\r
                        }\r
                        $doc = $dao->updateFromObject($doc);\r

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 1aedfd88d0d38e03193210c1f60e226e95b77f3b..901b2ac19ea8099810a04feac13c7ceee249178c 100644 (file)
--- 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']);\r
                        $this->xml->addChild('document_id', $document->document_id);\r
                        $_SESSION['conversionSession'][$document->document_id] = 'all';\r
+                       $_SESSION['conversionSessionReload'] = false;\r
                }\r
        }\r
 \r
@@ -66,6 +67,7 @@ class wsFlash extends cubeFlashGateway {
 \r
                $dao = new wsDAODocument($core->con);\r
                $_SESSION['conversionSession'] = $this->args['documents'];\r
+               $_SESSION['conversionSessionReload'] = true;\r
                foreach($this->args['documents'] as $id => $pages) {\r
                        $doc = $dao->selectById($id);\r
                        $doc->conversionInfos->updatePages($pages, $this->args['resolution'], $this->args['quality'], $this->args['method'], $this->args['objects']);\r
@@ -77,10 +79,11 @@ class wsFlash extends cubeFlashGateway {
        {\r
                $_SESSION['sessionConversionGUID'] = $sessionConversionGUID = uniqid('conversion_', true);\r
                $session = new wsConversionSession($sessionConversionGUID);\r
-               $session->reload = false;\r
+               $session->reload = $_SESSION['conversionSessionReload'];\r
                $session->setDocuments($_SESSION['conversionSession']);\r
                $session->setBook($this->args['book_id']);\r
                unset($_SESSION['conversionSession']);\r
+               unset($_SESSION['conversionSessionReload']);\r
                $session->serialize();\r
 \r
                $http = new cubeHTTP($_SERVER['HTTP_HOST']);\r

diff --git a/inc/ws/Metier/class.ws.document.conversioninfos.php b/inc/ws/Metier/class.ws.document.conversioninfos.php
index e39735f5e4ed3e21111589ce636578e64274afda..ab95a1639cb52f767403ef190ef14badadab12b5 100644 (file)
--- 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)\r
        {\r
                foreach($pages as $page) {\r
-                       $this->updatePage($page, $resolution, $quality, $method, $objcts);\r
+                       $this->updatePage($page, $resolution, $quality, $method, $objects);\r
                }\r
        }\r
 \r

diff --git a/swf/_src/assets/picto_reload.png b/swf/_src/assets/picto_reload.png
new file mode 100644 (file)
index 0000000..67de2c6
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 8a3497e292b1be82b487507f880c73f0644fbc32..029669f9d6f4d3a9c1a6aad6e0f0917f51087783 100644 (file)
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 b5f3d0c43c521cd78245ba92fee2c3d0a65553bc..c5fb39ccd2ce10b2d25b63c638919be2193816af 100644 (file)
Binary files a/swf/_src/wsComposerLibrary.fla and b/swf/_src/wsComposerLibrary.fla differ