fix #4297 @0.25

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index a387c1ce0ecf1d0fd709cb42833e382c742e378f..38ecd5476f58966b958c165496fdd467c36dda8f 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -1478,11 +1478,14 @@ class wsMaintenance
 
     public static function processPage($args)
     {
+        CubeIT_Util_PHP::neverStop();
+
         global $core;
 
         $book_id = $args[0];
         $page = $args[1];
 
+
         $daoBook = new wsDAOBook($core->con);
         $book = $daoBook->selectById($book_id);
 
@@ -1498,10 +1501,17 @@ class wsMaintenance
             ['svg', '200', true, true, 'html'],
         ];
 
-        foreach ($files as $file) {
-            $book->getFile($page, $file[0], $file[1], $file[2], $file[3], $file[4], true);
+        if ($page == 'all') {
+            $pages = range(1, $book->parametres->pages);
+        } else {
+            $pages = [$page];
         }
 
+        foreach ($pages as $page) {
+            foreach ($files as $file) {
+                $book->getFile($page, $file[0], $file[1], $file[2], $file[3], $file[4], true);
+            }
+        }
     }
 }
 

diff --git a/inc/ws/Util/class.ws.pdf.convert.php b/inc/ws/Util/class.ws.pdf.convert.php
index 3e0545050c2c047aa81b82bb7b1a2bf069dc4737..0c68767d81a8dff7bfca4305d8fa7637a710fd39 100644 (file)
--- a/inc/ws/Util/class.ws.pdf.convert.php
+++ b/inc/ws/Util/class.ws.pdf.convert.php
@@ -125,7 +125,8 @@ class wsPDFConvert
             '/svg:svg/svg:g[@id="surface1"]//svg:path',\r
             '/svg:svg/svg:g[@id="surface1"]//svg:rect',\r
             '/svg:svg/svg:g[@id="surface1"]//svg:filter',\r
-            '/svg:svg/svg:g[@id="surface1"]//svg:use[starts-with(@xlink:href, "#image")]'\r
+            '/svg:svg/svg:g[@id="surface1"]//svg:use[starts-with(@xlink:href, "#image")]',\r
+            '//svg:image',\r
         );\r
 \r
         //global $svglog;\r