(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php
index f9b60b5c49c95cf483245b4138da57578bd6d78e..6719eb66a10e1355db1a229b506554de91dd0c84 100644 (file)
--- a/inc/ws/Controlleur/class.ws.conversion.session.php
+++ b/inc/ws/Controlleur/class.ws.conversion.session.php
@@ -90,6 +90,8 @@ class wsConversionSession {
                        if (!$this->reload) {\r
                                $this->currentDoc->globalOperations();\r
                                $dao->putLinksFromCSV($this->currentDoc->document_id);\r
+                       } else if ($this->documentsPages[$doc->document_id] == 'all') {\r
+                               $this->currentDoc->globalOperations();\r
                        }\r
                        if ($this->documentsPages[$doc->document_id] == 'all') {\r
                                $docPages = range(1, $doc->generalInfos['pages']);\r

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 11c5cd463369746e5db2cffc323cd1e8940ed0c1..c604a51222481e66e7a18a0e1c2d5277abbbe388 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -79,6 +79,12 @@ class wsFlash extends cubeFlashGateway {
        {\r
                global $core;\r
 \r
+               if ($this->args['reloadDocs'] == '1') {\r
+                       foreach($this->args['documents'] as $document_id => $pages) {\r
+                               $this->args['documents'][$document_id] = 'all';\r
+                       }\r
+               }\r
+\r
                $dao = new wsDAODocument($core->con);\r
                $_SESSION['conversionSession'] = $this->args['documents'];\r
                $_SESSION['conversionSessionReload'] = true;\r

diff --git a/inc/ws/Metier/class.ws.document.conversioninfos.php b/inc/ws/Metier/class.ws.document.conversioninfos.php
index ab95a1639cb52f767403ef190ef14badadab12b5..76876afbd783bbf5547fd8e3438e618f1c5c5026 100644 (file)
--- a/inc/ws/Metier/class.ws.document.conversioninfos.php
+++ b/inc/ws/Metier/class.ws.document.conversioninfos.php
@@ -30,6 +30,10 @@ class wsDocumentConversionInfos {
 \r
        public function updatePages($pages, $resolution, $quality, $method, $objects)\r
        {\r
+               if ($pages == 'all') {\r
+                       $pages = array_keys($this->pages);\r
+               }\r
+\r
                foreach($pages as $page) {\r
                        $this->updatePage($page, $resolution, $quality, $method, $objects);\r
                }\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index ddbdadce300de1272b224111cd866d4969a1fdf4..de7c5cbba972bd8d570ff30de7760d747b57b480 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -97,10 +97,10 @@ class wsDocument extends cubeMetier {
                        mkdir($out, 0777, true);\r
                }\r
 \r
-               $pdfextract = new cubeCommandeLine('pdfextract');\r
-               $pdfextract->setCd($out);\r
+               $pdfextract = new cubeCommandLine('pdfextract');\r
+               $pdfextract->cd($out);\r
                $pdfextract->setPath(CONVERTER_PATH);\r
-               $pdfextract->setArg('', $this->in);\r
+               $pdfextract->setArg(null,$this->cropped);\r
                $pdfextract->execute();\r
                $this->addToLog($pdfextract);\r
        }\r
@@ -263,6 +263,7 @@ class wsDocument extends cubeMetier {
                        $this->getInfos($this->cropped, true);\r
                }\r
                $this->getLinksAndTexts();\r
+               $this->extractFonts();\r
        }\r
 \r
        public function CropAndCut()\r